3140 files changed, 33800 insertions, 32680 deletions

diff --git a/features/org.eclipse.emf.cdo.dawn.ecore.editor.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.ecore.editor.dawn-feature/feature.xml
index 25bbf48492..fbca2dd5f3 100644
--- a/features/org.eclipse.emf.cdo.dawn.ecore.editor.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn.ecore.editor.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.dawn.ecore.editor.dawn"
       label="%featureName"
-      version="1.1.100.qualifier"
+      version="1.1.200.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn-feature/feature.xml
index 0465e3bf26..9513bbf6f0 100644
--- a/features/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn"
       label="%featureName"
-      version="1.1.100.qualifier"
+      version="1.1.200.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.releng.apireports-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.apireports-feature/feature.xml
index 08897a6041..ad668533d1 100644
--- a/features/org.eclipse.emf.cdo.releng.apireports-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.apireports-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.releng.apireports"
       label="%featureName"
-      version="1.0.100.qualifier"
+      version="1.0.200.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml
index 7c4645c1b0..2ba1e6e84e 100644
--- a/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.help-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.releng.help"
       label="%featureName"
-      version="4.2.100.qualifier"
+      version="4.2.200.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.xml
index 34b05f5575..038d4adb6b 100644
--- a/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.relativepaths-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.releng.relativepaths"
       label="%featureName"
-      version="1.1.100.qualifier"
+      version="1.1.200.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.xml
index 89c981c8eb..7a7d5ccf04 100644
--- a/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.tasks-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.releng.tasks"
       label="%featureName"
-      version="1.1.100.qualifier"
+      version="1.1.200.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.db.h2-feature/feature.xml b/features/org.eclipse.net4j.db.h2-feature/feature.xml
index 535937c508..6e5aa62871 100644
--- a/features/org.eclipse.net4j.db.h2-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.h2-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j.db.h2"
       label="%featureName"
-      version="4.2.100.qualifier"
+      version="4.2.200.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db.oracle-feature/feature.xml b/features/org.eclipse.net4j.db.oracle-feature/feature.xml
index ff0fa11491..1ac86e3363 100644
--- a/features/org.eclipse.net4j.db.oracle-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.oracle-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j.db.oracle"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.ui-feature/feature.xml b/features/org.eclipse.net4j.ui-feature/feature.xml
index 79cb56d828..139c67b147 100644
--- a/features/org.eclipse.net4j.ui-feature/feature.xml
+++ b/features/org.eclipse.net4j.ui-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j.ui"
       label="%featureName"
-      version="4.2.100.qualifier"
+      version="4.2.200.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/admin/package-info.java b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/admin/package-info.java
index 127e370d7f..b5a9dc1698 100644
--- a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/admin/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/admin/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Client side of the protocol to administer CDO repositories remotely.
  */
 package org.eclipse.emf.cdo.admin;
-
diff --git a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientImpl.java b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientImpl.java
index 53c6ac47f2..b4d2e5bae9 100644
--- a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientImpl.java
+++ b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientImpl.java
@@ -39,8 +39,8 @@ import java.util.concurrent.ExecutorService;
 /**
  * @author Eike Stepper
  */
-public class CDOAdminClientImpl extends AbstractCDOAdmin implements CDOAdminClient,
-    IPasswordCredentialsProvider.Provider, IConfirmationProvider.Provider
+public class CDOAdminClientImpl extends AbstractCDOAdmin
+    implements CDOAdminClient, IPasswordCredentialsProvider.Provider, IConfirmationProvider.Provider
 {
   private static final String URL_SEPARATOR = "://";
 
@@ -160,8 +160,8 @@ public class CDOAdminClientImpl extends AbstractCDOAdmin implements CDOAdminClie
   {
     try
     {
-      return (IPasswordCredentialsProvider)container.getElement(CredentialsProviderFactory.PRODUCT_GROUP,
-          "interactive", null); //$NON-NLS-1$
+      return (IPasswordCredentialsProvider)container.getElement(CredentialsProviderFactory.PRODUCT_GROUP, "interactive", //$NON-NLS-1$
+          null);
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientManagerImpl.java b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientManagerImpl.java
index 3578a351ca..fba6170ed2 100644
--- a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientManagerImpl.java
@@ -28,7 +28,7 @@ import java.util.concurrent.ExecutorService;
 /**
  * @author Eike Stepper
  */
-public class CDOAdminClientManagerImpl extends SetContainer<CDOAdminClient> implements CDOAdminClientManager
+public class CDOAdminClientManagerImpl extends SetContainer<CDOAdminClient>implements CDOAdminClientManager
 {
   private final IManagedContainer container;
 
diff --git a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CDOAdminClientProtocol.java b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CDOAdminClientProtocol.java
index d3867e8c62..210afce02d 100644
--- a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CDOAdminClientProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/protocol/CDOAdminClientProtocol.java
@@ -29,8 +29,8 @@ import java.util.Set;
 /**
  * @author Eike Stepper
  */
-public class CDOAdminClientProtocol extends AuthenticatingSignalProtocol<CDOAdminClientImpl> implements
-    IConfirmationProvider.Provider
+public class CDOAdminClientProtocol extends AuthenticatingSignalProtocol<CDOAdminClientImpl>
+    implements IConfirmationProvider.Provider
 {
   public CDOAdminClientProtocol(CDOAdminClientImpl admin)
   {
diff --git a/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
index 93a8721010..67dd1b8002 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.common.db;singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
  org.eclipse.emf.cdo.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)"
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.common.db;version="3.0.400",
- org.eclipse.emf.cdo.common.internal.db;version="3.0.400";x-friends:="org.eclipse.emf.cdo.tests.db",
- org.eclipse.emf.cdo.common.internal.db.bundle;version="3.0.400";x-internal:=true,
- org.eclipse.emf.cdo.common.internal.db.cache;version="3.0.400";x-friends:="org.eclipse.emf.cdo.tests.db"
+Export-Package: org.eclipse.emf.cdo.common.db;version="3.0.500",
+ org.eclipse.emf.cdo.common.internal.db;version="3.0.500";x-friends:="org.eclipse.emf.cdo.tests.db",
+ org.eclipse.emf.cdo.common.internal.db.bundle;version="3.0.500";x-internal:=true,
+ org.eclipse.emf.cdo.common.internal.db.cache;version="3.0.500";x-friends:="org.eclipse.emf.cdo.tests.db"
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java
index fc5e562559..46d75d0aa5 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/DBRevisionCacheUtil.java
@@ -28,7 +28,7 @@ public class DBRevisionCacheUtil
    * Gets the name of a revision of a CDOResourceNode.
    * <p>
    * See bug 279817
-   * 
+   *
    * @param revision
    *          the revision
    * @return the resource node name
@@ -39,8 +39,8 @@ public class DBRevisionCacheUtil
   public static String getResourceNodeName(CDORevision revision)
   {
     CheckUtil.checkArg(revision.isResourceNode(), "The revision is not a resource node!");
-    EStructuralFeature feature = revision.getEClass().getEStructuralFeature(
-        CDOModelConstants.RESOURCE_NODE_NAME_ATTRIBUTE);
+    EStructuralFeature feature = revision.getEClass()
+        .getEStructuralFeature(CDOModelConstants.RESOURCE_NODE_NAME_ATTRIBUTE);
     return (String)((InternalCDORevision)revision).getValue(feature);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/bundle/OM.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/bundle/OM.java
index 8b93d1df8c..2d3f3a266b 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/bundle/OM.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Andre Dietisheim
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCacheSchema.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCacheSchema.java
index 3d92028345..70c3075698 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCacheSchema.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCacheSchema.java
@@ -34,40 +34,40 @@ public class DBRevisionCacheSchema
   public static final IDBTable REVISIONS = INSTANCE.addTable("dbrevisioncache_revisions");
 
   public static final IDBField REVISIONS_ID = //
-  REVISIONS.addField("id", DBType.VARCHAR, 254);
+      REVISIONS.addField("id", DBType.VARCHAR, 254);
 
   public static final IDBField REVISIONS_VERSION = //
-  REVISIONS.addField("version", DBType.INTEGER);
+      REVISIONS.addField("version", DBType.INTEGER);
 
   public static final IDBField REVISIONS_CREATED = //
-  REVISIONS.addField("created", DBType.BIGINT);
+      REVISIONS.addField("created", DBType.BIGINT);
 
   public static final IDBField REVISIONS_REVISED = //
-  REVISIONS.addField("revised", DBType.BIGINT);
+      REVISIONS.addField("revised", DBType.BIGINT);
 
   public static final IDBField REVISIONS_CDOREVISION = //
-  REVISIONS.addField("revision", DBType.BLOB);
+      REVISIONS.addField("revision", DBType.BLOB);
 
   public static final IDBField REVISIONS_RESOURCENODE_NAME = //
-  REVISIONS.addField("resourcenode_name", DBType.VARCHAR, false);
+      REVISIONS.addField("resourcenode_name", DBType.VARCHAR, false);
 
   public static final IDBField REVISIONS_CONTAINERID = //
-  REVISIONS.addField("container_id", DBType.BIGINT, false);
+      REVISIONS.addField("container_id", DBType.BIGINT, false);
 
   public static final IDBIndex INDEX_REVISIONS_RESOURCENODENAME = //
-  REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_RESOURCENODE_NAME);
+      REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_RESOURCENODE_NAME);
 
   public static final IDBIndex INDEX_REVISIONS_ID = //
-  REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_ID);
+      REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_ID);
 
   public static final IDBIndex INDEX_REVISIONS_VERSION = //
-  REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_VERSION);
+      REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_VERSION);
 
   public static final IDBIndex INDEX_REVISIONS_PK = //
-  REVISIONS.addIndex(IDBIndex.Type.PRIMARY_KEY, REVISIONS_ID, REVISIONS_VERSION);
+      REVISIONS.addIndex(IDBIndex.Type.PRIMARY_KEY, REVISIONS_ID, REVISIONS_VERSION);
 
   public static final IDBIndex INDEX_REVISIONS_CONTAINERID = //
-  REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_CONTAINERID);
+      REVISIONS.addIndex(IDBIndex.Type.NON_UNIQUE, REVISIONS_CONTAINERID);
 
   static
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java
index 1d5827150e..845d816891 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonTransaction.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.common;
 
 /**
  * Abstracts the information about CDO transactions that is common to both client and server side.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
index a03d8ac92e..05eb0724d1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/CDOCommonView.java
@@ -35,7 +35,7 @@ import org.eclipse.core.runtime.IAdaptable;
  * @apiviz.has {@link CDOCommonView.Options}
  */
 public interface CDOCommonView extends CDOLockOwner, CDOBranchPoint, CDORevisionProvider, IOptionsContainer,
-    IPropertiesContainer, IAdaptable, Closeable
+IPropertiesContainer, IAdaptable, Closeable
 {
   public int getViewID();
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/CDOAdmin.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/CDOAdmin.java
index 433a07040b..529f42118d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/CDOAdmin.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/CDOAdmin.java
@@ -31,7 +31,7 @@ public interface CDOAdmin extends IContainer<CDOAdminRepository>, Closeable
 {
   /**
    * The default admin-handler type, which is guaranteed to exist on the server.
-   * 
+   *
    * @since 4.3
    */
   public static final String DEFAULT_TYPE = "default"; //$NON-NLS-1$
@@ -40,7 +40,7 @@ public interface CDOAdmin extends IContainer<CDOAdminRepository>, Closeable
    * The name of the boolean property that indicates whether to configure the
    * default security manager in a repository to be
    * {@linkplain #createRepository(String, String, Map) created}.
-   * 
+   *
    * @since 4.3
    */
   public static final String PROPERTY_SECURITY_MANAGER = "configureSecurityManager"; //$NON-NLS-1$
@@ -49,7 +49,7 @@ public interface CDOAdmin extends IContainer<CDOAdminRepository>, Closeable
    * The name of the boolean property that indicates whether to configure the
    * default {@linkplain #PROPERTY_SECURITY_MANAGER security manager} with
    * support for user home folders.
-   * 
+   *
    * @since 4.3
    */
   public static final String PROPERTY_SECURITY_HOME_FOLDERS = "configureSecurityHomeFolders"; //$NON-NLS-1$
@@ -58,7 +58,7 @@ public interface CDOAdmin extends IContainer<CDOAdminRepository>, Closeable
    * The name of the property that provides the XML configuration string for
    * the store of a repository to be
    * {@linkplain #createRepository(String, String, Map) created}.
-   * 
+   *
    * @since 4.3
    */
   public static final String PROPERTY_STORE_XML_CONFIG = "storeXMLConfig"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/package-info.java
index 2e7d7bd7d0..56ba811913 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/admin/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Common concepts for the protocol to administer CDO repositories remotely.
  */
 package org.eclipse.emf.cdo.common.admin;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
index 36f01ab43d..3ebd4dc5dc 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranch.java
@@ -39,8 +39,8 @@ import org.eclipse.core.runtime.IAdaptable;
  * @apiviz.has {@link CDOBranchPoint} oneway - - base
  * @apiviz.composedOf {@link CDOBranch} - - subBranches
  */
-public interface CDOBranch extends CDOBranchPoint, CDONameProvider, IContainer<CDOBranch>, Comparable<CDOBranch>,
-    IAdaptable
+public interface CDOBranch
+    extends CDOBranchPoint, CDONameProvider, IContainer<CDOBranch>, Comparable<CDOBranch>, IAdaptable
 {
   /**
    * The fixed ID of the {@link CDOBranchManager#getMainBranch() main branch}.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchHandler.java
index 88ad70181a..3ef8758c37 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchHandler.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.common.branch;
 
 /**
  * A call-back interface that indicates the ability to <i>handle</i> branches that are passed from other entities.
- * 
+ *
  * @see CDOBranchManager#getBranches(int, int, CDOBranchHandler)
  * @author Eike Stepper
  * @since 3.0
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.java
index 9c96ed3bd8..7a6e8a2291 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchPointRange.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
  * <p>
  * Branch point ranges are usually created with {@link CDOBranchUtil#createRange(CDOBranchPoint, CDOBranchPoint)
  * CDOBranchUtil.createRange()} and often used in the context of {@link CDOChangeSet change sets}.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java
index 502c4748c8..87ba877549 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchVersion.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
  * It is often used in the context of
  * {@link CDORevisionManager#getRevisionByVersion(CDOID, CDOBranchVersion, int, boolean)
  * CDORevisionManager.getRevisionByVersion()}.
- * 
+ *
  * @see CDOBranch#getVersion(int)
  * @author Eike Stepper
  * @since 3.0
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/package-info.java
index bf6194898c..e79f6187e3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/package-info.java
@@ -1,20 +1,15 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Common concepts for dealing with branches.
- * 
+ *
  * @apiviz.exclude .*\.IContainer
  * @apiviz.exclude .*\.INotifier
  * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.common.branch;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKind.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKind.java
index 6e1daf667e..bdfe57a408 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKind.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKind.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.common.commit;
 
 /**
  * Enumerates possible change kinds.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.java
index faf932330d..1c24fdbd18 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeKindProvider.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.common.id.CDOID;
 
 /**
  * Generic provider for the kinds of changes that have been applied to objects.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @apiviz.uses {@link CDOChangeKind} - - provides
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSet.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSet.java
index 1616bb25e0..05a8cfcd35 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSet.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSet.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchPointRange;
 /**
  * The {@link CDOChangeSetData change set data} between two {@link CDOBranchPointRange branch points} with a common
  * ancestor.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetData.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetData.java
index 830884965f..2bbb0ea690 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetData.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetData.java
@@ -23,7 +23,7 @@ import java.util.Map;
 /**
  * A {@link CDOChangeKindProvider change kind provider} with detailed information about {@link #getNewObjects() new},
  * {@link #getChangedObjects() changed} and {@link #getDetachedObjects() detached} objects.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
@@ -38,14 +38,14 @@ public interface CDOChangeSetData extends CDOChangeKindProvider
 
   /**
    * Returns a deep copy of this change set data.
-   * 
+   *
    * @since 4.0
    */
   public CDOChangeSetData copy();
 
   /**
    * Changes the internal state of this change set data by adding the changes of the given change set data.
-   * 
+   *
    * @since 4.0
    */
   public void merge(CDOChangeSetData changeSetData);
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.java
index a1bdc30fba..a1af62c105 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.common.commit;
 
 /**
  * Provides consumers with {@link CDOChangeSetData change set data} structures.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @apiviz.uses {@link CDOChangeSetData} - - provides
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitData.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitData.java
index b4bd414845..4581a6eac4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitData.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitData.java
@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * {@link CDOChangeSetData Change set data} with detailed information about new {@link #getNewPackageUnits() package
  * units}.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.java
index c8eafc796f..c970046e53 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.common.commit;
 /**
  * A call-back interface that indicates the ability to <i>handle</i> {@link CDOCommitInfo commit infos} that are passed
  * from other entities.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @apiviz.uses {@link CDOCommitInfo} - - handles
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java
index 35ea381a5d..4670e9bd92 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.java
@@ -23,8 +23,8 @@ import org.eclipse.emf.cdo.common.branch.CDOBranch;
  * @apiviz.landmark
  * @apiviz.uses {@link CDOCommitInfo} - - manages
  */
-public interface CDOCommitInfoManager extends CDOCommitInfoProvider,
-    CDOCommitHistory.Provider<CDOBranch, CDOCommitHistory>
+public interface CDOCommitInfoManager
+    extends CDOCommitInfoProvider, CDOCommitHistory.Provider<CDOBranch, CDOCommitHistory>
 {
   /**
    * @since 4.2
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java
index 2905aaa98b..7c77e99980 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/AsyncCommitInfoHandler.java
@@ -23,7 +23,7 @@ import org.eclipse.net4j.util.concurrent.QueueWorker;
  * @author Eike Stepper
  * @since 4.0
  */
-public class AsyncCommitInfoHandler extends QueueWorker<CDOCommitInfo> implements CDOCommitInfoHandler
+public class AsyncCommitInfoHandler extends QueueWorker<CDOCommitInfo>implements CDOCommitInfoHandler
 {
   private CDOCommitInfoHandler delegate;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java
index 8d4f45d425..2995e4d749 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/BinaryCommitInfoLog.java
@@ -27,7 +27,7 @@ import java.io.OutputStream;
 /**
  * A {@link CDOCommitInfoHandler commit info handler} that synchronously writes {@link CDOCommitInfo commit infos} to a
  * binary log.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java
index e6e477fc46..f4dd06a0a0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/TextCommitInfoLog.java
@@ -22,7 +22,7 @@ import java.io.PrintStream;
 /**
  * A {@link CDOCommitInfoHandler commit info handler} that synchronously writes {@link CDOCommitInfo commit infos} to a
  * text log.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/package-info.java
index b567ca62f5..b4e7ca645b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/handler/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Some useful commit info handler implementations.
  */
 package org.eclipse.emf.cdo.common.commit.handler;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/package-info.java
index c32ca4d00c..928265b8af 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common concepts for dealing with commits and change sets.
  */
 package org.eclipse.emf.cdo.common.commit;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDExternal.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDExternal.java
index b0ef40d29d..68fae288b5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDExternal.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDExternal.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.common.CDOCommonRepository;
 
 /**
  * The {@link CDOID ID} of a CDO object that is external to a CDO {@link CDOCommonRepository repository}.
- * 
+ *
  * @author Simon McDuff
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDGenerator.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDGenerator.java
index 6eea1f2f8a..470939a57a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDGenerator.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDGenerator.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 
 /**
  * Generates {@link CDOID IDs}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.1
  */
@@ -59,7 +59,7 @@ public interface CDOIDGenerator
 
   /**
    * Generates a {@link CDOID}.
-   * 
+   *
    * @param object
    *          the object to generate a new CDOID for if available, <code>null</code> otherwise.
    */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObject.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObject.java
index 2598638a8d..cce593b995 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObject.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDObject.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.common.CDOCommonRepository;
 
 /**
  * The {@link CDOID ID} of a CDO object that is persistent in a CDO {@link CDOCommonRepository repository}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java
index 115c2d5016..4807eb4d13 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDProvider.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.common.id;
 
 /**
  * Provides the {@link CDOID IDs} of passed objects.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.uses {@link CDOID} - - provides
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java
index dbd272cd3e..363f54b4f8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDReference.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 
 /**
  * Represents a {@link CDOID} typed reference from one object to another object.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java
index a8902a13a1..71f3d92dce 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDTemp.java
@@ -4,7 +4,7 @@
  * 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
  *    Simon McDuff - bug 213402
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.CDOCommonTransaction;
 /**
  * The {@link CDOID ID} of a CDO object that is new in a dirty (uncommitted) CDO {@link CDOCommonTransaction
  * transaction}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
index 379a1b3cee..c596f529db 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
@@ -153,8 +153,8 @@ public final class CDOIDUtil
         return ((CDOIDObjectLongWithClassifierImpl)id).getLongValue();
       }
 
-      throw new IllegalArgumentException(MessageFormat.format(
-          Messages.getString("CDOIDUtil.0"), id.getClass().getName())); //$NON-NLS-1$
+      throw new IllegalArgumentException(
+          MessageFormat.format(Messages.getString("CDOIDUtil.0"), id.getClass().getName())); //$NON-NLS-1$
 
     case TEMP_OBJECT:
       throw new IllegalArgumentException(Messages.getString("CDOIDUtil.1")); //$NON-NLS-1$
@@ -164,8 +164,8 @@ public final class CDOIDUtil
       throw new IllegalArgumentException(Messages.getString("CDOIDUtil.2")); //$NON-NLS-1$
 
     default:
-      throw new IllegalArgumentException(MessageFormat.format(
-          Messages.getString("CDOIDUtil.3"), id.getClass().getName())); //$NON-NLS-1$
+      throw new IllegalArgumentException(
+          MessageFormat.format(Messages.getString("CDOIDUtil.3"), id.getClass().getName())); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOReference.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOReference.java
index d5ec546ae4..2ab1557899 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOReference.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOReference.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
 
 /**
  * Represents a reference from one object to another object, possibly {@link CDOID} or CDOObject typed.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/package-info.java
index e283952bc5..76972fce53 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common concepts for dealing with object and revision IDs.
  */
 package org.eclipse.emf.cdo.common.id;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java
index d6365b8025..f907bd55f9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOBlob.java
@@ -19,7 +19,7 @@ import java.io.InputStream;
 
 /**
  * A identifiable binary large object with streaming support.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @apiviz.landmark
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java
index f539d089a6..52fafdefcc 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOClob.java
@@ -19,7 +19,7 @@ import java.io.Reader;
 
 /**
  * A identifiable character large object with streaming support.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @apiviz.landmark
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLob.java
index 0357f25983..15216103e3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLob.java
@@ -17,7 +17,7 @@ import java.io.IOException;
 
 /**
  * A identifiable large object with streaming support.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobHandler.java
index 391c32dcfc..85d8b3c980 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobHandler.java
@@ -16,7 +16,7 @@ import java.io.Writer;
 
 /**
  * A callback interface for handling large objects.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @apiviz.uses {@link CDOLob} - - handles
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java
index 2e9ac18610..5a70adce65 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobInfo.java
@@ -16,7 +16,7 @@ import java.text.MessageFormat;
 
 /**
  * Encapsulates {@link #getID() ID} and {@link #getSize() size} of a {@link CDOLob large object}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java
index 7f21182849..03ed177318 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobStore.java
@@ -17,7 +17,7 @@ import java.io.Reader;
 
 /**
  * Stores and loads {@link CDOLob large objects}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @apiviz.composedOf {@link CDOLob}
@@ -38,7 +38,7 @@ public interface CDOLobStore
 
   /**
    * An abstract {@link CDOLobStore large object store} that delegates all method calls to a delegate.
-   * 
+   *
    * @author Eike Stepper
    */
   public static abstract class Delegating implements CDOLobStore
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobUtil.java
index 5c7f12bd2b..ea149ef510 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/CDOLobUtil.java
@@ -18,7 +18,7 @@ import java.io.IOException;
 
 /**
  * Some useful helpers for dealing with {@link CDOLob large objects}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/package-info.java
index 448d83fabd..1bf10125a6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lob/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common concepts for dealing with large binary objects and large character objects.
  */
 package org.eclipse.emf.cdo.common.lob;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java
index 18d3bdde14..cae2482b1e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType;
 /**
  * Represents a change in the lock state of a set of objects. Instances are meant to be sent from the server to the
  * client for the purpose of notifying the latter.
- * 
+ *
  * @author Caspar De Groot
  * @since 4.1
  * @noextend This interface is not intended to be extended by clients.
@@ -69,7 +69,7 @@ public interface CDOLockChangeInfo extends CDOBranchPoint
 
   /**
    * Enumerates the possible locking operations.
-   * 
+   *
    * @author Caspar De Groot
    */
   public enum Operation
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfoHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfoHandler.java
index a6ed10bcb3..335880d58d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfoHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockChangeInfoHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.common.lock;
 /**
  * A call-back interface that indicates the ability to <i>handle</i> {@link CDOLockChangeInfo lock-change infos} that
  * are passed from other entities.
- * 
+ *
  * @author Caspar De Groot
  * @since 4.1
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockOwner.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockOwner.java
index b8998cd2de..07a2e7f512 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockOwner.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockOwner.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.common.lock;
 /**
  * A client-side representation of a view owning locks.
  * <p>
- * 
+ *
  * @author Caspar De Groot
  * @since 4.1
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockState.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockState.java
index d35954dc11..e6864d62bf 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockState.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockState.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
@@ -23,7 +23,7 @@ import java.util.Set;
  * As an individual lock is always owned by view, which in turn is owned by a session, the methods on this interface
  * return instances of {@link CDOLockOwner} which carry that information.
  * <p>
- * 
+ *
  * @author Caspar De Groot
  * @since 4.1
  * @noextend This interface is not intended to be extended by clients.
@@ -39,7 +39,7 @@ public interface CDOLockState
   /**
    * Gets a unique identifier for the object that is locked; typically a {@link CDOID} or a {@link CDOIDAndBranch},
    * depending on whether branching support is enabled or not
-   * 
+   *
    * @return the identifier
    */
   public Object getLockedObject();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockUtil.java
index 7bd2c95689..e4cfdcddd0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/CDOLockUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
@@ -34,7 +34,7 @@ import java.util.Random;
 
 /**
  * Various static methods that may help with classes related to CDO locks.
- * 
+ *
  * @author Caspar De Groot
  * @since 4.1
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java
index 966efdeca1..c756a33617 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/IDurableLockingManager.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import java.util.Map;
 
 /**
  * Manages all persistent aspects of durable CDO views such as {@link CDOBranchPoint branch point} and acquired locks.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @apiviz.uses {@link IDurableLockingManager.LockArea} - - manages
@@ -32,7 +32,7 @@ public interface IDurableLockingManager
 
   /**
    * Returns the {@link LockArea lock area} specified by the given durableLockingID, never <code>null</code>.
-   * 
+   *
    * @throws LockAreaNotFoundException
    *           if the given durableLockingID is unknown.
    */
@@ -45,7 +45,7 @@ public interface IDurableLockingManager
   /**
    * Encapsulates the persistable information about a single durable CDO view like {@link CDOBranchPoint branch point}
    * and acquired locks.
-   * 
+   *
    * @author Eike Stepper
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
@@ -69,14 +69,14 @@ public interface IDurableLockingManager
     /**
      * Returns <code>true</code> if this instance represents a lock area that is known to be missing (not present) on a
      * master server. (Relevant only in a replicating configuration.)
-     * 
+     *
      * @since 4.1
      */
     public boolean isMissing();
 
     /**
      * A call-back interface for <em>handling</em> {@link LockArea lock area} objects.
-     * 
+     *
      * @author Eike Stepper
      * @apiviz.uses {@link IDurableLockingManager.LockArea} - - handles
      */
@@ -89,7 +89,7 @@ public interface IDurableLockingManager
   /**
    * Thrown if a {@link LockArea lock area} is spcified that does not exist in a CDO {@link CDOCommonRepository
    * repository}.
-   * 
+   *
    * @author Eike Stepper
    */
   public static class LockAreaNotFoundException extends IllegalStateException
@@ -118,7 +118,7 @@ public interface IDurableLockingManager
 
   /**
    * Exception occurs when attempting to create a durable {@link LockArea} that already exists.
-   * 
+   *
    * @author Caspar De Groot
    * @since 4.1
    */
@@ -142,7 +142,7 @@ public interface IDurableLockingManager
 
   /**
    * Enumerates the possible combinations of read and write locks on a single CDO object.
-   * 
+   *
    * @author Eike Stepper
    * @noextend This interface is not intended to be extended by clients.
    */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/package-info.java
index b8ceffc443..94419f0f65 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/lock/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Common concepts for dealing with durable locks and views.
- * 
+ *
  * @apiviz.exclude .*Exception
  */
 package org.eclipse.emf.cdo.common.lock;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java
index 535d1093c1..a7182c28ab 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.java
@@ -26,7 +26,7 @@ import java.util.Map;
 /**
  * An EMF {@link Registry package registry} that is used by CDO {@link CDOCommonRepository repositories} and
  * {@link CDOCommonSession sessions}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
@@ -52,7 +52,7 @@ public interface CDOPackageRegistry extends EPackage.Registry
 
   /**
    * Returns all package units that are registered in this package registry.
-   * 
+   *
    * @since 3.0
    */
   public CDOPackageUnit[] getPackageUnits();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java
index 1e061d0479..f734d180a5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageTypeRegistry.java
@@ -28,7 +28,7 @@ import java.util.Map;
 
 /**
  * A {@link #INSTANCE singleton} registry for the {@link Type package unit types} of EMF {@link EPackage packages}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @apiviz.exclude
@@ -215,7 +215,7 @@ public final class CDOPackageTypeRegistry
 
   /**
    * A common marker interface for CDO (native) objects.
-   * 
+   *
    * @author Eike Stepper
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
index c675a11bd6..6675a78a59 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
@@ -202,10 +202,12 @@ public final class EMFUtil
   {
     List<String> uriFragmentPath = new ArrayList<String>();
     Resource resource;
-    for (InternalEObject container = internalEObject.eInternalContainer(); (resource = internalEObject
-        .eDirectResource()) == null && container != null; container = internalEObject.eInternalContainer())
+    for (InternalEObject container = internalEObject
+        .eInternalContainer(); (resource = internalEObject.eDirectResource()) == null
+            && container != null; container = internalEObject.eInternalContainer())
     {
-      String segment = getPositionalURIFragmentSegment(container, internalEObject.eContainingFeature(), internalEObject);
+      String segment = getPositionalURIFragmentSegment(container, internalEObject.eContainingFeature(),
+          internalEObject);
       uriFragmentPath.add(segment);
       internalEObject = container;
     }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/package-info.java
index 39df53bbaa..9ea85c876f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Common concepts for dealing with models and types.
- * 
+ *
  * @apiviz.exclude .*\.Comparable
  */
 package org.eclipse.emf.cdo.common.model;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/package-info.java
index 6a4bc61970..dc48807c91 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/package-info.java
@@ -1,21 +1,16 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Common concepts that are differently extended in clients and servers.
- * 
+ *
  * @apiviz.exclude .*\.IOptions
  * @apiviz.exclude .*\.IOptionsContainer
  * @apiviz.exclude .*\.Closeable
  * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.common;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/package-info.java
index eb5542abcd..d9a7a7cf71 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common concepts for dealing with protocols and CDO-specific I/O.
  */
 package org.eclipse.emf.cdo.common.protocol;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.java
index 2cb8780759..eedb3fd8ce 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.java
@@ -17,7 +17,7 @@ import java.util.Map;
 
 /**
  * Provides consumers with all {@link CDORevision revisions} available in an instance of this interface.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @apiviz.exclude
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOElementProxy.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOElementProxy.java
index f16e3cc068..6e56307bd4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOElementProxy.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOElementProxy.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.common.revision;
 
 /**
  * A moveable placeholder for the element of a {@link CDOList list} at a specified {@link #getIndex() index}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java
index ce08de5096..1db71b49af 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOIDAndBranch.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.id.CDOIdentifiable;
 
 /**
  * An {@link CDOID ID} / {@link CDOBranch branch} pair.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOList.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOList.java
index 1062f5893e..5c3a212e03 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOList.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOList.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * A {@link MoveableList moveable} {@link EList}.
- * 
+ *
  * @author Simon McDuff
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
@@ -29,7 +29,7 @@ public interface CDOList extends MoveableList<Object>, EList<Object>
   /**
    * Returns the element at position index of this list and optionally resolves proxies (see CDOElementProxy).
    * <p>
-   * 
+   *
    * @param index
    *          The position of the element to return from this list.
    * @param resolve
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListFactory.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListFactory.java
index 161d267cc7..9adacd0a41 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListFactory.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.internal.common.revision.CDOListImpl;
 
 /**
  * Creates {@link CDOList list} instances.
- * 
+ *
  * @author Simon McDuff
  * @since 2.0
  * @apiviz.uses {@link CDOList} - - creates
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListResolver.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListResolver.java
index e9ffa0a20a..daa8a7332a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListResolver.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDOListResolver.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  * A strategy that specifies which list elememts must be present (loaded) in a {@link CDOID} list of a
  * {@link CDORevision revision} when a certain list index is accessed. Implementations of this interface can control the
  * exact characteristics of a certain <em>partial collection loading</em> strategy.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @apiviz.uses {@link CDOList} - - resolves
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisable.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisable.java
index c008d0232f..8993e5d6a6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisable.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisable.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchVersion;
 
 /**
  * An entity that has a defined lifetime (creation plus revision) and a version in a {@link CDOBranch branch}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java
index 76fef2b84d..81d9f1afd5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionCache.java
@@ -25,7 +25,7 @@ import java.util.List;
 /**
  * Caches {@link CDORevision revisions} and possibly {@link EvictionEvent evicts} those that are no longer strongly
  * referenced when free memory runs low.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
@@ -53,7 +53,7 @@ public interface CDORevisionCache extends CDORevisionCacheAdder, INotifier
 
   /**
    * Returns a list of {@link CDORevision revisions} that are current.
-   * 
+   *
    * @since 3.0
    */
   public List<CDORevision> getCurrentRevisions();
@@ -61,7 +61,7 @@ public interface CDORevisionCache extends CDORevisionCacheAdder, INotifier
   /**
    * An {@link IEvent event} fired from a {@link CDORevisionCache revision cache} for {@link CDORevision revisions} that
    * are evicted because they are no longer strongly referenced when free memory runs low.
-   * 
+   *
    * @author Eike Stepper
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
@@ -75,7 +75,7 @@ public interface CDORevisionCache extends CDORevisionCacheAdder, INotifier
 
     /**
      * May be <code>null</code> for certain cache implementations.
-     * 
+     *
      * @since 3.0
      */
     public CDORevision getRevision();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionFactory.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionFactory.java
index d3ae63d949..64ec3f662e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionFactory.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionFactory.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass;
 
 /**
  * Creates {@link CDORevision revision} instances.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.java
index 630445ff65..1dfd3f6898 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionHandler.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.spi.common.revision.DetachedCDORevision;
 /**
  * A call-back interface that indicates the ability to <i>handle</i> {@link CDORevision revisions} that are passed from
  * other entities.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  */
@@ -23,7 +23,7 @@ public interface CDORevisionHandler
 {
   /**
    * Handles a revision.
-   * 
+   *
    * @return <code>true</code> to indicate that the caller may pass more revisions, <code>false</code> otherwise.
    * @since 4.0
    */
@@ -32,7 +32,7 @@ public interface CDORevisionHandler
   /**
    * A delegating {@link CDORevisionHandler revision handler} with a {@link #filter(CDORevision) filter()} method used
    * to suppress specific revisions.
-   * 
+   *
    * @author Eike Stepper
    * @since 4.1
    */
@@ -62,7 +62,7 @@ public interface CDORevisionHandler
 
     /**
      * A delegating {@link Filtered revision handler} that filters detached revisions.
-     * 
+     *
      * @author Eike Stepper
      */
     public static final class Undetached extends Filtered
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionKey.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionKey.java
index f851873619..fea1f015d6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionKey.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionKey.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchVersion;
 
 /**
  * Uniquely identifies a {@link CDORevision revision} by version in a {@link CDOBranch branch}.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionProvider.java
index 9bd6f92e57..8561a38e32 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionProvider.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.id.CDOID;
 /**
  * Provides consumers with the {@link CDORevision revisions} of {@link CDOID identifiable} CDO objects by selecting a
  * particular one from several possible {@link CDOBranchPoint branch points}.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @apiviz.uses {@link CDORevision} - - provides
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
index c6db0b25e7..ab6862759b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionUtil.java
@@ -639,8 +639,8 @@ public final class CDORevisionUtil
         @Override
         protected void dumpBranch(CDOBranch branch)
         {
-          out().println(
-              padTimeRange(branch.getName() + "[" + branch.getID() + "]", pad, branch.getBase().getTimeStamp(), //$NON-NLS-1$ //$NON-NLS-2$
+          out()
+              .println(padTimeRange(branch.getName() + "[" + branch.getID() + "]", pad, branch.getBase().getTimeStamp(), //$NON-NLS-1$ //$NON-NLS-2$
                   CDORevision.UNSPECIFIED_DATE));
         }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java
index 24e636c479..3df1b1594f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 /**
  * A {@link CDOFeatureDelta feature delta} that represents an addition to a many-valued {@link EStructuralFeature
  * feature}.
- * 
+ *
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java
index 3c1dbc4604..2b9498e1c2 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOClearFeatureDelta.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 /**
  * A {@link CDOFeatureDelta feature delta} that represents the removal of all elements from a many-valued
  * {@link EStructuralFeature feature}.
- * 
+ *
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java
index 864e380b4e..89a363b60e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EReference;
 /**
  * A {@link CDOFeatureDelta feature delta} that represents a modification of the {@link EObject#eContainer() eContainer}
  * feature.
- * 
+ *
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java
index 65ba442fff..419361e274 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 /**
  * A {@link CDOFeatureDelta feature delta} that represents a move of one element of a many-valued
  * {@link EStructuralFeature feature} to a different list position.
- * 
+ *
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOOriginSizeProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOOriginSizeProvider.java
index 302190609a..874b1880e0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOOriginSizeProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOOriginSizeProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java
index 7aef7a6270..de28ff5aa1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 /**
  * A {@link CDOFeatureDelta feature delta} that represents a removal from a many-valued {@link EStructuralFeature
  * feature}.
- * 
+ *
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDeltaProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDeltaProvider.java
index 7578a2aeaf..9059e6804f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDeltaProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDeltaProvider.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.common.id.CDOID;
 
 /**
  * Provides consumers with the {@link CDORevisionDelta revision deltas} of {@link CDOID identifiable} CDO objects.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @apiviz.uses {@link CDORevisionDelta} - - provides
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java
index cb40171c8f..89c799022a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 /**
  * A {@link CDOFeatureDelta feature delta} that represents a value change of a single-valued {@link EStructuralFeature
  * feature}.
- * 
+ *
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java
index 7df2db9a6e..215e027a94 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 /**
  * A {@link CDOFeatureDelta feature delta} that represents the <em>unsetting</em> of the value of a
  * {@link EStructuralFeature feature}.
- * 
+ *
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/package-info.java
index 5e84728e7b..b11c74219b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common concepts for dealing with revision deltas and feature deltas.
  */
 package org.eclipse.emf.cdo.common.revision.delta;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/package-info.java
index 4f94ead611..94a82de210 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/package-info.java
@@ -1,19 +1,14 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Common concepts for dealing with revisions and revision lists.
- * 
+ *
  * @apiviz.exclude .*\.INotifier
  * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.common.revision;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/package-info.java
index 4e27e46e33..333a80841e 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/security/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Common concepts for dealing with permissions and protectable entities.
  */
 package org.eclipse.emf.cdo.common.security;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/BlockingCloseableIterator.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/BlockingCloseableIterator.java
index 56c825b93c..66c2cae2f2 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/BlockingCloseableIterator.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/BlockingCloseableIterator.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.collection.CloseableIterator;
 /**
  * A closeable iterator that blocks on {@link #hasNext()} until the next element is available or the end of the
  * iteration is reached.
- * 
+ *
  * @author Simon McDuff
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonEventAdapter.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonEventAdapter.java
index 24d0ba9c95..7e20958a79 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonEventAdapter.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonEventAdapter.java
@@ -20,7 +20,7 @@ import org.eclipse.net4j.util.event.IEvent;
 
 /**
  * A convenience adapter for common CDO {@link IEvent events}.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOException.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOException.java
index 25d7944e91..ab821163cf 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOException.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOException.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.common.util;
 
 /**
  * An unchecked exception for general CDO purposes.
- * 
+ *
  * @author Eike Stepper
  */
 public class CDOException extends RuntimeException
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOFetchRule.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOFetchRule.java
index e41ee378f7..2c20b3b5dd 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOFetchRule.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOFetchRule.java
@@ -24,7 +24,7 @@ import java.util.List;
 
 /**
  * Represents a subset of the {@link EStructuralFeature features} of a {@link EClass class}.
- * 
+ *
  * @author Simon McDuff
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java
index 4249a8f33b..a9358b52b5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOQueryQueue.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * The {@link Queue queue} that represents the result of a CDOQuery.
- * 
+ *
  * @author Simon McDuff
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
@@ -327,7 +327,7 @@ public class CDOQueryQueue<E> implements Queue<E>, Closeable
 
   /**
    * A blocking iterator that takes elements from a {@link CDOQueryQueue}.
-   * 
+   *
    * @author Simon McDuff
    * @since 2.0
    */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOTimeProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOTimeProvider.java
index a9dcadccda..b443211047 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOTimeProvider.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOTimeProvider.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.common.util;
 
 /**
  * Provides the consumer with a long-valued time stamp.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/PartialCollectionLoadingNotSupportedException.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/PartialCollectionLoadingNotSupportedException.java
index 313bf4c63a..652431c8a1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/PartialCollectionLoadingNotSupportedException.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/PartialCollectionLoadingNotSupportedException.java
@@ -4,7 +4,7 @@
  * 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,7 +15,7 @@ import org.eclipse.emf.cdo.common.revision.CDOElementProxy;
 /**
  * An unchecked exception that indicates that {@link CDOElementProxy list element proxies} have been encountered but
  * cannot be handled.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @since 4.1
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java
index a29848043f..857d1239fe 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/RepositoryTypeChangedEvent.java
@@ -32,7 +32,8 @@ public class RepositoryTypeChangedEvent extends Event implements CDOCommonReposi
 
   private CDOCommonRepository.Type newType;
 
-  public RepositoryTypeChangedEvent(INotifier source, CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType)
+  public RepositoryTypeChangedEvent(INotifier source, CDOCommonRepository.Type oldType,
+      CDOCommonRepository.Type newType)
   {
     super(source);
     this.oldType = oldType;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/TransportException.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/TransportException.java
index 45dd2490fe..ec36e11fae 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/TransportException.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/TransportException.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.common.util;
 
 /**
  * An unchecked exception that indicates transport-level problems.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/package-info.java
index 9d6f94b2d0..c49d0485f5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Common utility classes, some common interfaces and exceptions.
- * 
+ *
  * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.common.util;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
index b876db4ed4..1c3eec89ca 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java
@@ -35,7 +35,7 @@ import java.util.List;
 /**
  * @author Eike Stepper
  */
-public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBranch
+public class CDOBranchImpl extends Container<CDOBranch>implements InternalCDOBranch
 {
   private static final InternalCDOBranch[] NO_BRANCHES = new InternalCDOBranch[0];
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
index 184abbe9b9..f8ad6d7d69 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java
@@ -34,7 +34,7 @@ import java.util.Map;
 /**
  * @author Eike Stepper
  */
-public class CDOBranchManagerImpl extends Container<CDOBranch> implements InternalCDOBranchManager
+public class CDOBranchManagerImpl extends Container<CDOBranch>implements InternalCDOBranchManager
 {
   private CDOCommonRepository repository;
 
@@ -226,8 +226,8 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
   {
     checkActive();
 
-    Pair<Integer, Long> result = branchLoader.createBranch(branchID, new BranchInfo(name, baseBranch.getID(),
-        baseTimeStamp));
+    Pair<Integer, Long> result = branchLoader.createBranch(branchID,
+        new BranchInfo(name, baseBranch.getID(), baseTimeStamp));
     branchID = result.getElement1();
     baseTimeStamp = result.getElement2();
 
@@ -322,8 +322,8 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern
    * @author Eike Stepper
    */
   @Deprecated
-  private static final class BranchCreatedEvent extends BranchChangedEvent implements
-      org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent
+  private static final class BranchCreatedEvent extends BranchChangedEvent
+      implements org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent
   {
     private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java
index e3d8bbb6e4..1d2f77a29c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java
index 27e953db85..2c5fbdb22a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java
@@ -212,9 +212,8 @@ public class CDOChangeSetDataImpl implements CDOChangeSetData
   @Override
   public String toString()
   {
-    return MessageFormat
-        .format(
-            "ChangeSetData[newObjects={0}, changedObjects={1}, detachedObjects={2}]", newObjects.size(), changedObjects.size(), detachedObjects.size()); //$NON-NLS-1$
+    return MessageFormat.format("ChangeSetData[newObjects={0}, changedObjects={1}, detachedObjects={2}]", //$NON-NLS-1$
+        newObjects.size(), changedObjects.size(), detachedObjects.size());
   }
 
   public static String format(CDOChangeSetData changeSetData)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
index 8f0375c006..a7ece4baef 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java
@@ -47,7 +47,7 @@ public class CDOCommitDataImpl extends CDOChangeSetDataImpl implements CDOCommit
   {
     return MessageFormat.format(
         "CommitData[newPackageUnits={0}, newObjects={1}, changedObjects={2}, detachedObjects={3}]", //$NON-NLS-1$
-        commitData.getNewPackageUnits().size(), commitData.getNewObjects().size(), commitData.getChangedObjects()
-            .size(), commitData.getDetachedObjects().size());
+        commitData.getNewPackageUnits().size(), commitData.getNewObjects().size(),
+        commitData.getChangedObjects().size(), commitData.getDetachedObjects().size());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java
index 2d54e4ef92..cfc1790348 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java
@@ -37,7 +37,7 @@ import java.util.Map;
  * @author Eike Stepper
  * @since 4.2
  */
-public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CDOCommitHistory
+public class CDOCommitHistoryImpl extends Container<CDOCommitInfo>implements CDOCommitHistory
 {
   private final TriggerLoadElement triggerLoadElement = new TriggerLoadElementImpl();
 
@@ -529,7 +529,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD
   /**
    * @author Eike Stepper
    */
-  public static final class Empty extends Container<CDOCommitInfo> implements CDOCommitHistory
+  public static final class Empty extends Container<CDOCommitInfo>implements CDOCommitHistory
   {
     private static final CDOCommitInfo[] NO_ELEMENTS = {};
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
index 13d850ab21..3188a74a75 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java
@@ -26,8 +26,8 @@ import java.util.WeakHashMap;
  * @author Eike Stepper
  * @since 4.2
  */
-public abstract class CDOCommitHistoryProviderImpl<KEY, HISTORY extends CDOCommitHistory> extends Lifecycle implements
-    CDOCommitHistory.Provider<KEY, HISTORY>
+public abstract class CDOCommitHistoryProviderImpl<KEY, HISTORY extends CDOCommitHistory> extends Lifecycle
+    implements CDOCommitHistory.Provider<KEY, HISTORY>
 {
   private Map<CDOCommitHistory, KEY> histories = new WeakHashMap<CDOCommitHistory, KEY>();
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
index 186ed2e5c1..9cb2ad7d03 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java
@@ -239,9 +239,8 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn
     long t = commitInfo.getTimeStamp();
     String timeStamp = CDOCommonUtil.formatTimeStamp(t) + " (" + t + ")";
 
-    return MessageFormat
-        .format(
-            "CommitInfo[{0}, {1}, {2}, {3}, {4}]", timeStamp, commitInfo.getBranch(), commitInfo.getUserID(), commitInfo.getComment(), data); //$NON-NLS-1$
+    return MessageFormat.format("CommitInfo[{0}, {1}, {2}, {3}, {4}]", timeStamp, commitInfo.getBranch(), //$NON-NLS-1$
+        commitInfo.getUserID(), commitInfo.getComment(), data);
   }
 
   public synchronized boolean isCommitDataLoaded()
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java
index 7c2fa4530d..d12e3cf15a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java
@@ -32,8 +32,8 @@ import java.util.WeakHashMap;
 /**
  * @author Andre Dietisheim
  */
-public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBranch, CDOCommitHistory> implements
-    InternalCDOCommitInfoManager
+public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBranch, CDOCommitHistory>
+    implements InternalCDOCommitInfoManager
 {
   private final Map<CDOCommitInfo, WeakReference<CDOCommitInfo>> cache;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
index 3edbc4efe5..f0ec767611 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java
@@ -29,8 +29,8 @@ import java.io.ObjectStreamException;
  * @author Martin Taal
  * @since 3.0
  */
-public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID implements InternalCDOIDObject,
-    CDOClassifierRef.Provider
+public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID
+    implements InternalCDOIDObject, CDOClassifierRef.Provider
 {
   private static final long serialVersionUID = 1L;
 
@@ -77,7 +77,7 @@ public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID imple
   public String toURIFragment()
   {
     return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName()
-        + CDOClassifierRef.URI_SEPARATOR + value;
+    + CDOClassifierRef.URI_SEPARATOR + value;
   }
 
   public Type getType()
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
index b6e780ec14..15144775ea 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java
@@ -29,8 +29,8 @@ import java.io.ObjectStreamException;
  * @author Martin Taal
  * @since 3.0
  */
-public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID implements InternalCDOIDObject,
-    CDOIDString, CDOClassifierRef.Provider
+public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID
+    implements InternalCDOIDObject, CDOIDString, CDOClassifierRef.Provider
 {
   private static final long serialVersionUID = 1L;
 
@@ -77,7 +77,7 @@ public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID imp
   public String toURIFragment()
   {
     return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName()
-        + CDOClassifierRef.URI_SEPARATOR + value;
+    + CDOClassifierRef.URI_SEPARATOR + value;
   }
 
   public Type getType()
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java
index 7644dd9615..745dac012f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java
@@ -4,7 +4,7 @@
  * 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
  *    Caspar De Groot - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java
index ea2dc1d53c..6824053a6d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/messages/Messages.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/messages/Messages.java
index 34c0e34824..0647442c14 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
index 0440b8f50a..7e8c8fc6d3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
@@ -332,7 +332,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
   public InternalCDOPackageUnit copy()
   {
     InternalCDOPackageUnit packageUnit = (InternalCDOPackageUnit)CDOModelUtil.createPackageUnit();
-  
+
     InternalCDOPackageInfo[] thesePackageInfos = getPackageInfos();
     InternalCDOPackageInfo[] packageInfos = new InternalCDOPackageInfo[thesePackageInfos.length];
     for (int i = 0; i < thesePackageInfos.length; i++)
@@ -340,7 +340,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
       packageInfos[i] = thesePackageInfos[i].copy();
       packageInfos[i].setPackageUnit(packageUnit);
     }
-  
+
     packageUnit.setPackageInfos(packageInfos);
     packageUnit.setOriginalType(getOriginalType());
     packageUnit.setState(getState());
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
index 2aaf8ea11e..db465fd4bc 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java
@@ -33,8 +33,8 @@ import java.text.MessageFormat;
 /**
  * @author Eike Stepper
  */
-public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<InternalCDORevision> implements
-    InternalCDORevisionCache
+public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<InternalCDORevision>
+    implements InternalCDORevisionCache
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_REVISION, AbstractCDORevisionCache.class);
 
@@ -66,8 +66,8 @@ public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<Inte
       CDOBranchManager actualBranchManager = branch.getBranchManager();
       if (actualBranchManager != branchManager)
       {
-        throw new IllegalArgumentException("Wrong branch manager: " + actualBranchManager + "; expected: "
-            + branchManager);
+        throw new IllegalArgumentException(
+            "Wrong branch manager: " + actualBranchManager + "; expected: " + branchManager);
       }
     }
   }
@@ -155,7 +155,7 @@ public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<Inte
   /**
    * @author Eike Stepper
    */
-  private static final class CacheSoftReference extends SoftReference<InternalCDORevision> implements CDORevisionKey
+  private static final class CacheSoftReference extends SoftReference<InternalCDORevision>implements CDORevisionKey
   {
     private CDOID id;
 
@@ -196,7 +196,7 @@ public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<Inte
   /**
    * @author Eike Stepper
    */
-  private static final class CacheStrongReference extends SoftReference<InternalCDORevision> implements CDORevisionKey
+  private static final class CacheStrongReference extends SoftReference<InternalCDORevision>implements CDORevisionKey
   {
     private CDOID id;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java
index 05a73f0d05..071d3f8c3d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java
@@ -27,7 +27,7 @@ import java.util.Collection;
 /**
  * @author Simon McDuff
  */
-public class CDOListImpl extends BasicEList<Object> implements InternalCDOList.ConfigurableEquality
+public class CDOListImpl extends BasicEList<Object>implements InternalCDOList.ConfigurableEquality
 {
   public static final CDOListFactory FACTORY = new CDOListFactory()
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
index 685860e3ac..0d0c556879 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
@@ -311,8 +311,8 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
       List<? extends CDORevision> primaryLoadedRevisions //
       = getResultsAndSynthetics(infosToLoad.toArray(new RevisionInfo[0]), null);
 
-      if (primaryLoadedRevisions != null && !primaryLoadedRevisions.isEmpty() || additionalLoadedRevisions != null
-          && !additionalLoadedRevisions.isEmpty())
+      if (primaryLoadedRevisions != null && !primaryLoadedRevisions.isEmpty()
+          || additionalLoadedRevisions != null && !additionalLoadedRevisions.isEmpty())
       {
         if (primaryLoadedRevisions == null)
         {
@@ -428,7 +428,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
       List<InternalCDORevision> additionalRevisions = null;
 
       List<RevisionInfo> additionalRevisionInfos = //
-      revisionLoader.loadRevisions(infosToLoad, branchPoint, referenceChunk, prefetchDepth);
+          revisionLoader.loadRevisions(infosToLoad, branchPoint, referenceChunk, prefetchDepth);
 
       if (additionalRevisionInfos != null)
       {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java
index 6ff65dee44..afb7030351 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java
@@ -28,8 +28,8 @@ import java.io.IOException;
 /**
  * @author Simon McDuff
  */
-public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl implements CDOAddFeatureDelta,
-    ListIndexAffecting, ListTargetAdding
+public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl
+    implements CDOAddFeatureDelta, ListIndexAffecting, ListTargetAdding
 {
   public CDOAddFeatureDeltaImpl(EStructuralFeature feature, int index, Object value)
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
index b5dd4e1466..1bacbf2689 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java
@@ -186,7 +186,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
         cachedSources = new ListTargetAdding[initialCapacity];
       }
       else
-      // i.e. unprocessedFeatureDeltas != null
+        // i.e. unprocessedFeatureDeltas != null
       {
         int requiredCapacity = 1 + cachedIndices[0] + unprocessedFeatureDeltas.size();
         if (cachedIndices.length < requiredCapacity)
@@ -606,8 +606,8 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL
   private static <T, U> T[] copyOf(U[] original, int newLength, Class<? extends T[]> newType)
   {
     @SuppressWarnings("unchecked")
-    T[] copy = (Object)newType == (Object)Object[].class ? (T[])new Object[newLength] : (T[])Array.newInstance(
-        newType.getComponentType(), newLength);
+    T[] copy = (Object)newType == (Object)Object[].class ? (T[])new Object[newLength]
+        : (T[])Array.newInstance(newType.getComponentType(), newLength);
     System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
     return copy;
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java
index 9c712b50c5..ee432f1ee3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java
@@ -32,8 +32,8 @@ import java.text.MessageFormat;
 /**
  * @author Simon McDuff
  */
-public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOMoveFeatureDelta, ListIndexAffecting,
-    WithIndex
+public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl
+    implements CDOMoveFeatureDelta, ListIndexAffecting, WithIndex
 {
   private int oldPosition;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java
index 274666c590..336b146158 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java
@@ -29,8 +29,8 @@ import java.io.IOException;
 /**
  * @author Simon McDuff
  */
-public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl implements CDORemoveFeatureDelta,
-    ListIndexAffecting
+public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl
+    implements CDORemoveFeatureDelta, ListIndexAffecting
 {
   public CDORemoveFeatureDeltaImpl(EStructuralFeature feature, int index)
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java
index 51938faf3c..7187adfc5d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java
@@ -28,8 +28,8 @@ import java.text.MessageFormat;
 /**
  * @author Simon McDuff
  */
-public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl implements CDOSetFeatureDelta,
-    ListTargetAdding
+public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl
+    implements CDOSetFeatureDelta, ListTargetAdding
 {
   private Object oldValue = CDOSetFeatureDelta.UNSPECIFIED;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java
index dafba36385..1d649a1153 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/CDOReplicationContext.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.common.lock.IDurableLockingManager;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface CDOReplicationContext extends CDOReplicationInfo, CDOBranchHandler, CDOCommitInfoHandler,
-    IDurableLockingManager.LockArea.Handler
+public interface CDOReplicationContext
+    extends CDOReplicationInfo, CDOBranchHandler, CDOCommitInfoHandler, IDurableLockingManager.LockArea.Handler
 {
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java
index 42e0f21e57..8ebcb3af98 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java
@@ -28,7 +28,7 @@ import java.util.Map;
  * @author Eike Stepper
  * @since 4.1
  */
-public abstract class AbstractCDOAdmin extends SetContainer<CDOAdminRepository> implements CDOAdmin
+public abstract class AbstractCDOAdmin extends SetContainer<CDOAdminRepository>implements CDOAdmin
 {
   private final long timeout;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/package-info.java
index 165d2cb092..66c5ad1397 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/admin/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Common concepts for dealing with protocols and CDO administration-specific I/O.
  */
 package org.eclipse.emf.cdo.spi.common.admin;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java
index 620432ba60..0be5613bc0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.java
@@ -68,7 +68,7 @@ public final class CDOBranchUtil
         if (branch == null)
         {
           throw new IllegalArgumentException("Time " + CDOCommonUtil.formatTimeStamp(timeStamp)
-              + " is before the repository creation time " + CDOCommonUtil.formatTimeStamp(baseTime));
+          + " is before the repository creation time " + CDOCommonUtil.formatTimeStamp(baseTime));
         }
       }
       else
@@ -89,7 +89,7 @@ public final class CDOBranchUtil
       branch = branchManager.getBranch(branch.getID());
       branchPoint = branch.getPoint(branchPoint.getTimeStamp());
     }
-  
+
     return branchPoint;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/package-info.java
index 01f7406d1f..792dc38688 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/branch/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common service provider interfaces and useful base implementations for dealing with branches.
  */
 package org.eclipse.emf.cdo.spi.common.branch;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java
index c596a11a6a..38cf892396 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/CDOChangeKindCache.java
@@ -26,7 +26,7 @@ import java.util.List;
  * @author Eike Stepper
  * @since 4.0
  */
-public class CDOChangeKindCache extends HashMap<CDOID, CDOChangeKind> implements CDOChangeKindProvider
+public class CDOChangeKindCache extends HashMap<CDOID, CDOChangeKind>implements CDOChangeKindProvider
 {
   private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/package-info.java
index ad53faf421..762ed34058 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/commit/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common service provider interfaces and useful base implementations for dealing with commits and change sets.
  */
 package org.eclipse.emf.cdo.spi.common.commit;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/package-info.java
index 39de773851..06d79c0670 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/id/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common service provider interfaces and useful base implementations for dealing with object and revision IDs.
  */
 package org.eclipse.emf.cdo.spi.common.id;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/lock/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/lock/package-info.java
index b428060e55..fc98867ce7 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/lock/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/lock/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common service provider interfaces and useful base implementations for dealing with object locks.
  */
 package org.eclipse.emf.cdo.spi.common.lock;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/package-info.java
index 0721161beb..0eb2b5dbcb 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common service provider interfaces and useful base implementations for dealing with models and types
  */
 package org.eclipse.emf.cdo.spi.common.model;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/package-info.java
index 64751597a6..616adfc26d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common service provider interfaces and useful base implementations.
  */
 package org.eclipse.emf.cdo.spi.common;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java
index 3a3385d6e7..d74372d400 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataOutputImpl.java
@@ -532,8 +532,8 @@ public class CDODataOutputImpl extends ExtendedDataOutput.Delegating implements
       type = CDOModelUtil.getPrimitiveType(value.getClass());
       if (type == null)
       {
-        throw new IllegalArgumentException(MessageFormat.format(
-            Messages.getString("CDODataOutputImpl.6"), value.getClass())); //$NON-NLS-1$
+        throw new IllegalArgumentException(
+            MessageFormat.format(Messages.getString("CDODataOutputImpl.6"), value.getClass())); //$NON-NLS-1$
       }
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/package-info.java
index 155089965f..4f923c379b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Common base implementations for dealing with I/O of CDO data structures.
  */
 package org.eclipse.emf.cdo.spi.common.protocol;
-
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
index a3dd6b4576..2738d7cf1f 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.java
@@ -224,10 +224,9 @@ public abstract class BaseCDORevision extends AbstractCDORevision
 
     if (TRACER.isEnabled())
     {
-      TRACER
-          .format(
-              "Reading revision: ID={0}, className={1}, version={2}, branchPoint={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$
-              id, getEClass().getName(), version, branchPoint, revised, resourceID, containerID, containingFeatureID);
+      TRACER.format(
+          "Reading revision: ID={0}, className={1}, version={2}, branchPoint={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$
+          id, getEClass().getName(), version, branchPoint, revised, resourceID, containerID, containingFeatureID);
     }
   }
 
@@ -364,10 +363,9 @@ public abstract class BaseCDORevision extends AbstractCDORevision
 
     if (TRACER.isEnabled())
     {
-      TRACER
-          .format(
-              "Writing revision: ID={0}, className={1}, version={2}, branchPoint={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$
-              id, eClass.getName(), getVersion(), branchPoint, revised, resourceID, containerID, containingFeatureID);
+      TRACER.format(
+          "Writing revision: ID={0}, className={1}, version={2}, branchPoint={3}, revised={4}, resource={5}, container={6}, featureID={7}", //$NON-NLS-1$
+          id, eClass.getName(), getVersion(), branchPoint, revised, resourceID, containerID, containingFeatureID);
     }
 
     out.writeCDOClassifierRef(classRef);
@@ -586,7 +584,7 @@ public abstract class BaseCDORevision extends AbstractCDORevision
     if (revised != UNSPECIFIED_DATE && revised < Math.max(0, created))
     {
       throw new IllegalArgumentException("revision=" + this + ", created=" + CDOCommonUtil.formatTimeStamp(created)
-          + ", revised=" + CDOCommonUtil.formatTimeStamp(revised));
+      + ", revised=" + CDOCommonUtil.formatTimeStamp(revised));
     }
 
     if (TRACER.isEnabled())
@@ -869,8 +867,8 @@ public abstract class BaseCDORevision extends AbstractCDORevision
     }
     catch (ArrayIndexOutOfBoundsException ex)
     {
-      throw new IllegalArgumentException(MessageFormat.format(Messages.getString("AbstractCDORevision.20"), feature,
-          getClassInfo()), ex);
+      throw new IllegalArgumentException(
+          MessageFormat.format(Messages.getString("AbstractCDORevision.20"), feature, getClassInfo()), ex);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionCache.java
index c773b74966..52921d4fce 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionCache.java
@@ -41,7 +41,7 @@ public interface InternalCDORevisionCache extends CDORevisionCache, CDOAllRevisi
 
   /**
    * Fills a list with all {@link CDORevision revisions}.
-   * 
+   *
    * @since 4.3
    * @see #getAllRevisions()
    */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
index dbc1cc9995..77d95ad1c1 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
@@ -108,8 +108,8 @@ public interface InternalCDORevisionManager extends CDORevisionManager, CDORevis
     /**
      * @since 4.3
      */
-    public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp,
-        boolean exactTime, CDORevisionHandler handler);
+    public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime,
+        CDORevisionHandler handler);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java
index f90996614b..9862f093dc 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.java
@@ -215,8 +215,7 @@ public abstract class RevisionInfo
   /**
    * @since 4.1
    */
-  protected void writeRevision(CDODataOutput out, int referenceChunk, CDOBranchPoint securityContext)
-      throws IOException
+  protected void writeRevision(CDODataOutput out, int referenceChunk, CDOBranchPoint securityContext) throws IOException
   {
     out.writeCDORevision(result, referenceChunk, securityContext);
   }
@@ -231,8 +230,7 @@ public abstract class RevisionInfo
    * @deprecated Call {@link #writeResult(CDODataOutput, InternalCDORevision, int, CDOBranchPoint)}
    */
   @Deprecated
-  public static void writeResult(CDODataOutput out, InternalCDORevision revision, int referenceChunk)
-      throws IOException
+  public static void writeResult(CDODataOutput out, InternalCDORevision revision, int referenceChunk) throws IOException
   {
     writeResult(out, revision, referenceChunk, null);
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/package-info.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/package-info.java
index b87ae07299..acb32ac37c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Common service provider interfaces and useful base implementations for dealing with revisions and deltas.
  */
 package org.eclipse.emf.cdo.spi.common.revision;
-
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
index e1a6f62f10..e7c4d05f65 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
@@ -227,14 +227,14 @@ public class CDOCompare
     }
 
     @Override
-    protected Set<Match> matchPerId(Iterator<? extends EObject> leftEObjects,
-        Iterator<? extends EObject> rightEObjects, Iterator<? extends EObject> originEObjects,
-        List<EObject> leftEObjectsNoID, List<EObject> rightEObjectsNoID, List<EObject> originEObjectsNoID)
+    protected Set<Match> matchPerId(Iterator<? extends EObject> leftEObjects, Iterator<? extends EObject> rightEObjects,
+        Iterator<? extends EObject> originEObjects, List<EObject> leftEObjectsNoID, List<EObject> rightEObjectsNoID,
+        List<EObject> originEObjectsNoID)
     {
       if (GETPARENTEOBJECT_METHOD == null)
       {
-        return matchPerIdCompatibility(leftEObjects, rightEObjects, originEObjects, leftEObjectsNoID,
-            rightEObjectsNoID, originEObjectsNoID);
+        return matchPerIdCompatibility(leftEObjects, rightEObjects, originEObjects, leftEObjectsNoID, rightEObjectsNoID,
+            originEObjectsNoID);
       }
 
       return super.matchPerId(leftEObjects, rightEObjects, originEObjects, leftEObjectsNoID, rightEObjectsNoID,
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/package-info.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/package-info.java
index 007ad26bac..78810bed5b 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Client concepts for integrating EMF Compare with CDO.
  */
 package org.eclipse.emf.cdo.compare;
-
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/META-INF/MANIFEST.MF
index cd4e000714..a278950a89 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit;singleton:=true
-Bundle-Version: 2.0.200.qualifier
+Bundle-Version: 2.0.300.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawnCodeGenEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnFragmentGeneratorItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnFragmentGeneratorItemProvider.java
index b389fa594b..5df85c38f9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnFragmentGeneratorItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnFragmentGeneratorItemProvider.java
@@ -36,8 +36,8 @@ import java.util.List;
  * @generated
  * @since 1.0
  */
-public class DawnFragmentGeneratorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class DawnFragmentGeneratorItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -75,13 +75,13 @@ public class DawnFragmentGeneratorItemProvider extends ItemProviderAdapter imple
    */
   protected void addFragmentNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnFragmentGenerator_fragmentName_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_fragmentName_feature",
-            "_UI_DawnFragmentGenerator_type"), DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__FRAGMENT_NAME,
-        true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnFragmentGenerator_fragmentName_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_fragmentName_feature",
+                "_UI_DawnFragmentGenerator_type"),
+            DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__FRAGMENT_NAME, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -92,14 +92,13 @@ public class DawnFragmentGeneratorItemProvider extends ItemProviderAdapter imple
    */
   protected void addDawnEditorClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnFragmentGenerator_dawnEditorClassName_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_dawnEditorClassName_feature",
-            "_UI_DawnFragmentGenerator_type"),
-        DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnFragmentGenerator_dawnEditorClassName_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_dawnEditorClassName_feature",
+                "_UI_DawnFragmentGenerator_type"),
+            DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -109,13 +108,12 @@ public class DawnFragmentGeneratorItemProvider extends ItemProviderAdapter imple
    */
   protected void addDawnGeneratorPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnFragmentGenerator_dawnGenerator_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_dawnGenerator_feature",
-            "_UI_DawnFragmentGenerator_type"), DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR,
-        true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnFragmentGenerator_dawnGenerator_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnFragmentGenerator_dawnGenerator_feature",
+                "_UI_DawnFragmentGenerator_type"),
+            DawngenmodelPackage.Literals.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnGeneratorItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnGeneratorItemProvider.java
index 40bc6d4920..8e73b29dd6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnGeneratorItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawnGeneratorItemProvider.java
@@ -36,8 +36,8 @@ import java.util.List;
  * @generated
  * @since 1.0
  */
-public class DawnGeneratorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+public class DawnGeneratorItemProvider extends ItemProviderAdapter
+    implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -75,13 +75,13 @@ public class DawnGeneratorItemProvider extends ItemProviderAdapter implements IE
    */
   protected void addConflictColorPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGenerator_conflictColor_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_conflictColor_feature",
-            "_UI_DawnGenerator_type"), DawngenmodelPackage.Literals.DAWN_GENERATOR__CONFLICT_COLOR, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGenerator_conflictColor_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_conflictColor_feature",
+                "_UI_DawnGenerator_type"),
+            DawngenmodelPackage.Literals.DAWN_GENERATOR__CONFLICT_COLOR, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -91,13 +91,13 @@ public class DawnGeneratorItemProvider extends ItemProviderAdapter implements IE
    */
   protected void addLocalLockColorPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGenerator_localLockColor_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_localLockColor_feature",
-            "_UI_DawnGenerator_type"), DawngenmodelPackage.Literals.DAWN_GENERATOR__LOCAL_LOCK_COLOR, true, false,
-        false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGenerator_localLockColor_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_localLockColor_feature",
+                "_UI_DawnGenerator_type"),
+            DawngenmodelPackage.Literals.DAWN_GENERATOR__LOCAL_LOCK_COLOR, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -107,13 +107,13 @@ public class DawnGeneratorItemProvider extends ItemProviderAdapter implements IE
    */
   protected void addRemoteLockColorPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGenerator_remoteLockColor_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_remoteLockColor_feature",
-            "_UI_DawnGenerator_type"), DawngenmodelPackage.Literals.DAWN_GENERATOR__REMOTE_LOCK_COLOR, true, false,
-        false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGenerator_remoteLockColor_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnGenerator_remoteLockColor_feature",
+                "_UI_DawnGenerator_type"),
+            DawngenmodelPackage.Literals.DAWN_GENERATOR__REMOTE_LOCK_COLOR, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawngenmodelItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawngenmodelItemProviderAdapterFactory.java
index a55630a696..6dbdd5bc3c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawngenmodelItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/provider/DawngenmodelItemProviderAdapterFactory.java
@@ -38,8 +38,8 @@ import java.util.Collection;
  *
  * @generated
  */
-public class DawngenmodelItemProviderAdapterFactory extends DawngenmodelAdapterFactory implements
-    ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class DawngenmodelItemProviderAdapterFactory extends DawngenmodelAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/editor/registry/DawnGenModelEditorRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/editor/registry/DawnGenModelEditorRegistry.java
index 3431911d2d..31c75428a1 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/editor/registry/DawnGenModelEditorRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/editor/registry/DawnGenModelEditorRegistry.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java
index 77a12aa331..ef863b0fb8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelActionBarContributor.java
@@ -49,8 +49,8 @@ import java.util.Collection;
  * @author Martin Fluegge
  * @generated
  */
-public class DawngenmodelActionBarContributor extends EditingDomainActionBarContributor implements
-    ISelectionChangedListener
+public class DawngenmodelActionBarContributor extends EditingDomainActionBarContributor
+    implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
index bbbcbae556..15bb411235 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java
@@ -131,7 +131,7 @@ import java.util.Map;
  * @generated
  */
 public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker, ISelectionChangedListener
+IMenuListener, IViewerProvider, IGotoMarker, ISelectionChangedListener
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model. <!-- begin-user-doc --> <!--
@@ -398,11 +398,11 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED
-                  && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED
+                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet.getResource(
-                    URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet
+                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -939,8 +939,9 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
       BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0, getString("_UI_CreateModelError_message",
-              resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
+          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()),
+          new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
@@ -1199,8 +1200,8 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources()
-                .get(0)), true);
+            contentOutlineViewer
+                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
@@ -1467,9 +1468,9 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
-        .getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-    doSave(progressMonitor);
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
+        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+        doSave(progressMonitor);
   }
 
   /**
@@ -1583,8 +1584,8 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
-        : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java
index 8121fbe2ad..75179f5cbd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelModelWizard.java
@@ -81,17 +81,16 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
    *
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections
-      .unmodifiableList(Arrays.asList(DawnCodeGenEditorPlugin.INSTANCE.getString(
-          "_UI_DawngenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
+      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display. <!-- begin-user-doc --> <!-- end-user-doc -->
    *
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = DawnCodeGenEditorPlugin.INSTANCE.getString(
-      "_UI_DawngenmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = DawnCodeGenEditorPlugin.INSTANCE
+      .getString("_UI_DawngenmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
 
   /**
    * This caches an instance of the model package. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -153,8 +152,8 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(DawnCodeGenEditorPlugin.INSTANCE
-        .getImage("full/wizban/NewDawngenmodel")));
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
+        .getImageDescriptor(DawnCodeGenEditorPlugin.INSTANCE.getImage("full/wizban/NewDawngenmodel")));
   }
 
   /**
@@ -587,10 +586,11 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
     //
     newFileCreationPage = new DawngenmodelModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelModelWizard_label"));
-    newFileCreationPage.setDescription(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_DawngenmodelModelWizard_description"));
-    newFileCreationPage.setFileName(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_DawngenmodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+    newFileCreationPage
+        .setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelModelWizard_description"));
+    newFileCreationPage
+        .setFileName(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelEditorFilenameDefaultBase") + "."
+            + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -634,8 +634,8 @@ public class DawngenmodelModelWizard extends Wizard implements INewWizard
     }
     initialObjectCreationPage = new DawngenmodelModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawngenmodelModelWizard_label"));
-    initialObjectCreationPage.setDescription(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage
+        .setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/META-INF/MANIFEST.MF
index 75665c1737..5a2049595f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.provider.DawnGenModelEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEMFGeneratorItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEMFGeneratorItemProvider.java
index 63c980dc68..07485c2d0a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEMFGeneratorItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEMFGeneratorItemProvider.java
@@ -67,13 +67,12 @@ public class DawnEMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addEmfGenModelPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnEMFGenerator_emfGenModel_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnEMFGenerator_emfGenModel_feature",
-            "_UI_DawnEMFGenerator_type"), DawnEmfGenmodelPackage.Literals.DAWN_EMF_GENERATOR__EMF_GEN_MODEL, true,
-        false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnEMFGenerator_emfGenModel_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnEMFGenerator_emfGenModel_feature",
+                "_UI_DawnEMFGenerator_type"),
+            DawnEmfGenmodelPackage.Literals.DAWN_EMF_GENERATOR__EMF_GEN_MODEL, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEmfGenmodelItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEmfGenmodelItemProviderAdapterFactory.java
index c0b5c54ea8..b3502c9d4d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEmfGenmodelItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/provider/DawnEmfGenmodelItemProviderAdapterFactory.java
@@ -39,8 +39,8 @@ import java.util.Collection;
  * @generated
  * @author Martin Fluegge
  */
-public class DawnEmfGenmodelItemProviderAdapterFactory extends DawnEmfGenmodelAdapterFactory implements
-    ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class DawnEmfGenmodelItemProviderAdapterFactory extends DawnEmfGenmodelAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelActionBarContributor.java
index 7ef7ddbfd4..2867ccc9dc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelActionBarContributor.java
@@ -50,8 +50,8 @@ import java.util.Collection;
  * @generated
  * @author Martin Fluegge
  */
-public class DawnEmfGenmodelActionBarContributor extends EditingDomainActionBarContributor implements
-    ISelectionChangedListener
+public class DawnEmfGenmodelActionBarContributor extends EditingDomainActionBarContributor
+    implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java
index 923f15926e..b53098b7a7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java
@@ -128,8 +128,8 @@ import java.util.Map;
  * @author Martin Fluegge
  * @generated
  */
-public class DawnEmfGenmodelEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker
+public class DawnEmfGenmodelEditor extends MultiPageEditorPart
+    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model. <!-- begin-user-doc --> <!--
@@ -396,11 +396,11 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart implements IEditi
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED
-                  && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED
+                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet.getResource(
-                    URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet
+                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -939,8 +939,9 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart implements IEditi
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
       BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui", 0, getString("_UI_CreateModelError_message",
-              resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
+          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()),
+          new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
@@ -1143,8 +1144,8 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart implements IEditi
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources()
-                .get(0)), true);
+            contentOutlineViewer
+                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
@@ -1396,9 +1397,9 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart implements IEditi
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
-        .getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-    doSave(progressMonitor);
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
+        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+        doSave(progressMonitor);
   }
 
   /**
@@ -1512,8 +1513,8 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart implements IEditi
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
-        : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelModelWizard.java
index f1169abe26..8f66302ffe 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelModelWizard.java
@@ -81,17 +81,16 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
    *
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays
-      .asList(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditorFilenameExtensions").split(
-          "\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
+      DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display. <!-- begin-user-doc --> <!-- end-user-doc -->
    *
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = DawnGenModelEditorPlugin.INSTANCE.getString(
-      "_UI_DawnEmfGenmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = DawnGenModelEditorPlugin.INSTANCE
+      .getString("_UI_DawnEmfGenmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
 
   /**
    * This caches an instance of the model package. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -153,8 +152,8 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(DawnGenModelEditorPlugin.INSTANCE
-        .getImage("full/wizban/NewDawnEmfGenmodel")));
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
+        .getImageDescriptor(DawnGenModelEditorPlugin.INSTANCE.getImage("full/wizban/NewDawnEmfGenmodel")));
   }
 
   /**
@@ -587,10 +586,11 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
     //
     newFileCreationPage = new DawnEmfGenmodelModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelModelWizard_label"));
-    newFileCreationPage.setDescription(DawnGenModelEditorPlugin.INSTANCE
-        .getString("_UI_DawnEmfGenmodelModelWizard_description"));
-    newFileCreationPage.setFileName(DawnGenModelEditorPlugin.INSTANCE
-        .getString("_UI_DawnEmfGenmodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+    newFileCreationPage
+        .setDescription(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelModelWizard_description"));
+    newFileCreationPage
+        .setFileName(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelEditorFilenameDefaultBase") + "."
+            + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -633,10 +633,10 @@ public class DawnEmfGenmodelModelWizard extends Wizard implements INewWizard
       }
     }
     initialObjectCreationPage = new DawnEmfGenmodelModelWizardInitialObjectCreationPage("Whatever2");
-    initialObjectCreationPage.setTitle(DawnGenModelEditorPlugin.INSTANCE
-        .getString("_UI_DawnEmfGenmodelModelWizard_label"));
-    initialObjectCreationPage.setDescription(DawnGenModelEditorPlugin.INSTANCE
-        .getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage
+        .setTitle(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_DawnEmfGenmodelModelWizard_label"));
+    initialObjectCreationPage
+        .setDescription(DawnGenModelEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/ui/actions/GenerateDawnGenModelEMFAction.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/ui/actions/GenerateDawnGenModelEMFAction.java
index 9e8c2fe7bb..459dcd20fd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/ui/actions/GenerateDawnGenModelEMFAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/ui/actions/GenerateDawnGenModelEMFAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/META-INF/MANIFEST.MF
index 6ac6e1d2fa..31c837ea43 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -17,10 +17,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.xpand;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.xtend;bundle-version="[2.0.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf;version="1.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel;version="1.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.impl;version="1.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.util;version="1.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.util;version="1.0.200",
+Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf;version="1.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel;version="1.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.impl;version="1.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.util;version="1.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.util;version="1.0.300",
  templates;version="1.0.100",
  workflow;version="1.0.100"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEmfGenmodelPackageImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEmfGenmodelPackageImpl.java
index 8d9ead87eb..c8b529aecf 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEmfGenmodelPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/impl/DawnEmfGenmodelPackageImpl.java
@@ -84,7 +84,7 @@ public class DawnEmfGenmodelPackageImpl extends EPackageImpl implements DawnEmfG
     // Obtain or create and register package
     DawnEmfGenmodelPackageImpl theDawnEmfGenmodelPackage = (DawnEmfGenmodelPackageImpl)(EPackage.Registry.INSTANCE
         .get(eNS_URI) instanceof DawnEmfGenmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-        : new DawnEmfGenmodelPackageImpl());
+            : new DawnEmfGenmodelPackageImpl());
 
     isInited = true;
 
@@ -93,8 +93,8 @@ public class DawnEmfGenmodelPackageImpl extends EPackageImpl implements DawnEmfG
 
     // Obtain or create and register interdependencies
     GenModelPackageImpl theGenmodelPackage = (GenModelPackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(GenModelPackage.eNS_URI) instanceof GenModelPackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(GenModelPackage.eNS_URI) : GenModelPackage.eINSTANCE);
+        .getEPackage(GenModelPackage.eNS_URI) instanceof GenModelPackageImpl
+            ? EPackage.Registry.INSTANCE.getEPackage(GenModelPackage.eNS_URI) : GenModelPackage.eINSTANCE);
 
     // Create package meta-data objects
     theDawnEmfGenmodelPackage.createPackageContents();
@@ -210,8 +210,8 @@ public class DawnEmfGenmodelPackageImpl extends EPackageImpl implements DawnEmfG
     // Initialize classes and features; add operations and parameters
     initEClass(dawnEMFGeneratorEClass, DawnEMFGenerator.class, "DawnEMFGenerator", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDawnEMFGenerator_EmfGenModel(), theGenmodelPackage.getGenModel(), null, "emfGenModel", null, 0,
-        1, DawnEMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getDawnEMFGenerator_EmfGenModel(), theGenmodelPackage.getGenModel(), null, "emfGenModel", null, 0, 1,
+        DawnEMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/Activator.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/Activator.java
index 4908cd237e..24110781d3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/Activator.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/util/DawnEMFWorkflowUtil.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/util/DawnEMFWorkflowUtil.java
index d7e48c68db..b236d814c2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/util/DawnEMFWorkflowUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/util/DawnEMFWorkflowUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/META-INF/MANIFEST.MF
index c60b2f4197..2f49ce0520 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.provider.DawnCodeGenEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnCodeGenEditPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnCodeGenEditPlugin.java
index e0ef503f7c..ca78fb8531 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnCodeGenEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnCodeGenEditPlugin.java
@@ -46,8 +46,7 @@ public final class DawnCodeGenEditPlugin extends EMFPlugin
    */
   public DawnCodeGenEditPlugin()
   {
-    super(new ResourceLocator[] {
-        org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawnCodeGenEditPlugin.INSTANCE,
+    super(new ResourceLocator[] { org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.provider.DawnCodeGenEditPlugin.INSTANCE,
         EcoreEditPlugin.INSTANCE, GenModelEditPlugin.INSTANCE, EditorPlugin.INSTANCE, });
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java
index f5ed181b88..9516e5bf36 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGMFGeneratorItemProvider.java
@@ -74,14 +74,13 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnDocumentProviderClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGMFGenerator_dawnDocumentProviderClassName_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnDocumentProviderClassName_feature",
-            "_UI_DawnGMFGenerator_type"),
-        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnDocumentProviderClassName_feature"),
+            getString("_UI_PropertyDescriptor_description",
+                "_UI_DawnGMFGenerator_dawnDocumentProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
+            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -92,14 +91,13 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnEditorUtilClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGMFGenerator_dawnEditorUtilClassName_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditorUtilClassName_feature",
-            "_UI_DawnGMFGenerator_type"),
-        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnEditorUtilClassName_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditorUtilClassName_feature",
+                "_UI_DawnGMFGenerator_type"),
+            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -110,14 +108,13 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnCreationWizardClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGMFGenerator_dawnCreationWizardClassName_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnCreationWizardClassName_feature",
-            "_UI_DawnGMFGenerator_type"),
-        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnCreationWizardClassName_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnCreationWizardClassName_feature",
+                "_UI_DawnGMFGenerator_type"),
+            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -128,14 +125,13 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnCanonicalEditingPolicyClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGMFGenerator_dawnCanonicalEditingPolicyClassName_feature"),
-        getString("_UI_PropertyDescriptor_description",
-            "_UI_DawnGMFGenerator_dawnCanonicalEditingPolicyClassName_feature", "_UI_DawnGMFGenerator_type"),
-        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME, true, false,
-        false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnCanonicalEditingPolicyClassName_feature"),
+            getString("_UI_PropertyDescriptor_description",
+                "_UI_DawnGMFGenerator_dawnCanonicalEditingPolicyClassName_feature", "_UI_DawnGMFGenerator_type"),
+            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME, true, false,
+            false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -146,14 +142,13 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnDiagramEditPartClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGMFGenerator_dawnDiagramEditPartClassName_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnDiagramEditPartClassName_feature",
-            "_UI_DawnGMFGenerator_type"),
-        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnDiagramEditPartClassName_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnDiagramEditPartClassName_feature",
+                "_UI_DawnGMFGenerator_type"),
+            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -164,14 +159,13 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnEditPartFactoryClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGMFGenerator_dawnEditPartFactoryClassName_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditPartFactoryClassName_feature",
-            "_UI_DawnGMFGenerator_type"),
-        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnEditPartFactoryClassName_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditPartFactoryClassName_feature",
+                "_UI_DawnGMFGenerator_type"),
+            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -182,14 +176,13 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnEditPartProviderClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGMFGenerator_dawnEditPartProviderClassName_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditPartProviderClassName_feature",
-            "_UI_DawnGMFGenerator_type"),
-        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnEditPartProviderClassName_feature"),
+            getString("_UI_PropertyDescriptor_description",
+                "_UI_DawnGMFGenerator_dawnEditPartProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
+            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -200,14 +193,13 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
    */
   protected void addDawnEditPolicyProviderClassNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature",
-            "_UI_DawnGMFGenerator_type"),
-        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature"),
+            getString("_UI_PropertyDescriptor_description",
+                "_UI_DawnGMFGenerator_dawnEditPolicyProviderClassName_feature", "_UI_DawnGMFGenerator_type"),
+            DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -219,12 +211,12 @@ public class DawnGMFGeneratorItemProvider extends DawnFragmentGeneratorItemProvi
   protected void addGMFGenEditorGeneratorPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
+        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
         getString("_UI_DawnGMFGenerator_GMFGenEditorGenerator_feature"),
         getString("_UI_PropertyDescriptor_description", "_UI_DawnGMFGenerator_GMFGenEditorGenerator_feature",
-            "_UI_DawnGMFGenerator_type"), DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR,
-        true, false, true, null, null, null));
+            "_UI_DawnGMFGenerator_type"),
+        DawnGmfGenmodelPackage.Literals.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR, true, false, true, null, null,
+        null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGmfGenmodelItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGmfGenmodelItemProviderAdapterFactory.java
index e78ad6b57c..e1ede1633c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGmfGenmodelItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/provider/DawnGmfGenmodelItemProviderAdapterFactory.java
@@ -39,8 +39,8 @@ import java.util.Collection;
  * @generated
  * @author Martin Fluegge
  */
-public class DawnGmfGenmodelItemProviderAdapterFactory extends DawnGmfGenmodelAdapterFactory implements
-    ComposeableAdapterFactory, IChangeNotifier, IDisposable
+public class DawnGmfGenmodelItemProviderAdapterFactory extends DawnGmfGenmodelAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java
index bc52565e5f..8ffcce4373 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnCodeGenEditorPlugin.java
@@ -49,8 +49,8 @@ public final class DawnCodeGenEditorPlugin extends EMFPlugin
    */
   public DawnCodeGenEditorPlugin()
   {
-    super(new ResourceLocator[] { DawnCodeGenEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE,
-        GenModelEditPlugin.INSTANCE, EditorPlugin.INSTANCE, });
+    super(new ResourceLocator[] { DawnCodeGenEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE, GenModelEditPlugin.INSTANCE,
+        EditorPlugin.INSTANCE, });
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelActionBarContributor.java
index 16837d9633..0c45953e59 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelActionBarContributor.java
@@ -50,8 +50,8 @@ import java.util.Collection;
  * @generated
  * @author Martin Fluegge
  */
-public class DawnGmfGenmodelActionBarContributor extends EditingDomainActionBarContributor implements
-    ISelectionChangedListener
+public class DawnGmfGenmodelActionBarContributor extends EditingDomainActionBarContributor
+    implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
index 16f1a77304..72c69b8cdd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java
@@ -129,8 +129,8 @@ import java.util.Map;
  * @author Martin Fluegge
  * @generated
  */
-public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker
+public class DawnGmfGenmodelEditor extends MultiPageEditorPart
+    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model. <!-- begin-user-doc --> <!--
@@ -397,11 +397,11 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED
-                  && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED
+                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet.getResource(
-                    URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet
+                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -941,8 +941,9 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
       BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
-          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui", 0, getString("_UI_CreateModelError_message",
-              resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
+          "org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()),
+          new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
@@ -1145,8 +1146,8 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources()
-                .get(0)), true);
+            contentOutlineViewer
+                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
@@ -1398,9 +1399,9 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
-        .getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-    doSave(progressMonitor);
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
+        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+        doSave(progressMonitor);
   }
 
   /**
@@ -1514,8 +1515,8 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
-        : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelModelWizard.java
index 01da6be285..6932b64e92 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelModelWizard.java
@@ -81,17 +81,16 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
    *
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays
-      .asList(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditorFilenameExtensions").split(
-          "\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
+      DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display. <!-- begin-user-doc --> <!-- end-user-doc -->
    *
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = DawnCodeGenEditorPlugin.INSTANCE.getString(
-      "_UI_DawnGmfGenmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = DawnCodeGenEditorPlugin.INSTANCE
+      .getString("_UI_DawnGmfGenmodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
 
   /**
    * This caches an instance of the model package. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -153,8 +152,8 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(DawnCodeGenEditorPlugin.INSTANCE
-        .getImage("full/wizban/NewDawnGmfGenmodel")));
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
+        .getImageDescriptor(DawnCodeGenEditorPlugin.INSTANCE.getImage("full/wizban/NewDawnGmfGenmodel")));
   }
 
   /**
@@ -587,10 +586,11 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
     //
     newFileCreationPage = new DawnGmfGenmodelModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelModelWizard_label"));
-    newFileCreationPage.setDescription(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_DawnGmfGenmodelModelWizard_description"));
-    newFileCreationPage.setFileName(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_DawnGmfGenmodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+    newFileCreationPage
+        .setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelModelWizard_description"));
+    newFileCreationPage
+        .setFileName(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelEditorFilenameDefaultBase") + "."
+            + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -633,10 +633,10 @@ public class DawnGmfGenmodelModelWizard extends Wizard implements INewWizard
       }
     }
     initialObjectCreationPage = new DawnGmfGenmodelModelWizardInitialObjectCreationPage("Whatever2");
-    initialObjectCreationPage.setTitle(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_DawnGmfGenmodelModelWizard_label"));
-    initialObjectCreationPage.setDescription(DawnCodeGenEditorPlugin.INSTANCE
-        .getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage
+        .setTitle(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_DawnGmfGenmodelModelWizard_label"));
+    initialObjectCreationPage
+        .setDescription(DawnCodeGenEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java
index d6f5921825..58d6ba7036 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/ui/actions/GenerateDawnGenModelGMFAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -45,22 +45,22 @@ public class GenerateDawnGenModelGMFAction extends GenerateDawnGenModelAction
 
     dawnGMFGenerator.setDawnEditorClassName(dawnEditorClassName);
     dawnGMFGenerator.setFragmentName(editorGenerator.getPlugin().getID() + ".dawn");
-    dawnGMFGenerator.setDawnCanonicalEditingPolicyClassName(generalPrefix
-        + editorGenerator.getDiagram().getCanonicalEditPolicyClassName());
-    dawnGMFGenerator.setDawnCreationWizardClassName(generalPrefix
-        + editorGenerator.getDiagram().getCreationWizardClassName());
-    dawnGMFGenerator.setDawnDiagramEditPartClassName(generalPrefix
-        + editorGenerator.getDiagram().getEditPartClassName());
-    dawnGMFGenerator.setDawnDocumentProviderClassName(generalPrefix
-        + editorGenerator.getDiagram().getDocumentProviderClassName());
-    dawnGMFGenerator.setDawnEditorUtilClassName(generalPrefix
-        + editorGenerator.getDiagram().getDiagramEditorUtilClassName());
-    dawnGMFGenerator.setDawnEditPartFactoryClassName(generalPrefix
-        + editorGenerator.getDiagram().getEditPartFactoryClassName());
-    dawnGMFGenerator.setDawnEditPartProviderClassName(generalPrefix
-        + editorGenerator.getDiagram().getEditPartProviderClassName());
-    dawnGMFGenerator.setDawnEditPolicyProviderClassName(generalPrefix
-        + editorGenerator.getDiagram().getEditPartProviderClassName().replace("EditPart", "EditPolicy"));
+    dawnGMFGenerator.setDawnCanonicalEditingPolicyClassName(
+        generalPrefix + editorGenerator.getDiagram().getCanonicalEditPolicyClassName());
+    dawnGMFGenerator
+        .setDawnCreationWizardClassName(generalPrefix + editorGenerator.getDiagram().getCreationWizardClassName());
+    dawnGMFGenerator
+        .setDawnDiagramEditPartClassName(generalPrefix + editorGenerator.getDiagram().getEditPartClassName());
+    dawnGMFGenerator
+        .setDawnDocumentProviderClassName(generalPrefix + editorGenerator.getDiagram().getDocumentProviderClassName());
+    dawnGMFGenerator
+        .setDawnEditorUtilClassName(generalPrefix + editorGenerator.getDiagram().getDiagramEditorUtilClassName());
+    dawnGMFGenerator
+        .setDawnEditPartFactoryClassName(generalPrefix + editorGenerator.getDiagram().getEditPartFactoryClassName());
+    dawnGMFGenerator
+        .setDawnEditPartProviderClassName(generalPrefix + editorGenerator.getDiagram().getEditPartProviderClassName());
+    dawnGMFGenerator.setDawnEditPolicyProviderClassName(
+        generalPrefix + editorGenerator.getDiagram().getEditPartProviderClassName().replace("EditPart", "EditPolicy"));
 
     dawnGMFGenerator.setGMFGenEditorGenerator(editorGenerator);
     return dawnGMFGenerator;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/META-INF/MANIFEST.MF
index dd8adf03ee..6afc0a2173 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf;version="1.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel;version="1.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.impl;version="1.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.util;version="1.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.util;version="1.0.200",
+Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf;version="1.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel;version="1.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.impl;version="1.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.util;version="1.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.util;version="1.0.300",
  templates;version="1.0.0",
  workflow;version="1.0.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelPackage.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelPackage.java
index 385303b059..e6f13e4253 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelPackage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/DawnGmfGenmodelPackage.java
@@ -106,7 +106,8 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 0;
+  int DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
+      + 0;
 
   /**
    * The feature id for the '<em><b>Dawn Editor Util Class Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -124,7 +125,8 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 2;
+  int DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
+      + 2;
 
   /**
    * The feature id for the '<em><b>Dawn Canonical Editing Policy Class Name</b></em>' attribute. <!-- begin-user-doc
@@ -133,7 +135,8 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 3;
+  int DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
+      + 3;
 
   /**
    * The feature id for the '<em><b>Dawn Diagram Edit Part Class Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -142,7 +145,8 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 4;
+  int DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
+      + 4;
 
   /**
    * The feature id for the '<em><b>Dawn Edit Part Factory Class Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -151,7 +155,8 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 5;
+  int DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
+      + 5;
 
   /**
    * The feature id for the '<em><b>Dawn Edit Part Provider Class Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -160,7 +165,8 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 6;
+  int DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
+      + 6;
 
   /**
    * The feature id for the '<em><b>Dawn Edit Policy Provider Class Name</b></em>' attribute. <!-- begin-user-doc -->
@@ -169,7 +175,8 @@ public interface DawnGmfGenmodelPackage extends EPackage
    * @generated
    * @ordered
    */
-  int DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT + 7;
+  int DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME = DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR_FEATURE_COUNT
+      + 7;
 
   /**
    * The feature id for the '<em><b>GMF Gen Editor Generator</b></em>' reference. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java
index 75cb3a082d..0cc509cb03 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGMFGeneratorImpl.java
@@ -383,8 +383,8 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     if (eNotificationRequired())
     {
       eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME,
-          oldDawnDiagramEditPartClassName, dawnDiagramEditPartClassName));
+          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME, oldDawnDiagramEditPartClassName,
+          dawnDiagramEditPartClassName));
     }
   }
 
@@ -410,8 +410,8 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     if (eNotificationRequired())
     {
       eNotify(new ENotificationImpl(this, Notification.SET,
-          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME,
-          oldDawnEditPartFactoryClassName, dawnEditPartFactoryClassName));
+          DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME, oldDawnEditPartFactoryClassName,
+          dawnEditPartFactoryClassName));
     }
   }
 
@@ -650,28 +650,28 @@ public class DawnGMFGeneratorImpl extends DawnFragmentGeneratorImpl implements D
     {
     case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DOCUMENT_PROVIDER_CLASS_NAME:
       return DAWN_DOCUMENT_PROVIDER_CLASS_NAME_EDEFAULT == null ? dawnDocumentProviderClassName != null
-          : !DAWN_DOCUMENT_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnDocumentProviderClassName);
+      : !DAWN_DOCUMENT_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnDocumentProviderClassName);
     case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDITOR_UTIL_CLASS_NAME:
       return DAWN_EDITOR_UTIL_CLASS_NAME_EDEFAULT == null ? dawnEditorUtilClassName != null
-          : !DAWN_EDITOR_UTIL_CLASS_NAME_EDEFAULT.equals(dawnEditorUtilClassName);
+      : !DAWN_EDITOR_UTIL_CLASS_NAME_EDEFAULT.equals(dawnEditorUtilClassName);
     case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_CREATION_WIZARD_CLASS_NAME:
       return DAWN_CREATION_WIZARD_CLASS_NAME_EDEFAULT == null ? dawnCreationWizardClassName != null
-          : !DAWN_CREATION_WIZARD_CLASS_NAME_EDEFAULT.equals(dawnCreationWizardClassName);
+      : !DAWN_CREATION_WIZARD_CLASS_NAME_EDEFAULT.equals(dawnCreationWizardClassName);
     case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME:
       return DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME_EDEFAULT == null ? dawnCanonicalEditingPolicyClassName != null
-          : !DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME_EDEFAULT.equals(dawnCanonicalEditingPolicyClassName);
+      : !DAWN_CANONICAL_EDITING_POLICY_CLASS_NAME_EDEFAULT.equals(dawnCanonicalEditingPolicyClassName);
     case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_DIAGRAM_EDIT_PART_CLASS_NAME:
       return DAWN_DIAGRAM_EDIT_PART_CLASS_NAME_EDEFAULT == null ? dawnDiagramEditPartClassName != null
-          : !DAWN_DIAGRAM_EDIT_PART_CLASS_NAME_EDEFAULT.equals(dawnDiagramEditPartClassName);
+      : !DAWN_DIAGRAM_EDIT_PART_CLASS_NAME_EDEFAULT.equals(dawnDiagramEditPartClassName);
     case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_FACTORY_CLASS_NAME:
       return DAWN_EDIT_PART_FACTORY_CLASS_NAME_EDEFAULT == null ? dawnEditPartFactoryClassName != null
-          : !DAWN_EDIT_PART_FACTORY_CLASS_NAME_EDEFAULT.equals(dawnEditPartFactoryClassName);
+      : !DAWN_EDIT_PART_FACTORY_CLASS_NAME_EDEFAULT.equals(dawnEditPartFactoryClassName);
     case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_PART_PROVIDER_CLASS_NAME:
       return DAWN_EDIT_PART_PROVIDER_CLASS_NAME_EDEFAULT == null ? dawnEditPartProviderClassName != null
-          : !DAWN_EDIT_PART_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnEditPartProviderClassName);
+      : !DAWN_EDIT_PART_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnEditPartProviderClassName);
     case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME:
       return DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME_EDEFAULT == null ? dawnEditPolicyProviderClassName != null
-          : !DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnEditPolicyProviderClassName);
+      : !DAWN_EDIT_POLICY_PROVIDER_CLASS_NAME_EDEFAULT.equals(dawnEditPolicyProviderClassName);
     case DawnGmfGenmodelPackage.DAWN_GMF_GENERATOR__GMF_GEN_EDITOR_GENERATOR:
       return gmfGenEditorGenerator != null;
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGmfGenmodelPackageImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGmfGenmodelPackageImpl.java
index 1dc60a7bd5..289817960d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGmfGenmodelPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/impl/DawnGmfGenmodelPackageImpl.java
@@ -86,7 +86,7 @@ public class DawnGmfGenmodelPackageImpl extends EPackageImpl implements DawnGmfG
     // Obtain or create and register package
     DawnGmfGenmodelPackageImpl theDawnGmfGenmodelPackage = (DawnGmfGenmodelPackageImpl)(EPackage.Registry.INSTANCE
         .get(eNS_URI) instanceof DawnGmfGenmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-        : new DawnGmfGenmodelPackageImpl());
+            : new DawnGmfGenmodelPackageImpl());
 
     isInited = true;
 
@@ -295,8 +295,8 @@ public class DawnGmfGenmodelPackageImpl extends EPackageImpl implements DawnGmfG
     initEClass(dawnGMFGeneratorEClass, DawnGMFGenerator.class, "DawnGMFGenerator", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getDawnGMFGenerator_DawnDocumentProviderClassName(), theEcorePackage.getEString(),
-        "dawnDocumentProviderClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        "dawnDocumentProviderClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getDawnGMFGenerator_DawnEditorUtilClassName(), theEcorePackage.getEString(),
         "dawnEditorUtilClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -313,8 +313,8 @@ public class DawnGmfGenmodelPackageImpl extends EPackageImpl implements DawnGmfG
         "dawnEditPartFactoryClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getDawnGMFGenerator_DawnEditPartProviderClassName(), theEcorePackage.getEString(),
-        "dawnEditPartProviderClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        "dawnEditPartProviderClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getDawnGMFGenerator_DawnEditPolicyProviderClassName(), theEcorePackage.getEString(),
         "dawnEditPolicyProviderClassName", null, 0, 1, DawnGMFGenerator.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/Activator.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/Activator.java
index b67a7a9cbe..069f1a56de 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/Activator.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/util/DawnGMFWorkflowUtil.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/util/DawnGMFWorkflowUtil.java
index 3b95f08ba0..ffaeb94404 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/util/DawnGMFWorkflowUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/util/DawnGMFWorkflowUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/META-INF/MANIFEST.MF
index 5841415444..b5252da4a5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel;singleton:=true
-Bundle-Version: 2.0.200.qualifier
+Bundle-Version: 2.0.300.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.genmodel.DawnGenModelPlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.6.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel;version="2.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.impl;version="2.0.200",
- org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.util;version="2.0.200",
+Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.impl;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.util;version="2.0.300",
  org.eclipse.emf.cdo.dawn.codegen.genmodel;version="2.0.0"
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnFragmentGeneratorImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnFragmentGeneratorImpl.java
index b29de810fc..dcc8ee560d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnFragmentGeneratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnFragmentGeneratorImpl.java
@@ -208,8 +208,8 @@ public class DawnFragmentGeneratorImpl extends EObjectImpl implements DawnFragme
     dawnGenerator = newDawnGenerator;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR, oldDawnGenerator, dawnGenerator));
+      eNotify(new ENotificationImpl(this, Notification.SET, DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR,
+          oldDawnGenerator, dawnGenerator));
     }
   }
 
@@ -296,8 +296,8 @@ public class DawnFragmentGeneratorImpl extends EObjectImpl implements DawnFragme
     case DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__FRAGMENT_NAME:
       return FRAGMENT_NAME_EDEFAULT == null ? fragmentName != null : !FRAGMENT_NAME_EDEFAULT.equals(fragmentName);
     case DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_EDITOR_CLASS_NAME:
-      return DAWN_EDITOR_CLASS_NAME_EDEFAULT == null ? dawnEditorClassName != null : !DAWN_EDITOR_CLASS_NAME_EDEFAULT
-          .equals(dawnEditorClassName);
+      return DAWN_EDITOR_CLASS_NAME_EDEFAULT == null ? dawnEditorClassName != null
+          : !DAWN_EDITOR_CLASS_NAME_EDEFAULT.equals(dawnEditorClassName);
     case DawngenmodelPackage.DAWN_FRAGMENT_GENERATOR__DAWN_GENERATOR:
       return dawnGenerator != null;
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnGeneratorImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnGeneratorImpl.java
index 417fc60cae..09177c7c7e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnGeneratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawnGeneratorImpl.java
@@ -275,11 +275,11 @@ public class DawnGeneratorImpl extends EObjectImpl implements DawnGenerator
     case DawngenmodelPackage.DAWN_GENERATOR__CONFLICT_COLOR:
       return CONFLICT_COLOR_EDEFAULT == null ? conflictColor != null : !CONFLICT_COLOR_EDEFAULT.equals(conflictColor);
     case DawngenmodelPackage.DAWN_GENERATOR__LOCAL_LOCK_COLOR:
-      return LOCAL_LOCK_COLOR_EDEFAULT == null ? localLockColor != null : !LOCAL_LOCK_COLOR_EDEFAULT
-          .equals(localLockColor);
+      return LOCAL_LOCK_COLOR_EDEFAULT == null ? localLockColor != null
+          : !LOCAL_LOCK_COLOR_EDEFAULT.equals(localLockColor);
     case DawngenmodelPackage.DAWN_GENERATOR__REMOTE_LOCK_COLOR:
-      return REMOTE_LOCK_COLOR_EDEFAULT == null ? remoteLockColor != null : !REMOTE_LOCK_COLOR_EDEFAULT
-          .equals(remoteLockColor);
+      return REMOTE_LOCK_COLOR_EDEFAULT == null ? remoteLockColor != null
+          : !REMOTE_LOCK_COLOR_EDEFAULT.equals(remoteLockColor);
     }
     return super.eIsSet(featureID);
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawngenmodelPackageImpl.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawngenmodelPackageImpl.java
index 246fac6294..4f6a64468a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawngenmodelPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/impl/DawngenmodelPackageImpl.java
@@ -88,8 +88,9 @@ public class DawngenmodelPackageImpl extends EPackageImpl implements Dawngenmode
     }
 
     // Obtain or create and register package
-    DawngenmodelPackageImpl theDawngenmodelPackage = (DawngenmodelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DawngenmodelPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new DawngenmodelPackageImpl());
+    DawngenmodelPackageImpl theDawngenmodelPackage = (DawngenmodelPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof DawngenmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new DawngenmodelPackageImpl());
 
     isInited = true;
 
@@ -280,14 +281,14 @@ public class DawngenmodelPackageImpl extends EPackageImpl implements Dawngenmode
     initEClass(dawnGeneratorEClass, DawnGenerator.class, "DawnGenerator", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getDawnGenerator_ConflictColor(), theEcorePackage.getEString(), "conflictColor", null, 0, 1,
-        DawnGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        DawnGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getDawnGenerator_LocalLockColor(), theEcorePackage.getEString(), "localLockColor", null, 0, 1,
-        DawnGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        DawnGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getDawnGenerator_RemoteLockColor(), theEcorePackage.getEString(), "remoteLockColor", null, 0, 1,
-        DawnGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        DawnGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(dawnFragmentGeneratorEClass, DawnFragmentGenerator.class, "DawnFragmentGenerator", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/genmodel/DawnGenModelPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/genmodel/DawnGenModelPlugin.java
index 4ff45d95a6..d8290aea8f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/genmodel/DawnGenModelPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel/src/org/eclipse/emf/cdo/dawn/codegen/genmodel/DawnGenModelPlugin.java
@@ -57,7 +57,7 @@ public class DawnGenModelPlugin extends Plugin
 
   /**
    * Returns the shared instance
-   * 
+   *
    * @return the shared instance
    */
   public static DawnGenModelPlugin getDefault()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF
index 7776230d3e..811264da19 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.DawnCodeGenPlugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
@@ -24,12 +24,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: metamodel;version="1.0.100",
- org.eclipse.emf.cdo.dawn.codegen;version="1.0.300",
- org.eclipse.emf.cdo.dawn.codegen.actions;version="1.0.300",
- org.eclipse.emf.cdo.dawn.codegen.creators;version="1.0.300",
- org.eclipse.emf.cdo.dawn.codegen.creators.impl;version="1.0.300",
- org.eclipse.emf.cdo.dawn.codegen.messages;version="1.0.300",
- org.eclipse.emf.cdo.dawn.codegen.util;version="1.0.300",
+ org.eclipse.emf.cdo.dawn.codegen;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.codegen.actions;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.codegen.creators;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.codegen.creators.impl;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.codegen.messages;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.codegen.util;version="1.0.400",
  template;version="1.0.100"
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/DawnCodeGenPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/DawnCodeGenPlugin.java
index 03d902c87b..1b2aa9695a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/DawnCodeGenPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/DawnCodeGenPlugin.java
@@ -43,7 +43,7 @@ public class DawnCodeGenPlugin extends Plugin
 
   /**
    * Returns the shared instance
-   * 
+   *
    * @return the shared instance
    */
   public static DawnCodeGenPlugin getDefault()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/actions/GenerateDawnGenModelAction.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/actions/GenerateDawnGenModelAction.java
index 966dce6934..9bf0cdceeb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/actions/GenerateDawnGenModelAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/actions/GenerateDawnGenModelAction.java
@@ -174,8 +174,8 @@ public abstract class GenerateDawnGenModelAction implements IObjectActionDelegat
   protected ResourceSet createResourceSet()
   {
     ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-        .put(dawngenmodelFileExtension, new XMIResourceFactoryImpl());
+    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(dawngenmodelFileExtension,
+        new XMIResourceFactoryImpl());
     return resourceSet;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java
index 639d71d950..c867bc79d6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/creators/impl/AbstractFragmentCreator.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -62,10 +62,10 @@ public abstract class AbstractFragmentCreator implements Creator
 
     ResourceSet resourceSet = new ResourceSetImpl();
     resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-        .put(GenerateDawnGenModelAction.dawngenmodelFileExtension, new XMIResourceFactoryImpl());
+    .put(GenerateDawnGenModelAction.dawngenmodelFileExtension, new XMIResourceFactoryImpl());
 
-    Resource dawnGenModelResource = resourceSet.getResource(
-        URI.createURI(dawnGenModelFile.getRawLocationURI().toString()), true);
+    Resource dawnGenModelResource = resourceSet
+        .getResource(URI.createURI(dawnGenModelFile.getRawLocationURI().toString()), true);
 
     DawnFragmentGenerator dawnFragmentGenerator = (DawnFragmentGenerator)dawnGenModelResource.getContents().get(0);
     // DawnGenerator dawnGenerator = dawnFragmentGenerator.getDawnGenerator();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/messages/Messages.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/messages/Messages.java
index a023e71562..0bd68356e8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -23,6 +23,7 @@ public class Messages extends NLS
   public static String GenerateClientCodeAction_0;
 
   public static String GenerateEMFFragmentAction_0;
+
   static
   {
     // initialize resource bundle
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/DawnWorkflowUtil.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/DawnWorkflowUtil.java
index 037dc79183..5b951cd81a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/DawnWorkflowUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/DawnWorkflowUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java
index 691b5c4ea8..33e1f16599 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.codegen/src/org/eclipse/emf/cdo/dawn/codegen/util/ProjectCreationHelper.java
@@ -101,7 +101,7 @@ public class ProjectCreationHelper
 
   /**
    * adds all jar files in this folder to the build path. Searches only on level 1
-   * 
+   *
    * @param folder
    *          the folder which contains the jar files
    * @param javaProject
@@ -180,7 +180,7 @@ public class ProjectCreationHelper
 
   /**
    * Creates a JavaProject prom the given project
-   * 
+   *
    * @param project
    * @return the created JavaProject
    */
@@ -227,7 +227,7 @@ public class ProjectCreationHelper
   private void clearSourcePath(IJavaProject javaProject) throws JavaModelException
   {
     javaProject.setRawClasspath(new IClasspathEntry[] {}, new NullProgressMonitor()); // clean classpath, means remove
-                                                                                      // Project root from classpath
+    // Project root from classpath
   }
 
   /**
@@ -303,8 +303,8 @@ public class ProjectCreationHelper
    * @throws CoreException
    * @throws JavaModelException
    */
-  private void createOutputFolder(String path, IProject project, IJavaProject javaProject) throws CoreException,
-      JavaModelException
+  private void createOutputFolder(String path, IProject project, IJavaProject javaProject)
+      throws CoreException, JavaModelException
   {
     try
     {
@@ -398,8 +398,8 @@ public class ProjectCreationHelper
   {
   }
 
-  public static void refreshProject(IResource resource, IProgressMonitor monitor) throws InvocationTargetException,
-      InterruptedException
+  public static void refreshProject(IResource resource, IProgressMonitor monitor)
+      throws InvocationTargetException, InterruptedException
   {
     IRunnableWithProgress op = new WorkspaceModifyOperation(null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF
index 7adfc89324..a579674c59 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ecore.editor.dawn;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Fragment-Host: org.eclipse.emf.ecore.editor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java
index 399fe831b9..fc783e8728 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreEditor.java
@@ -96,7 +96,7 @@ public class DawnEcoreEditor extends EcoreEditor implements IDawnEditor
     selectionViewer.setContentProvider(new DawnSelectionViewerAdapterFactoryContentProvider(adapterFactory,
         ((DawnEditorInput)getEditorInput()).getResource()));
     selectionViewer
-        .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
+    .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     // parentViewer.setLabelProvider(new DawnLabelProvider(adapterFactory,
     // dawnEditorSupport.getView(), selectionViewer));
     // listViewer.setLabelProvider(new DawnLabelProvider(adapterFactory,
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreModelWizard.java
index 4ac7be9658..5a6ff1d673 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecore.editor.dawn/src/org/eclipse/emf/cdo/dawn/ecore/presentation/DawnEcoreModelWizard.java
@@ -60,8 +60,8 @@ public class DawnEcoreModelWizard extends EcoreModelWizard
 
     initialObjectCreationPage = new EcoreModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(EcoreEditorPlugin.INSTANCE.getString("_UI_EcoreModelWizard_label"));
-    initialObjectCreationPage.setDescription(EcoreEditorPlugin.INSTANCE
-        .getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage
+        .setDescription(EcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF
index 97563da7dd..a038968811 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Fragment-Host: org.eclipse.emf.ecoretools.diagram;bundle-version="[0.9.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.cdo.dawn;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnECoreRootEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnECoreRootEditPart.java
index ce8e0d77bc..30e98be135 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnECoreRootEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnECoreRootEditPart.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnEcoreEditPartFactory.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnEcoreEditPartFactory.java
index c2002b0797..f62b301fc2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnEcoreEditPartFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/parts/DawnEcoreEditPartFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/policies/DawnECoreRootCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/policies/DawnECoreRootCanonicalEditPolicy.java
index 302fd34d3e..5388162de6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/policies/DawnECoreRootCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/edit/policies/DawnECoreRootCanonicalEditPolicy.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizard.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizard.java
index c6a5686404..8384e69b3c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizard.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizardPage.java
index ccf2c58599..676703db77 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreCreationWizardPage.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -215,7 +215,7 @@ public class DawnEcoreCreationWizardPage extends EcoreCreationWizardPage
 
   /**
    * Return the diagram model URI
-   * 
+   *
    * @return URI
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditorUtil.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditorUtil.java
index 708e224336..dcb9dce299 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDiagramEditorUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -70,7 +70,7 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
 
   /**
    * Runs the wizard in a dialog.
-   * 
+   *
    * @generated
    */
   public static void runWizard(Shell shell, Wizard wizard, String settingsKey)
@@ -172,7 +172,7 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
 
   /**
    * Create a new instance of domain element associated with canvas. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static EObject createInitialModel()
@@ -182,7 +182,7 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
 
   /**
    * Store model element in the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static void attachModelToResource(EObject model, Resource resource)
@@ -198,7 +198,8 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
     final Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI);
     final EObject model = domainElement;
     final String diagramName = diagramURI.lastSegment();
-    AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, "", Collections.EMPTY_LIST) { //$NON-NLS-1$
+    AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, "", Collections.EMPTY_LIST) //$NON-NLS-1$
+    {
 
       @Override
       protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
@@ -221,8 +222,8 @@ public class DawnEcoreDiagramEditorUtil extends EcoreDiagramEditorUtil
           {
             InitializeAndLayoutDiagramCommand initializeAndLayoutDiagram = new InitializeAndLayoutDiagramCommand(
                 editingDomain, (Diagram)diagramResource.getContents().get(0), false);
-            OperationHistoryFactory.getOperationHistory().execute(initializeAndLayoutDiagram,
-                new NullProgressMonitor(), null);
+            OperationHistoryFactory.getOperationHistory().execute(initializeAndLayoutDiagram, new NullProgressMonitor(),
+                null);
             diagramResource.save(EcoreDiagramEditorUtil.getSaveOptions());
           }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java
index 4e38e1a22a..c9f3bc6a28 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/part/DawnEcoreDocumentProvider.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -203,18 +203,19 @@ public class DawnEcoreDocumentProvider extends EcoreDocumentProvider
         else
         {
           String msg = e.getLocalizedMessage();
-          thrownExcp = new CoreException(new Status(IStatus.ERROR, EcoreDiagramEditorPlugin.ID, 0, msg != null ? msg
-              : Messages.EcoreDocumentProvider_DiagramLoadingError, e));
+          thrownExcp = new CoreException(new Status(IStatus.ERROR, EcoreDiagramEditorPlugin.ID, 0,
+              msg != null ? msg : Messages.EcoreDocumentProvider_DiagramLoadingError, e));
         }
         throw thrownExcp;
       }
     }
     else
     {
-      throw new CoreException(new Status(IStatus.ERROR, EcoreDiagramEditorPlugin.ID, 0, NLS.bind(
-          Messages.EcoreDocumentProvider_IncorrectInputError, new Object[] { element,
-              "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-          null));
+      throw new CoreException(new Status(IStatus.ERROR, EcoreDiagramEditorPlugin.ID, 0,
+          NLS.bind(Messages.EcoreDocumentProvider_IncorrectInputError,
+              new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
+                  "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
+              null));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/providers/DawnEcoreEditPartProvider.java b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/providers/DawnEcoreEditPartProvider.java
index cb51c0c929..0be09937d1 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/providers/DawnEcoreEditPartProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ecoretools.diagram.dawn/src/org/eclipse/emf/cdo/dawn/ecoretools/diagram/providers/DawnEcoreEditPartProvider.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.emf/META-INF/MANIFEST.MF
index 94e2f16c03..ac796ee0fe 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.emf
-Bundle-Version: 2.0.200.qualifier
+Bundle-Version: 2.0.300.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.emf.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.dawn.emf;version="2.0.200",
- org.eclipse.emf.cdo.dawn.emf.editors.impl;version="2.0.200",
- org.eclipse.emf.cdo.dawn.emf.notifications.impl;version="2.0.200"
+Export-Package: org.eclipse.emf.cdo.dawn.emf;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.emf.editors.impl;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.emf.notifications.impl;version="2.0.300"
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/Activator.java b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/Activator.java
index fe7d2bad3b..944c2dad17 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/Activator.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/editors/impl/DawnEMFEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/editors/impl/DawnEMFEditorSupport.java
index 83b860398a..dd2fd73543 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/editors/impl/DawnEMFEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/editors/impl/DawnEMFEditorSupport.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFHandler.java b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFHandler.java
index f0e8040263..86962d0505 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFLockingHandler.java b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFLockingHandler.java
index c858cd79e4..bec2362652 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFLockingHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.emf/src/org/eclipse/emf/cdo/dawn/emf/notifications/impl/DawnEMFLockingHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF
index 22f86080b2..cd6615dabb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Fragment-Host: org.eclipse.emf.cdo.dawn.examples.acore.diagram;bundle-version="1.0.0.qualifier"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: fragment
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java
index d60f20a200..aea0e50953 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnACoreRootEditPart.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -27,7 +27,7 @@ public class DawnACoreRootEditPart extends ACoreRootEditPart
   // /**
   // * @generated
   // */
-  //  public final static String MODEL_ID = "Acore"; //$NON-NLS-1$
+  // public final static String MODEL_ID = "Acore"; //$NON-NLS-1$
   //
   // /**
   // * @generated
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnAcoreEditPartFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnAcoreEditPartFactory.java
index bc10916c1b..45c889fd97 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnAcoreEditPartFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/DawnAcoreEditPartFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/DawnACoreRootCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/DawnACoreRootCanonicalEditPolicy.java
index ae67dcc087..db26b083f5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/DawnACoreRootCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/DawnACoreRootCanonicalEditPolicy.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreCreationWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreCreationWizard.java
index 377705c5c3..25dc8d04cd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreCreationWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreCreationWizard.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditorUtil.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditorUtil.java
index 1ff8889b54..319bf1b2fb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDiagramEditorUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -65,7 +65,7 @@ public class DawnAcoreDiagramEditorUtil extends AcoreDiagramEditorUtil
 
   /**
    * Runs the wizard in a dialog.
-   * 
+   *
    * @generated
    */
   public static void runWizard(Shell shell, Wizard wizard, String settingsKey)
@@ -167,7 +167,7 @@ public class DawnAcoreDiagramEditorUtil extends AcoreDiagramEditorUtil
 
   /**
    * Create a new instance of domain element associated with canvas. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static EObject createInitialModel()
@@ -177,7 +177,7 @@ public class DawnAcoreDiagramEditorUtil extends AcoreDiagramEditorUtil
 
   /**
    * Store model element in the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static void attachModelToResource(EObject model, Resource resource)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java
index 523139e30d..62b4068339 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DawnAcoreDocumentProvider.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -201,18 +201,19 @@ public class DawnAcoreDocumentProvider extends AcoreDocumentProvider
         else
         {
           String msg = e.getLocalizedMessage();
-          thrownExcp = new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, msg != null ? msg
-              : Messages.AcoreDocumentProvider_DiagramLoadingError, e));
+          thrownExcp = new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
+              msg != null ? msg : Messages.AcoreDocumentProvider_DiagramLoadingError, e));
         }
         throw thrownExcp;
       }
     }
     else
     {
-      throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, NLS.bind(
-          Messages.AcoreDocumentProvider_IncorrectInputError, new Object[] { element,
-              "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-          null));
+      throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
+          NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
+              new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
+                  "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
+              null));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/DawnAcoreEditPartProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/DawnAcoreEditPartProvider.java
index e7c699f221..baaf4a2ab4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/DawnAcoreEditPartProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/DawnAcoreEditPartProvider.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF
index 93c4f167d1..f5b43f72f4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.diagram; singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;version="1.0.300"
+Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;version="1.0.400"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttribute2CreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttribute2CreateCommand.java
index 0bc2c69268..6088289d5d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttribute2CreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttribute2CreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -44,9 +44,10 @@ public class AAttribute2CreateCommand extends EditElementCommand
 
   /**
    * FIXME: replace with setElementToEdit()
-   * 
+   *
    * @generated
    */
+  @Override
   protected EObject getElementToEdit()
   {
     EObject container = ((CreateElementRequest)getRequest()).getContainer();
@@ -60,6 +61,7 @@ public class AAttribute2CreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     return true;
@@ -69,6 +71,7 @@ public class AAttribute2CreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     AAttribute newElement = AcoreFactory.eINSTANCE.createAAttribute();
@@ -85,8 +88,7 @@ public class AAttribute2CreateCommand extends EditElementCommand
   /**
    * @generated
    */
-  protected void doConfigure(AAttribute newElement, IProgressMonitor monitor, IAdaptable info)
-      throws ExecutionException
+  protected void doConfigure(AAttribute newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();
     ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttributeCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttributeCreateCommand.java
index b3fee2835c..577bf26e68 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttributeCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttributeCreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -44,9 +44,10 @@ public class AAttributeCreateCommand extends EditElementCommand
 
   /**
    * FIXME: replace with setElementToEdit()
-   * 
+   *
    * @generated
    */
+  @Override
   protected EObject getElementToEdit()
   {
     EObject container = ((CreateElementRequest)getRequest()).getContainer();
@@ -60,6 +61,7 @@ public class AAttributeCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     return true;
@@ -69,6 +71,7 @@ public class AAttributeCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     AAttribute newElement = AcoreFactory.eINSTANCE.createAAttribute();
@@ -85,8 +88,7 @@ public class AAttributeCreateCommand extends EditElementCommand
   /**
    * @generated
    */
-  protected void doConfigure(AAttribute newElement, IProgressMonitor monitor, IAdaptable info)
-      throws ExecutionException
+  protected void doConfigure(AAttribute newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();
     ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsCreateCommand.java
index 2f29ce1f83..3c9e29d9ca 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsCreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -52,6 +52,7 @@ public class AClassAggregationsCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (source == null && target == null)
@@ -77,6 +78,7 @@ public class AClassAggregationsCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
@@ -95,6 +97,7 @@ public class AClassAggregationsCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected void setElementToEdit(EObject element)
   {
     throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java
index 20c20fba19..0741bdf8d2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -65,6 +65,7 @@ public class AClassAggregationsReorientCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (false == referenceOwner instanceof AClass)
@@ -111,6 +112,7 @@ public class AClassAggregationsReorientCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsCreateCommand.java
index 3868fae61b..73af92a5ac 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsCreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -52,6 +52,7 @@ public class AClassAssociationsCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (source == null && target == null)
@@ -77,6 +78,7 @@ public class AClassAssociationsCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
@@ -95,6 +97,7 @@ public class AClassAssociationsCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected void setElementToEdit(EObject element)
   {
     throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java
index e6e6cfd573..98475e201b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -65,6 +65,7 @@ public class AClassAssociationsReorientCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (false == referenceOwner instanceof AClass)
@@ -111,6 +112,7 @@ public class AClassAssociationsReorientCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsCreateCommand.java
index 6a176fc57c..9f6e13b3e1 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsCreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -52,6 +52,7 @@ public class AClassCompositionsCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (source == null && target == null)
@@ -77,6 +78,7 @@ public class AClassCompositionsCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
@@ -95,6 +97,7 @@ public class AClassCompositionsCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected void setElementToEdit(EObject element)
   {
     throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java
index 248ce9d523..78259dca91 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -65,6 +65,7 @@ public class AClassCompositionsReorientCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (false == referenceOwner instanceof AClass)
@@ -111,6 +112,7 @@ public class AClassCompositionsReorientCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCreateCommand.java
index 6327dca207..5c7ecaac05 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -44,9 +44,10 @@ public class AClassCreateCommand extends EditElementCommand
 
   /**
    * FIXME: replace with setElementToEdit()
-   * 
+   *
    * @generated
    */
+  @Override
   protected EObject getElementToEdit()
   {
     EObject container = ((CreateElementRequest)getRequest()).getContainer();
@@ -60,6 +61,7 @@ public class AClassCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     return true;
@@ -69,6 +71,7 @@ public class AClassCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     AClass newElement = AcoreFactory.eINSTANCE.createAClass();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java
index a602a01225..558db49b89 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -53,6 +53,7 @@ public class AClassImplementedInterfacesCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (source == null && target == null)
@@ -79,6 +80,7 @@ public class AClassImplementedInterfacesCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
@@ -97,6 +99,7 @@ public class AClassImplementedInterfacesCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected void setElementToEdit(EObject element)
   {
     throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java
index 2872ecdbc9..383e113e50 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -66,6 +66,7 @@ public class AClassImplementedInterfacesReorientCommand extends EditElementComma
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (false == referenceOwner instanceof AClass)
@@ -112,6 +113,7 @@ public class AClassImplementedInterfacesReorientCommand extends EditElementComma
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesCreateCommand.java
index 8068473578..308f31cf00 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesCreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -52,6 +52,7 @@ public class AClassSubClassesCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (source == null && target == null)
@@ -77,6 +78,7 @@ public class AClassSubClassesCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
@@ -95,6 +97,7 @@ public class AClassSubClassesCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected void setElementToEdit(EObject element)
   {
     throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java
index ed55a553c1..13aacece6f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -65,6 +65,7 @@ public class AClassSubClassesReorientCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     if (false == referenceOwner instanceof AClass)
@@ -91,8 +92,8 @@ public class AClassSubClassesReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints
-        .canExistAClassSubClasses_4001(getNewSource(), getOldTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassSubClasses_4001(getNewSource(),
+        getOldTarget());
   }
 
   /**
@@ -104,13 +105,14 @@ public class AClassSubClassesReorientCommand extends EditElementCommand
     {
       return false;
     }
-    return AcoreBaseItemSemanticEditPolicy.LinkConstraints
-        .canExistAClassSubClasses_4001(getOldSource(), getNewTarget());
+    return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassSubClasses_4001(getOldSource(),
+        getNewTarget());
   }
 
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     if (!canExecute())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AInterfaceCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AInterfaceCreateCommand.java
index e4c93bb945..940b962893 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AInterfaceCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AInterfaceCreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -44,9 +44,10 @@ public class AInterfaceCreateCommand extends EditElementCommand
 
   /**
    * FIXME: replace with setElementToEdit()
-   * 
+   *
    * @generated
    */
+  @Override
   protected EObject getElementToEdit()
   {
     EObject container = ((CreateElementRequest)getRequest()).getContainer();
@@ -60,6 +61,7 @@ public class AInterfaceCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     return true;
@@ -69,6 +71,7 @@ public class AInterfaceCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     AInterface newElement = AcoreFactory.eINSTANCE.createAInterface();
@@ -85,8 +88,7 @@ public class AInterfaceCreateCommand extends EditElementCommand
   /**
    * @generated
    */
-  protected void doConfigure(AInterface newElement, IProgressMonitor monitor, IAdaptable info)
-      throws ExecutionException
+  protected void doConfigure(AInterface newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();
     ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperation2CreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperation2CreateCommand.java
index 09776d7455..70b448af36 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperation2CreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperation2CreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -44,9 +44,10 @@ public class AOperation2CreateCommand extends EditElementCommand
 
   /**
    * FIXME: replace with setElementToEdit()
-   * 
+   *
    * @generated
    */
+  @Override
   protected EObject getElementToEdit()
   {
     EObject container = ((CreateElementRequest)getRequest()).getContainer();
@@ -60,6 +61,7 @@ public class AOperation2CreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     return true;
@@ -69,6 +71,7 @@ public class AOperation2CreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     AOperation newElement = AcoreFactory.eINSTANCE.createAOperation();
@@ -85,8 +88,7 @@ public class AOperation2CreateCommand extends EditElementCommand
   /**
    * @generated
    */
-  protected void doConfigure(AOperation newElement, IProgressMonitor monitor, IAdaptable info)
-      throws ExecutionException
+  protected void doConfigure(AOperation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();
     ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperationCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperationCreateCommand.java
index 0fd4ac7fe9..39fe36652f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperationCreateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperationCreateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands;
 
@@ -44,9 +44,10 @@ public class AOperationCreateCommand extends EditElementCommand
 
   /**
    * FIXME: replace with setElementToEdit()
-   * 
+   *
    * @generated
    */
+  @Override
   protected EObject getElementToEdit()
   {
     EObject container = ((CreateElementRequest)getRequest()).getContainer();
@@ -60,6 +61,7 @@ public class AOperationCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   public boolean canExecute()
   {
     return true;
@@ -69,6 +71,7 @@ public class AOperationCreateCommand extends EditElementCommand
   /**
    * @generated
    */
+  @Override
   protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     AOperation newElement = AcoreFactory.eINSTANCE.createAOperation();
@@ -85,8 +88,7 @@ public class AOperationCreateCommand extends EditElementCommand
   /**
    * @generated
    */
-  protected void doConfigure(AOperation newElement, IProgressMonitor monitor, IAdaptable info)
-      throws ExecutionException
+  protected void doConfigure(AOperation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException
   {
     IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();
     ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AAttributeEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AAttributeEditHelper.java
index 1bcf88bb46..1c62a220df 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AAttributeEditHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AAttributeEditHelper.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AClassEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AClassEditHelper.java
index fd98e6c8b4..e953dd1b65 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AClassEditHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AClassEditHelper.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/ACoreRootEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/ACoreRootEditHelper.java
index 8d5ab2e2c5..a69c987172 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/ACoreRootEditHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/ACoreRootEditHelper.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AInterfaceEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AInterfaceEditHelper.java
index 8faedd57a6..830a80e25b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AInterfaceEditHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AInterfaceEditHelper.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AOperationEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AOperationEditHelper.java
index 28bdb36b7d..d6aaa82c33 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AOperationEditHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AOperationEditHelper.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java
index 42dad843d5..087cfc827f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers;
 
@@ -42,6 +42,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper
   /**
    * @generated
    */
+  @Override
   protected IEditHelperAdvice[] getEditHelperAdvice(IEditCommandRequest req)
   {
     if (req.getParameter(CONTEXT_ELEMENT_TYPE) instanceof IElementType)
@@ -55,6 +56,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper
   /**
    * @generated
    */
+  @Override
   protected ICommand getInsteadCommand(IEditCommandRequest req)
   {
     ICommand epCommand = (ICommand)req.getParameter(EDIT_POLICY_COMMAND);
@@ -77,6 +79,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper
   /**
    * @generated
    */
+  @Override
   protected ICommand getCreateCommand(CreateElementRequest req)
   {
     return null;
@@ -85,6 +88,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper
   /**
    * @generated
    */
+  @Override
   protected ICommand getCreateRelationshipCommand(CreateRelationshipRequest req)
   {
     return null;
@@ -93,6 +97,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper
   /**
    * @generated
    */
+  @Override
   protected ICommand getDestroyElementCommand(DestroyElementRequest req)
   {
     return null;
@@ -101,6 +106,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper
   /**
    * @generated
    */
+  @Override
   protected ICommand getDestroyReferenceCommand(DestroyReferenceRequest req)
   {
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java
index 8d805ed6a7..6e9d30949b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -105,6 +105,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   public DragTracker getDragTracker(Request request)
   {
     if (request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3)
@@ -117,6 +118,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -201,6 +203,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected List getModelChildren()
   {
     return Collections.EMPTY_LIST;
@@ -209,6 +212,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   public IGraphicalEditPart getChildBySemanticHint(String semanticHint)
   {
     return null;
@@ -353,7 +357,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3003, getParserElement(),
           AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttribute2EditPart.VISUAL_ID));
+          .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttribute2EditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -416,6 +420,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void performDirectEditRequest(Request request)
   {
     final Request theRequest = request;
@@ -428,13 +433,14 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData()
+                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData().get(
-                  RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData()
+                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
-            else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText())))
+            else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
             {
               DirectEditRequest editRequest = (DirectEditRequest)theRequest;
               performDirectEdit(editRequest.getLocation());
@@ -456,6 +462,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void refreshVisuals()
   {
     super.refreshVisuals();
@@ -512,13 +519,14 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void refreshFont()
   {
     FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
     if (style != null)
     {
-      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD
-          : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
+          (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
       setFont(fontData);
     }
   }
@@ -526,6 +534,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void setFontColor(Color color)
   {
     getFigure().setForegroundColor(color);
@@ -534,6 +543,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void addSemanticListeners()
   {
     if (getParser() instanceof ISemanticParser)
@@ -554,6 +564,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void removeSemanticListeners()
   {
     if (parserElements != null)
@@ -572,6 +583,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected AccessibleEditPart getAccessibleEditPart()
   {
     if (accessibleEP == null)
@@ -579,6 +591,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
       accessibleEP = new AccessibleGraphicalEditPart()
       {
 
+        @Override
         public void getName(AccessibleEvent e)
         {
           e.result = getLabelTextHelper(getFigure());
@@ -599,6 +612,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void addNotationalListeners()
   {
     super.addNotationalListeners();
@@ -608,6 +622,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void removeNotationalListeners()
   {
     super.removeNotationalListeners();
@@ -617,6 +632,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void handleNotificationEvent(Notification event)
   {
     Object feature = event.getFeature();
@@ -666,6 +682,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected IFigure createFigure()
   {
     IFigure label = createFigurePrim();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java
index 4bb6ed44ea..c916525f3d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -105,6 +105,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   public DragTracker getDragTracker(Request request)
   {
     if (request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3)
@@ -117,6 +118,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -201,6 +203,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected List getModelChildren()
   {
     return Collections.EMPTY_LIST;
@@ -209,6 +212,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   public IGraphicalEditPart getChildBySemanticHint(String semanticHint)
   {
     return null;
@@ -353,7 +357,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3001, getParserElement(),
           AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttributeEditPart.VISUAL_ID));
+          .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttributeEditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -416,6 +420,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void performDirectEditRequest(Request request)
   {
     final Request theRequest = request;
@@ -428,13 +433,14 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData()
+                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData().get(
-                  RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData()
+                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
-            else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText())))
+            else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
             {
               DirectEditRequest editRequest = (DirectEditRequest)theRequest;
               performDirectEdit(editRequest.getLocation());
@@ -456,6 +462,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void refreshVisuals()
   {
     super.refreshVisuals();
@@ -512,13 +519,14 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void refreshFont()
   {
     FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
     if (style != null)
     {
-      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD
-          : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
+          (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
       setFont(fontData);
     }
   }
@@ -526,6 +534,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void setFontColor(Color color)
   {
     getFigure().setForegroundColor(color);
@@ -534,6 +543,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void addSemanticListeners()
   {
     if (getParser() instanceof ISemanticParser)
@@ -554,6 +564,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void removeSemanticListeners()
   {
     if (parserElements != null)
@@ -572,6 +583,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected AccessibleEditPart getAccessibleEditPart()
   {
     if (accessibleEP == null)
@@ -579,6 +591,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
       accessibleEP = new AccessibleGraphicalEditPart()
       {
 
+        @Override
         public void getName(AccessibleEvent e)
         {
           e.result = getLabelTextHelper(getFigure());
@@ -599,6 +612,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void addNotationalListeners()
   {
     super.addNotationalListeners();
@@ -608,6 +622,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void removeNotationalListeners()
   {
     super.removeNotationalListeners();
@@ -617,6 +632,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void handleNotificationEvent(Notification event)
   {
     Object feature = event.getFeature();
@@ -666,6 +682,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected IFigure createFigure()
   {
     IFigure label = createFigurePrim();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAAttributeCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAAttributeCompartmentEditPart.java
index cb2601b318..d22a84c570 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAAttributeCompartmentEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAAttributeCompartmentEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -47,6 +47,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart
   /**
    * @generated
    */
+  @Override
   protected boolean hasModelChildrenChanged(Notification evt)
   {
     return false;
@@ -55,6 +56,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart
   /**
    * @generated
    */
+  @Override
   public String getCompartmentName()
   {
     return Messages.AClassAAttributeCompartmentEditPart_title;
@@ -63,6 +65,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart
   /**
    * @generated
    */
+  @Override
   public IFigure createFigure()
   {
     ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
@@ -73,6 +76,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -85,6 +89,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart
   /**
    * @generated
    */
+  @Override
   protected void setRatio(Double ratio)
   {
     // nothing to do -- parent layout does not accept Double constraints as ratio
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAOperationClassCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAOperationClassCompartmentEditPart.java
index 8ac3fd40cf..facea597cc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAOperationClassCompartmentEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAOperationClassCompartmentEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -47,6 +47,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi
   /**
    * @generated
    */
+  @Override
   protected boolean hasModelChildrenChanged(Notification evt)
   {
     return false;
@@ -55,6 +56,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi
   /**
    * @generated
    */
+  @Override
   public String getCompartmentName()
   {
     return Messages.AClassAOperationClassCompartmentEditPart_title;
@@ -63,6 +65,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi
   /**
    * @generated
    */
+  @Override
   public IFigure createFigure()
   {
     ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
@@ -73,6 +76,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -85,6 +89,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi
   /**
    * @generated
    */
+  @Override
   protected void setRatio(Double ratio)
   {
     // nothing to do -- parent layout does not accept Double constraints as ratio
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAggregationsEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAggregationsEditPart.java
index 00347a0756..083ece4bdf 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAggregationsEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAggregationsEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -46,6 +46,7 @@ public class AClassAggregationsEditPart extends ConnectionNodeEditPart implement
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -55,10 +56,11 @@ public class AClassAggregationsEditPart extends ConnectionNodeEditPart implement
   /**
    * Creates figure for this edit part. Body of this method does not depend on settings in generation model so you may
    * safely remove <i>generated</i> tag and modify it.
-   * 
+   *
    * @generated
    */
 
+  @Override
   protected Connection createConnectionFigure()
   {
     return new AClassAggregationClassesFigure();
@@ -83,7 +85,7 @@ public class AClassAggregationsEditPart extends ConnectionNodeEditPart implement
      */
     public AClassAggregationClassesFigure()
     {
-      this.setLineWidth(1);
+      setLineWidth(1);
 
       setTargetDecoration(createTargetDecoration());
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAssociationsEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAssociationsEditPart.java
index 165ca7ac2e..99d8886e9a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAssociationsEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAssociationsEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -42,6 +42,7 @@ public class AClassAssociationsEditPart extends ConnectionNodeEditPart implement
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -51,9 +52,10 @@ public class AClassAssociationsEditPart extends ConnectionNodeEditPart implement
   /**
    * Creates figure for this edit part. Body of this method does not depend on settings in generation model so you may
    * safely remove <i>generated</i> tag and modify it.
-   * 
+   *
    * @generated
    */
+  @Override
   protected Connection createConnectionFigure()
   {
     return new PolylineConnectionEx();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassCompositionsEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassCompositionsEditPart.java
index eed7a02ed4..9ea78a5afe 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassCompositionsEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassCompositionsEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -46,6 +46,7 @@ public class AClassCompositionsEditPart extends ConnectionNodeEditPart implement
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -55,10 +56,11 @@ public class AClassCompositionsEditPart extends ConnectionNodeEditPart implement
   /**
    * Creates figure for this edit part. Body of this method does not depend on settings in generation model so you may
    * safely remove <i>generated</i> tag and modify it.
-   * 
+   *
    * @generated
    */
 
+  @Override
   protected Connection createConnectionFigure()
   {
     return new AClassCompositionClassesFigure();
@@ -83,7 +85,7 @@ public class AClassCompositionsEditPart extends ConnectionNodeEditPart implement
      */
     public AClassCompositionClassesFigure()
     {
-      this.setLineWidth(1);
+      setLineWidth(1);
 
       setTargetDecoration(createTargetDecoration());
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java
index f5e18b3a3a..ab8f3d9020 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -77,6 +77,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
@@ -97,6 +98,7 @@ public class AClassEditPart extends ShapeNodeEditPart
     ConstrainedToolbarLayoutEditPolicy lep = new ConstrainedToolbarLayoutEditPolicy()
     {
 
+      @Override
       protected EditPolicy createChildEditPolicy(EditPart child)
       {
         if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null)
@@ -185,6 +187,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void addChildVisual(EditPart childEditPart, int index)
   {
     if (addFixedChild(childEditPart))
@@ -197,6 +200,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void removeChildVisual(EditPart childEditPart)
   {
     if (removeFixedChild(childEditPart))
@@ -209,6 +213,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected IFigure getContentPaneFor(IGraphicalEditPart editPart)
   {
     if (editPart instanceof AClassAAttributeCompartmentEditPart)
@@ -234,9 +239,10 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * Creates figure for this edit part. Body of this method does not depend on settings in generation model so you may
    * safely remove <i>generated</i> tag and modify it.
-   * 
+   *
    * @generated
    */
+  @Override
   protected NodeFigure createNodeFigure()
   {
     NodeFigure figure = createNodePlate();
@@ -249,7 +255,7 @@ public class AClassEditPart extends ShapeNodeEditPart
 
   /**
    * Default implementation treats passed figure as content pane. Respects layout one may have set for generated figure.
-   * 
+   *
    * @param nodeShape
    *          instance of generated figure class
    * @generated
@@ -268,6 +274,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   public IFigure getContentPane()
   {
     if (contentPane != null)
@@ -280,6 +287,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void setForegroundColor(Color color)
   {
     if (primaryShape != null)
@@ -291,6 +299,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void setBackgroundColor(Color color)
   {
     if (primaryShape != null)
@@ -302,6 +311,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void setLineWidth(int width)
   {
     if (primaryShape instanceof Shape)
@@ -313,6 +323,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void setLineType(int style)
   {
     if (primaryShape instanceof Shape)
@@ -324,6 +335,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   public EditPart getPrimaryChildEditPart()
   {
     return getChildBySemanticHint(AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID));
@@ -442,6 +454,7 @@ public class AClassEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   public EditPart getTargetEditPart(Request request)
   {
     if (request instanceof CreateViewAndElementRequest)
@@ -455,7 +468,8 @@ public class AClassEditPart extends ShapeNodeEditPart
       }
       if (type == AcoreElementTypes.AOperation_3004)
       {
-        return getChildBySemanticHint(AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID));
+        return getChildBySemanticHint(
+            AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID));
       }
     }
     return super.getTargetEditPart(request);
@@ -495,10 +509,10 @@ public class AClassEditPart extends ShapeNodeEditPart
       layoutThis.setSpacing(0);
       layoutThis.setVertical(true);
 
-      this.setLayoutManager(layoutThis);
+      setLayoutManager(layoutThis);
 
-      this.setLineWidth(1);
-      this.setBackgroundColor(THIS_BACK);
+      setLineWidth(1);
+      setBackgroundColor(THIS_BACK);
       createContents();
     }
 
@@ -535,6 +549,7 @@ public class AClassEditPart extends ShapeNodeEditPart
     /**
      * @generated
      */
+    @Override
     protected boolean useLocalCoordinates()
     {
       return myUseLocalCoordinates;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassImplementedInterfacesEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassImplementedInterfacesEditPart.java
index 66759583a2..0784f546b9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassImplementedInterfacesEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassImplementedInterfacesEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -45,6 +45,7 @@ public class AClassImplementedInterfacesEditPart extends ConnectionNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -54,10 +55,11 @@ public class AClassImplementedInterfacesEditPart extends ConnectionNodeEditPart
   /**
    * Creates figure for this edit part. Body of this method does not depend on settings in generation model so you may
    * safely remove <i>generated</i> tag and modify it.
-   * 
+   *
    * @generated
    */
 
+  @Override
   protected Connection createConnectionFigure()
   {
     return new AClassImplementedInterfacesFigure();
@@ -82,8 +84,8 @@ public class AClassImplementedInterfacesEditPart extends ConnectionNodeEditPart
      */
     public AClassImplementedInterfacesFigure()
     {
-      this.setLineWidth(1);
-      this.setLineStyle(Graphics.LINE_DASH);
+      setLineWidth(1);
+      setLineStyle(Graphics.LINE_DASH);
 
       setTargetDecoration(createTargetDecoration());
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java
index 6a172f4e33..d0470cf525 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -104,6 +104,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -112,6 +113,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
     installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NonResizableEditPolicy()
     {
 
+      @Override
       protected List createSelectionHandles()
       {
         List handles = new ArrayList();
@@ -120,11 +122,13 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
         return handles;
       }
 
+      @Override
       public Command getCommand(Request request)
       {
         return null;
       }
 
+      @Override
       public boolean understandsRequest(Request request)
       {
         return false;
@@ -207,6 +211,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected List getModelChildren()
   {
     return Collections.EMPTY_LIST;
@@ -215,6 +220,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   public IGraphicalEditPart getChildBySemanticHint(String semanticHint)
   {
     return null;
@@ -426,6 +432,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void performDirectEditRequest(Request request)
   {
     final Request theRequest = request;
@@ -438,13 +445,14 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData()
+                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData().get(
-                  RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData()
+                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
-            else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText())))
+            else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
             {
               DirectEditRequest editRequest = (DirectEditRequest)theRequest;
               performDirectEdit(editRequest.getLocation());
@@ -466,6 +474,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void refreshVisuals()
   {
     super.refreshVisuals();
@@ -522,13 +531,14 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void refreshFont()
   {
     FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
     if (style != null)
     {
-      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD
-          : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
+          (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
       setFont(fontData);
     }
   }
@@ -536,6 +546,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void setFontColor(Color color)
   {
     getFigure().setForegroundColor(color);
@@ -544,6 +555,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void addSemanticListeners()
   {
     if (getParser() instanceof ISemanticParser)
@@ -564,6 +576,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void removeSemanticListeners()
   {
     if (parserElements != null)
@@ -582,6 +595,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected AccessibleEditPart getAccessibleEditPart()
   {
     if (accessibleEP == null)
@@ -589,6 +603,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
       accessibleEP = new AccessibleGraphicalEditPart()
       {
 
+        @Override
         public void getName(AccessibleEvent e)
         {
           e.result = getLabelTextHelper(getFigure());
@@ -609,6 +624,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void addNotationalListeners()
   {
     super.addNotationalListeners();
@@ -618,6 +634,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void removeNotationalListeners()
   {
     super.removeNotationalListeners();
@@ -627,6 +644,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void handleNotificationEvent(Notification event)
   {
     Object feature = event.getFeature();
@@ -676,6 +694,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected IFigure createFigure()
   {
     // Parent should assign one using setLabel() method
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassSubClassesEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassSubClassesEditPart.java
index 0609d22e4d..4d8e850193 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassSubClassesEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassSubClassesEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -46,6 +46,7 @@ public class AClassSubClassesEditPart extends ConnectionNodeEditPart implements
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -55,10 +56,11 @@ public class AClassSubClassesEditPart extends ConnectionNodeEditPart implements
   /**
    * Creates figure for this edit part. Body of this method does not depend on settings in generation model so you may
    * safely remove <i>generated</i> tag and modify it.
-   * 
+   *
    * @generated
    */
 
+  @Override
   protected Connection createConnectionFigure()
   {
     return new AClassSubClassesFigure();
@@ -83,7 +85,7 @@ public class AClassSubClassesEditPart extends ConnectionNodeEditPart implements
      */
     public AClassSubClassesFigure()
     {
-      this.setLineWidth(1);
+      setLineWidth(1);
 
       setTargetDecoration(createTargetDecoration());
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/ACoreRootEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/ACoreRootEditPart.java
index 95c938345b..78e4185c77 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/ACoreRootEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/ACoreRootEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -45,6 +45,7 @@ public class ACoreRootEditPart extends DiagramEditPart
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java
index e034073c44..8c34b3f0b0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -47,6 +47,7 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar
   /**
    * @generated
    */
+  @Override
   protected boolean hasModelChildrenChanged(Notification evt)
   {
     return false;
@@ -55,6 +56,7 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar
   /**
    * @generated
    */
+  @Override
   public String getCompartmentName()
   {
     return Messages.AInterfaceAAttributeInterfaceCompartmentEditPart_title;
@@ -63,6 +65,7 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar
   /**
    * @generated
    */
+  @Override
   public IFigure createFigure()
   {
     ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
@@ -73,6 +76,7 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -80,12 +84,14 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar
         new AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy());
     installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
     installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-    installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy());
+    installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
+        new AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy());
   }
 
   /**
    * @generated
    */
+  @Override
   protected void setRatio(Double ratio)
   {
     // nothing to do -- parent layout does not accept Double constraints as ratio
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java
index e01845f5ab..aa55e6ed33 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -47,6 +47,7 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar
   /**
    * @generated
    */
+  @Override
   protected boolean hasModelChildrenChanged(Notification evt)
   {
     return false;
@@ -55,6 +56,7 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar
   /**
    * @generated
    */
+  @Override
   public String getCompartmentName()
   {
     return Messages.AInterfaceAOperationInterfaceCompartmentEditPart_title;
@@ -63,6 +65,7 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar
   /**
    * @generated
    */
+  @Override
   public IFigure createFigure()
   {
     ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure();
@@ -73,6 +76,7 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -80,12 +84,14 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar
         new AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy());
     installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
     installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-    installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy());
+    installEditPolicy(EditPolicyRoles.CANONICAL_ROLE,
+        new AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy());
   }
 
   /**
    * @generated
    */
+  @Override
   protected void setRatio(Double ratio)
   {
     // nothing to do -- parent layout does not accept Double constraints as ratio
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java
index 684301a1fb..b8148f39c1 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -79,6 +79,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
@@ -99,6 +100,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
     ConstrainedToolbarLayoutEditPolicy lep = new ConstrainedToolbarLayoutEditPolicy()
     {
 
+      @Override
       protected EditPolicy createChildEditPolicy(EditPart child)
       {
         if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null)
@@ -187,6 +189,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void addChildVisual(EditPart childEditPart, int index)
   {
     if (addFixedChild(childEditPart))
@@ -199,6 +202,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void removeChildVisual(EditPart childEditPart)
   {
     if (removeFixedChild(childEditPart))
@@ -211,6 +215,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected IFigure getContentPaneFor(IGraphicalEditPart editPart)
   {
     if (editPart instanceof AInterfaceAAttributeInterfaceCompartmentEditPart)
@@ -236,9 +241,10 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * Creates figure for this edit part. Body of this method does not depend on settings in generation model so you may
    * safely remove <i>generated</i> tag and modify it.
-   * 
+   *
    * @generated
    */
+  @Override
   protected NodeFigure createNodeFigure()
   {
     NodeFigure figure = createNodePlate();
@@ -251,7 +257,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
 
   /**
    * Default implementation treats passed figure as content pane. Respects layout one may have set for generated figure.
-   * 
+   *
    * @param nodeShape
    *          instance of generated figure class
    * @generated
@@ -270,6 +276,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   public IFigure getContentPane()
   {
     if (contentPane != null)
@@ -282,6 +289,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void setForegroundColor(Color color)
   {
     if (primaryShape != null)
@@ -293,6 +301,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void setBackgroundColor(Color color)
   {
     if (primaryShape != null)
@@ -304,6 +313,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void setLineWidth(int width)
   {
     if (primaryShape instanceof Shape)
@@ -315,6 +325,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   protected void setLineType(int style)
   {
     if (primaryShape instanceof Shape)
@@ -326,6 +337,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   public EditPart getPrimaryChildEditPart()
   {
     return getChildBySemanticHint(AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID));
@@ -357,6 +369,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
   /**
    * @generated
    */
+  @Override
   public EditPart getTargetEditPart(Request request)
   {
     if (request instanceof CreateViewAndElementRequest)
@@ -366,13 +379,13 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
       IElementType type = (IElementType)adapter.getAdapter(IElementType.class);
       if (type == AcoreElementTypes.AAttribute_3001)
       {
-        return getChildBySemanticHint(AcoreVisualIDRegistry
-            .getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID));
+        return getChildBySemanticHint(
+            AcoreVisualIDRegistry.getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID));
       }
       if (type == AcoreElementTypes.AOperation_3002)
       {
-        return getChildBySemanticHint(AcoreVisualIDRegistry
-            .getType(AInterfaceAOperationInterfaceCompartmentEditPart.VISUAL_ID));
+        return getChildBySemanticHint(
+            AcoreVisualIDRegistry.getType(AInterfaceAOperationInterfaceCompartmentEditPart.VISUAL_ID));
       }
     }
     return super.getTargetEditPart(request);
@@ -412,11 +425,11 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
       layoutThis.setSpacing(0);
       layoutThis.setVertical(true);
 
-      this.setLayoutManager(layoutThis);
+      setLayoutManager(layoutThis);
 
-      this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(12), getMapMode().DPtoLP(12)));
-      this.setLineWidth(1);
-      this.setBackgroundColor(THIS_BACK);
+      setCornerDimensions(new Dimension(getMapMode().DPtoLP(12), getMapMode().DPtoLP(12)));
+      setLineWidth(1);
+      setBackgroundColor(THIS_BACK);
       createContents();
     }
 
@@ -427,7 +440,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
     {
 
       WrappingLabel aInterfaceTypeLabelFigure0 = new WrappingLabel();
-      aInterfaceTypeLabelFigure0.setText("«Interface»");
+      aInterfaceTypeLabelFigure0.setText("�Interface�");
 
       this.add(aInterfaceTypeLabelFigure0);
 
@@ -458,6 +471,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart
     /**
      * @generated
      */
+    @Override
     protected boolean useLocalCoordinates()
     {
       return myUseLocalCoordinates;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java
index 1aec5a1bfa..c94c537394 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -104,6 +104,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -112,6 +113,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
     installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NonResizableEditPolicy()
     {
 
+      @Override
       protected List createSelectionHandles()
       {
         List handles = new ArrayList();
@@ -120,11 +122,13 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
         return handles;
       }
 
+      @Override
       public Command getCommand(Request request)
       {
         return null;
       }
 
+      @Override
       public boolean understandsRequest(Request request)
       {
         return false;
@@ -207,6 +211,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected List getModelChildren()
   {
     return Collections.EMPTY_LIST;
@@ -215,6 +220,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   public IGraphicalEditPart getChildBySemanticHint(String semanticHint)
   {
     return null;
@@ -364,7 +370,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AInterface_2001, getParserElement(),
           AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceNameEditPart.VISUAL_ID));
+          .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceNameEditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -427,6 +433,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void performDirectEditRequest(Request request)
   {
     final Request theRequest = request;
@@ -439,13 +446,14 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData()
+                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData().get(
-                  RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData()
+                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
-            else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText())))
+            else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
             {
               DirectEditRequest editRequest = (DirectEditRequest)theRequest;
               performDirectEdit(editRequest.getLocation());
@@ -467,6 +475,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void refreshVisuals()
   {
     super.refreshVisuals();
@@ -523,13 +532,14 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void refreshFont()
   {
     FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
     if (style != null)
     {
-      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD
-          : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
+          (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
       setFont(fontData);
     }
   }
@@ -537,6 +547,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void setFontColor(Color color)
   {
     getFigure().setForegroundColor(color);
@@ -545,6 +556,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void addSemanticListeners()
   {
     if (getParser() instanceof ISemanticParser)
@@ -565,6 +577,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void removeSemanticListeners()
   {
     if (parserElements != null)
@@ -583,6 +596,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected AccessibleEditPart getAccessibleEditPart()
   {
     if (accessibleEP == null)
@@ -590,6 +604,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
       accessibleEP = new AccessibleGraphicalEditPart()
       {
 
+        @Override
         public void getName(AccessibleEvent e)
         {
           e.result = getLabelTextHelper(getFigure());
@@ -610,6 +625,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void addNotationalListeners()
   {
     super.addNotationalListeners();
@@ -619,6 +635,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void removeNotationalListeners()
   {
     super.removeNotationalListeners();
@@ -628,6 +645,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected void handleNotificationEvent(Notification event)
   {
     Object feature = event.getFeature();
@@ -677,6 +695,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText
   /**
    * @generated
    */
+  @Override
   protected IFigure createFigure()
   {
     // Parent should assign one using setLabel() method
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java
index 783c23e71a..93748083fa 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -105,6 +105,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   public DragTracker getDragTracker(Request request)
   {
     if (request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3)
@@ -117,6 +118,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -201,6 +203,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected List getModelChildren()
   {
     return Collections.EMPTY_LIST;
@@ -209,6 +212,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   public IGraphicalEditPart getChildBySemanticHint(String semanticHint)
   {
     return null;
@@ -353,7 +357,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3004, getParserElement(),
           AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperation2EditPart.VISUAL_ID));
+          .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperation2EditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -416,6 +420,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void performDirectEditRequest(Request request)
   {
     final Request theRequest = request;
@@ -428,13 +433,14 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData()
+                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData().get(
-                  RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData()
+                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
-            else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText())))
+            else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
             {
               DirectEditRequest editRequest = (DirectEditRequest)theRequest;
               performDirectEdit(editRequest.getLocation());
@@ -456,6 +462,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void refreshVisuals()
   {
     super.refreshVisuals();
@@ -512,13 +519,14 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void refreshFont()
   {
     FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
     if (style != null)
     {
-      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD
-          : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
+          (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
       setFont(fontData);
     }
   }
@@ -526,6 +534,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void setFontColor(Color color)
   {
     getFigure().setForegroundColor(color);
@@ -534,6 +543,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void addSemanticListeners()
   {
     if (getParser() instanceof ISemanticParser)
@@ -554,6 +564,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void removeSemanticListeners()
   {
     if (parserElements != null)
@@ -572,6 +583,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected AccessibleEditPart getAccessibleEditPart()
   {
     if (accessibleEP == null)
@@ -579,6 +591,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
       accessibleEP = new AccessibleGraphicalEditPart()
       {
 
+        @Override
         public void getName(AccessibleEvent e)
         {
           e.result = getLabelTextHelper(getFigure());
@@ -599,6 +612,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void addNotationalListeners()
   {
     super.addNotationalListeners();
@@ -608,6 +622,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void removeNotationalListeners()
   {
     super.removeNotationalListeners();
@@ -617,6 +632,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected void handleNotificationEvent(Notification event)
   {
     Object feature = event.getFeature();
@@ -666,6 +682,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa
   /**
    * @generated
    */
+  @Override
   protected IFigure createFigure()
   {
     IFigure label = createFigurePrim();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java
index 7e4f6f98f0..8c0c7dc1f9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -105,6 +105,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   public DragTracker getDragTracker(Request request)
   {
     if (request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3)
@@ -117,6 +118,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void createDefaultEditPolicies()
   {
     super.createDefaultEditPolicies();
@@ -201,6 +203,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected List getModelChildren()
   {
     return Collections.EMPTY_LIST;
@@ -209,6 +212,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   public IGraphicalEditPart getChildBySemanticHint(String semanticHint)
   {
     return null;
@@ -353,7 +357,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
     {
       parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3002, getParserElement(),
           AcoreVisualIDRegistry
-              .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperationEditPart.VISUAL_ID));
+          .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperationEditPart.VISUAL_ID));
     }
     return parser;
   }
@@ -416,6 +420,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void performDirectEditRequest(Request request)
   {
     final Request theRequest = request;
@@ -428,13 +433,14 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
         {
           if (isActive() && isEditable())
           {
-            if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
+            if (theRequest.getExtendedData()
+                .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character)
             {
-              Character initialChar = (Character)theRequest.getExtendedData().get(
-                  RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+              Character initialChar = (Character)theRequest.getExtendedData()
+                  .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
               performDirectEdit(initialChar.charValue());
             }
-            else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText())))
+            else if (theRequest instanceof DirectEditRequest && getEditText().equals(getLabelText()))
             {
               DirectEditRequest editRequest = (DirectEditRequest)theRequest;
               performDirectEdit(editRequest.getLocation());
@@ -456,6 +462,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void refreshVisuals()
   {
     super.refreshVisuals();
@@ -512,13 +519,14 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void refreshFont()
   {
     FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
     if (style != null)
     {
-      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD
-          : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+      FontData fontData = new FontData(style.getFontName(), style.getFontHeight(),
+          (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
       setFont(fontData);
     }
   }
@@ -526,6 +534,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void setFontColor(Color color)
   {
     getFigure().setForegroundColor(color);
@@ -534,6 +543,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void addSemanticListeners()
   {
     if (getParser() instanceof ISemanticParser)
@@ -554,6 +564,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void removeSemanticListeners()
   {
     if (parserElements != null)
@@ -572,6 +583,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected AccessibleEditPart getAccessibleEditPart()
   {
     if (accessibleEP == null)
@@ -579,6 +591,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
       accessibleEP = new AccessibleGraphicalEditPart()
       {
 
+        @Override
         public void getName(AccessibleEvent e)
         {
           e.result = getLabelTextHelper(getFigure());
@@ -599,6 +612,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void addNotationalListeners()
   {
     super.addNotationalListeners();
@@ -608,6 +622,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void removeNotationalListeners()
   {
     super.removeNotationalListeners();
@@ -617,6 +632,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected void handleNotificationEvent(Notification event)
   {
     Object feature = event.getFeature();
@@ -666,6 +682,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar
   /**
    * @generated
    */
+  @Override
   protected IFigure createFigure()
   {
     IFigure label = createFigurePrim();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AcoreEditPartFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AcoreEditPartFactory.java
index 11f1bde92f..0ea4d2d72a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AcoreEditPartFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AcoreEditPartFactory.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts;
 
@@ -118,7 +118,9 @@ public class AcoreEditPartFactory implements EditPartFactory
   public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source)
   {
     if (source.getFigure() instanceof WrappingLabel)
+    {
       return new TextCellEditorLocator((WrappingLabel)source.getFigure());
+    }
     else
     {
       return new LabelCellEditorLocator((Label)source.getFigure());
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttribute2ItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttribute2ItemSemanticEditPolicy.java
index 585c83a903..b2d9179a9b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttribute2ItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttribute2ItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -39,6 +39,7 @@ public class AAttribute2ItemSemanticEditPolicy extends AcoreBaseItemSemanticEdit
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyElementCommand(DestroyElementRequest req)
   {
     View view = (View)getHost().getModel();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttributeItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttributeItemSemanticEditPolicy.java
index f711ba3c64..4259ee46d1 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttributeItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttributeItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -39,6 +39,7 @@ public class AAttributeItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyElementCommand(DestroyElementRequest req)
   {
     View view = (View)getHost().getModel();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java
index aaa09ae516..ae6acb190e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -37,6 +37,7 @@ public class AClassAAttributeCompartmentCanonicalEditPolicy extends CanonicalEdi
   /**
    * @generated
    */
+  @Override
   protected List getSemanticChildrenList()
   {
     View viewObject = (View)getHost().getModel();
@@ -54,6 +55,7 @@ public class AClassAAttributeCompartmentCanonicalEditPolicy extends CanonicalEdi
   /**
    * @generated
    */
+  @Override
   protected boolean isOrphaned(Collection semanticChildren, final View view)
   {
     int visualID = AcoreVisualIDRegistry.getVisualID(view);
@@ -71,6 +73,7 @@ public class AClassAAttributeCompartmentCanonicalEditPolicy extends CanonicalEdi
   /**
    * @generated
    */
+  @Override
   protected EStructuralFeature getFeatureToSynchronize()
   {
     return AcorePackage.eINSTANCE.getABasicClass_Attributes();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentItemSemanticEditPolicy.java
index db06451fd0..dee0a355a0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -34,6 +34,7 @@ public class AClassAAttributeCompartmentItemSemanticEditPolicy extends AcoreBase
   /**
    * @generated
    */
+  @Override
   protected Command getCreateCommand(CreateElementRequest req)
   {
     if (AcoreElementTypes.AAttribute_3003 == req.getElementType())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java
index 28149aed9a..abdac56e12 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -37,6 +37,7 @@ public class AClassAOperationClassCompartmentCanonicalEditPolicy extends Canonic
   /**
    * @generated
    */
+  @Override
   protected List getSemanticChildrenList()
   {
     View viewObject = (View)getHost().getModel();
@@ -54,6 +55,7 @@ public class AClassAOperationClassCompartmentCanonicalEditPolicy extends Canonic
   /**
    * @generated
    */
+  @Override
   protected boolean isOrphaned(Collection semanticChildren, final View view)
   {
     int visualID = AcoreVisualIDRegistry.getVisualID(view);
@@ -71,6 +73,7 @@ public class AClassAOperationClassCompartmentCanonicalEditPolicy extends Canonic
   /**
    * @generated
    */
+  @Override
   protected EStructuralFeature getFeatureToSynchronize()
   {
     return AcorePackage.eINSTANCE.getABasicClass_Operations();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentItemSemanticEditPolicy.java
index 319f720244..e794fd191a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -34,6 +34,7 @@ public class AClassAOperationClassCompartmentItemSemanticEditPolicy extends Acor
   /**
    * @generated
    */
+  @Override
   protected Command getCreateCommand(CreateElementRequest req)
   {
     if (AcoreElementTypes.AOperation_3004 == req.getElementType())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAggregationsItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAggregationsItemSemanticEditPolicy.java
index ce82db2abc..02953f00d7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAggregationsItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAggregationsItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -34,6 +34,7 @@ public class AClassAggregationsItemSemanticEditPolicy extends AcoreBaseItemSeman
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyReferenceCommand(DestroyReferenceRequest req)
   {
     return getGEFWrapper(new DestroyReferenceCommand(req));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAssociationsItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAssociationsItemSemanticEditPolicy.java
index 26fd642036..fdad9b43d5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAssociationsItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAssociationsItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -34,6 +34,7 @@ public class AClassAssociationsItemSemanticEditPolicy extends AcoreBaseItemSeman
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyReferenceCommand(DestroyReferenceRequest req)
   {
     return getGEFWrapper(new DestroyReferenceCommand(req));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassCompositionsItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassCompositionsItemSemanticEditPolicy.java
index 5035eb867f..c62216df5b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassCompositionsItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassCompositionsItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -34,6 +34,7 @@ public class AClassCompositionsItemSemanticEditPolicy extends AcoreBaseItemSeman
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyReferenceCommand(DestroyReferenceRequest req)
   {
     return getGEFWrapper(new DestroyReferenceCommand(req));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassImplementedInterfacesItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassImplementedInterfacesItemSemanticEditPolicy.java
index daceaf55cb..b0a1d42973 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassImplementedInterfacesItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassImplementedInterfacesItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -34,6 +34,7 @@ public class AClassImplementedInterfacesItemSemanticEditPolicy extends AcoreBase
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyReferenceCommand(DestroyReferenceRequest req)
   {
     return getGEFWrapper(new DestroyReferenceCommand(req));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java
index d0a062bd0c..14e8a7adc1 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -68,6 +68,7 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyElementCommand(DestroyElementRequest req)
   {
     View view = (View)getHost().getModel();
@@ -187,8 +188,9 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
           switch (AcoreVisualIDRegistry.getVisualID(cnode))
           {
           case AAttribute2EditPart.VISUAL_ID:
-            cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
-                                                                                                                          // true
+            cmd.add(
+                new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
+                                                                                                                      // true
             // don't need explicit deletion of cnode as parent's view deletion would clean child views as well
             // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));
             break;
@@ -202,8 +204,9 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
           switch (AcoreVisualIDRegistry.getVisualID(cnode))
           {
           case AOperation2EditPart.VISUAL_ID:
-            cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
-                                                                                                                          // true
+            cmd.add(
+                new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
+                                                                                                                      // true
             // don't need explicit deletion of cnode as parent's view deletion would clean child views as well
             // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));
             break;
@@ -217,6 +220,7 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
   /**
    * @generated
    */
+  @Override
   protected Command getCreateRelationshipCommand(CreateRelationshipRequest req)
   {
     Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)
@@ -283,9 +287,10 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic
   /**
    * Returns command to reorient EReference based link. New link target or source should be the domain model element
    * associated with this node.
-   * 
+   *
    * @generated
    */
+  @Override
   protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req)
   {
     switch (getVisualID(req))
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassSubClassesItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassSubClassesItemSemanticEditPolicy.java
index 1af0c563b5..30e95e6a99 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassSubClassesItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassSubClassesItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -34,6 +34,7 @@ public class AClassSubClassesItemSemanticEditPolicy extends AcoreBaseItemSemanti
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyReferenceCommand(DestroyReferenceRequest req)
   {
     return getGEFWrapper(new DestroyReferenceCommand(req));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java
index 28e4fb20c7..b32b02308c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -66,6 +66,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
   /**
    * @generated
    */
+  @Override
   protected List getSemanticChildrenList()
   {
     View viewObject = (View)getHost().getModel();
@@ -82,6 +83,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
   /**
    * @generated
    */
+  @Override
   protected boolean shouldDeleteView(View view)
   {
     return true;
@@ -90,6 +92,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
   /**
    * @generated
    */
+  @Override
   protected boolean isOrphaned(Collection semanticChildren, final View view)
   {
     int visualID = AcoreVisualIDRegistry.getVisualID(view);
@@ -108,6 +111,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
   /**
    * @generated
    */
+  @Override
   protected Set getFeaturesToSynchronize()
   {
     if (myFeaturesToSynchronize == null)
@@ -122,6 +126,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
   /**
    * @generated
    */
+  @Override
   protected void refreshSemantic()
   {
     if (resolveSemanticElement() == null)
@@ -130,8 +135,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
     }
     LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();
     // refreshSemanticChildren() alternative
-    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater.getACoreRoot_1000SemanticChildren((View)getHost()
-        .getModel());
+    List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater
+        .getACoreRoot_1000SemanticChildren((View)getHost().getModel());
     ArrayList<EObject> semanticChildren = new ArrayList<EObject>(childDescriptors.size());
     for (Iterator<AcoreNodeDescriptor> it = childDescriptors.iterator(); it.hasNext();)
     {
@@ -158,8 +163,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
       AcoreNodeDescriptor next = it.next();
       String hint = AcoreVisualIDRegistry.getType(next.getVisualID());
       IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);
-      viewDescriptors.add(new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND,
-          false, host().getDiagramPreferencesHint()));
+      viewDescriptors.add(new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false,
+          host().getDiagramPreferencesHint()));
     }
     //
     CreateViewRequest request = getCreateViewRequest(viewDescriptors);
@@ -223,8 +228,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
       {
         AcoreLinkDescriptor nextLinkDescriptor = linkDescriptorsIterator.next();
         if (diagramLinkObject == nextLinkDescriptor.getModelElement()
-            && diagramLinkSrc == nextLinkDescriptor.getSource()
-            && diagramLinkDst == nextLinkDescriptor.getDestination()
+            && diagramLinkSrc == nextLinkDescriptor.getSource() && diagramLinkDst == nextLinkDescriptor.getDestination()
             && diagramLinkVisualID == nextLinkDescriptor.getVisualID())
         {
           linksIterator.remove();
@@ -255,7 +259,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
       {
         result.addAll(AcoreDiagramUpdater.getACoreRoot_1000ContainedLinks(view));
       }
-      if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$
+      if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) //$NON-NLS-1$
+      {
         domain2NotationMap.put(view.getElement(), view);
       }
       break;
@@ -266,7 +271,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
       {
         result.addAll(AcoreDiagramUpdater.getAInterface_2001ContainedLinks(view));
       }
-      if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$
+      if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) //$NON-NLS-1$
+      {
         domain2NotationMap.put(view.getElement(), view);
       }
       break;
@@ -277,7 +283,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
       {
         result.addAll(AcoreDiagramUpdater.getAClass_2002ContainedLinks(view));
       }
-      if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$
+      if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) //$NON-NLS-1$
+      {
         domain2NotationMap.put(view.getElement(), view);
       }
       break;
@@ -338,7 +345,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy
    */
   private EditPart getEditPart(EObject domainModelElement, Map<EObject, View> domain2NotationMap)
   {
-    View view = (View)domain2NotationMap.get(domainModelElement);
+    View view = domain2NotationMap.get(domainModelElement);
     if (view != null)
     {
       return (EditPart)getHost().getViewer().getEditPartRegistry().get(view);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootItemSemanticEditPolicy.java
index bc987d6a9f..811fc760ee 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -40,6 +40,7 @@ public class ACoreRootItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPo
   /**
    * @generated
    */
+  @Override
   protected Command getCreateCommand(CreateElementRequest req)
   {
     if (AcoreElementTypes.AInterface_2001 == req.getElementType())
@@ -56,6 +57,7 @@ public class ACoreRootItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPo
   /**
    * @generated
    */
+  @Override
   protected Command getDuplicateCommand(DuplicateElementsRequest req)
   {
     TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java
index 6aa7af68bc..4f16d8084f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -37,6 +37,7 @@ public class AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy extends
   /**
    * @generated
    */
+  @Override
   protected List getSemanticChildrenList()
   {
     View viewObject = (View)getHost().getModel();
@@ -54,6 +55,7 @@ public class AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy extends
   /**
    * @generated
    */
+  @Override
   protected boolean isOrphaned(Collection semanticChildren, final View view)
   {
     int visualID = AcoreVisualIDRegistry.getVisualID(view);
@@ -71,6 +73,7 @@ public class AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy extends
   /**
    * @generated
    */
+  @Override
   protected EStructuralFeature getFeatureToSynchronize()
   {
     return AcorePackage.eINSTANCE.getABasicClass_Attributes();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy.java
index d6d9929706..fe3b277e9b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -34,6 +34,7 @@ public class AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy exte
   /**
    * @generated
    */
+  @Override
   protected Command getCreateCommand(CreateElementRequest req)
   {
     if (AcoreElementTypes.AAttribute_3001 == req.getElementType())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java
index 2638821d5a..9d083b795c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -37,6 +37,7 @@ public class AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy extends
   /**
    * @generated
    */
+  @Override
   protected List getSemanticChildrenList()
   {
     View viewObject = (View)getHost().getModel();
@@ -54,6 +55,7 @@ public class AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy extends
   /**
    * @generated
    */
+  @Override
   protected boolean isOrphaned(Collection semanticChildren, final View view)
   {
     int visualID = AcoreVisualIDRegistry.getVisualID(view);
@@ -71,6 +73,7 @@ public class AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy extends
   /**
    * @generated
    */
+  @Override
   protected EStructuralFeature getFeatureToSynchronize()
   {
     return AcorePackage.eINSTANCE.getABasicClass_Operations();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy.java
index 3b1caa8fcb..c94570c3c2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -34,6 +34,7 @@ public class AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy exte
   /**
    * @generated
    */
+  @Override
   protected Command getCreateCommand(CreateElementRequest req)
   {
     if (AcoreElementTypes.AOperation_3002 == req.getElementType())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java
index c8ae82251d..b1746e7d4e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -56,6 +56,7 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyElementCommand(DestroyElementRequest req)
   {
     View view = (View)getHost().getModel();
@@ -107,8 +108,9 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
           switch (AcoreVisualIDRegistry.getVisualID(cnode))
           {
           case AAttributeEditPart.VISUAL_ID:
-            cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
-                                                                                                                          // true
+            cmd.add(
+                new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
+                                                                                                                      // true
             // don't need explicit deletion of cnode as parent's view deletion would clean child views as well
             // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));
             break;
@@ -122,8 +124,9 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
           switch (AcoreVisualIDRegistry.getVisualID(cnode))
           {
           case AOperationEditPart.VISUAL_ID:
-            cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
-                                                                                                                          // true
+            cmd.add(
+                new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned:
+                                                                                                                      // true
             // don't need explicit deletion of cnode as parent's view deletion would clean child views as well
             // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode));
             break;
@@ -137,6 +140,7 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
   /**
    * @generated
    */
+  @Override
   protected Command getCreateRelationshipCommand(CreateRelationshipRequest req)
   {
     Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req)
@@ -171,9 +175,10 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
   /**
    * Returns command to reorient EReference based link. New link target or source should be the domain model element
    * associated with this node.
-   * 
+   *
    * @generated
    */
+  @Override
   protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req)
   {
     switch (getVisualID(req))
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperation2ItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperation2ItemSemanticEditPolicy.java
index f718a66b02..dd00392d8e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperation2ItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperation2ItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -39,6 +39,7 @@ public class AOperation2ItemSemanticEditPolicy extends AcoreBaseItemSemanticEdit
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyElementCommand(DestroyElementRequest req)
   {
     View view = (View)getHost().getModel();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperationItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperationItemSemanticEditPolicy.java
index 20bdcb7fef..c29e018921 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperationItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperationItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -39,6 +39,7 @@ public class AOperationItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP
   /**
    * @generated
    */
+  @Override
   protected Command getDestroyElementCommand(DestroyElementRequest req)
   {
     View view = (View)getHost().getModel();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java
index 83300edead..39bff28e93 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -57,7 +57,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy
 
   /**
    * Extended request data key to hold editpart visual id.
-   * 
+   *
    * @generated
    */
   public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$
@@ -79,9 +79,10 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy
    * Extended request data key to hold editpart visual id. Add visual id of edited editpart to extended data of the
    * request so command switch can decide what kind of diagram element is being edited. It is done in those cases when
    * it's not possible to deduce diagram element kind from domain element.
-   * 
+   *
    * @generated
    */
+  @Override
   public Command getCommand(Request request)
   {
     if (request instanceof ReconnectRequest)
@@ -98,7 +99,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy
 
   /**
    * Returns visual id from request parameters.
-   * 
+   *
    * @generated
    */
   protected int getVisualID(IEditCommandRequest request)
@@ -110,6 +111,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy
   /**
    * @generated
    */
+  @Override
   protected Command getSemanticCommand(IEditCommandRequest request)
   {
     IEditCommandRequest completedRequest = completeRequest(request);
@@ -318,7 +320,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy
 
   /**
    * Returns editing domain from the host edit part.
-   * 
+   *
    * @generated
    */
   protected TransactionalEditingDomain getEditingDomain()
@@ -328,7 +330,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy
 
   /**
    * Clean all shortcuts to the host element from the same diagram
-   * 
+   *
    * @generated
    */
   protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view)
@@ -337,7 +339,9 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy
     for (Iterator it = view.getDiagram().getChildren().iterator(); it.hasNext();)
     {
       View nextView = (View)it.next();
-      if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$
+      if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() //$NON-NLS-1$
+          || nextView.getElement() != view.getElement())
+      {
         continue;
       }
       cmd.add(new DeleteCommand(getEditingDomain(), nextView));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextNonResizableEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextNonResizableEditPolicy.java
index 522357c579..73798facd0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextNonResizableEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextNonResizableEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -52,6 +52,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx
   /**
    * @generated
    */
+  @Override
   protected void showPrimarySelection()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -69,6 +70,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx
   /**
    * @generated
    */
+  @Override
   protected void showSelection()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -89,6 +91,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx
   /**
    * @generated
    */
+  @Override
   protected void hideSelection()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -111,6 +114,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx
   /**
    * @generated
    */
+  @Override
   protected void showFocus()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -128,6 +132,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx
   /**
    * @generated
    */
+  @Override
   protected void hideFocus()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -193,6 +198,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx
     return new Figure()
     {
 
+      @Override
       protected void paintFigure(Graphics graphics)
       {
         graphics.drawFocus(getBounds().getResized(-1, -1));
@@ -271,6 +277,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx
   /**
    * @generated
    */
+  @Override
   protected List createSelectionHandles()
   {
     MoveHandle moveHandle = new MoveHandle((GraphicalEditPart)getHost());
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextSelectionEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextSelectionEditPolicy.java
index 1d663c93f1..dbad3e5681 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextSelectionEditPolicy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextSelectionEditPolicy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies;
 
@@ -46,6 +46,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy
   /**
    * @generated
    */
+  @Override
   protected void showPrimarySelection()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -63,6 +64,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy
   /**
    * @generated
    */
+  @Override
   protected void showSelection()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -83,6 +85,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy
   /**
    * @generated
    */
+  @Override
   protected void hideSelection()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -105,6 +108,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy
   /**
    * @generated
    */
+  @Override
   protected void showFocus()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -122,6 +126,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy
   /**
    * @generated
    */
+  @Override
   protected void hideFocus()
   {
     if (getHostFigure() instanceof WrappingLabel)
@@ -187,6 +192,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy
     return new Figure()
     {
 
+      @Override
       protected void paintFigure(Graphics graphics)
       {
         graphics.drawFocus(getBounds().getResized(-1, -1));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreAbstractNavigatorItem.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreAbstractNavigatorItem.java
index 53062a984c..be39d6fe27 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreAbstractNavigatorItem.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreAbstractNavigatorItem.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java
index 648637b0c9..58acc46d96 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
@@ -74,12 +74,15 @@ public class AcoreDomainNavigatorContentProvider implements ICommonContentProvid
    */
   public AcoreDomainNavigatorContentProvider()
   {
-    myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(AcoreDiagramEditorPlugin.getInstance()
-        .getItemProvidersAdapterFactory());
+    myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(
+        AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
     TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();
     myEditingDomain = (AdapterFactoryEditingDomain)editingDomain;
     myEditingDomain.setResourceToReadOnlyMap(new HashMap()
     {
+      private static final long serialVersionUID = 1L;
+
+      @Override
       public Object get(Object key)
       {
         if (!containsKey(key))
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java
index fda7a6837e..b22c6f5d32 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
@@ -113,13 +113,13 @@ public class AcoreDomainNavigatorItem extends PlatformObject
   /**
    * @generated
    */
+  @Override
   public boolean equals(Object obj)
   {
     if (obj instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreDomainNavigatorItem)
     {
-      return EcoreUtil.getURI(getEObject()).equals(
-          EcoreUtil.getURI(((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreDomainNavigatorItem)obj)
-              .getEObject()));
+      return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(
+          ((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreDomainNavigatorItem)obj).getEObject()));
     }
     return super.equals(obj);
   }
@@ -127,6 +127,7 @@ public class AcoreDomainNavigatorItem extends PlatformObject
   /**
    * @generated
    */
+  @Override
   public int hashCode()
   {
     return EcoreUtil.getURI(getEObject()).hashCode();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorLabelProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorLabelProvider.java
index d40bf3956c..31693264a6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorLabelProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorActionProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorActionProvider.java
index ab314ea25f..162fe4a19a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorActionProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
@@ -60,6 +60,7 @@ public class AcoreNavigatorActionProvider extends CommonActionProvider
   /**
    * @generated
    */
+  @Override
   public void init(ICommonActionExtensionSite aSite)
   {
     super.init(aSite);
@@ -85,6 +86,7 @@ public class AcoreNavigatorActionProvider extends CommonActionProvider
   /**
    * @generated
    */
+  @Override
   public void fillActionBars(IActionBars actionBars)
   {
     if (!myContribute)
@@ -102,6 +104,7 @@ public class AcoreNavigatorActionProvider extends CommonActionProvider
   /**
    * @generated
    */
+  @Override
   public void fillContextMenu(IMenuManager menu)
   {
   }
@@ -163,6 +166,7 @@ public class AcoreNavigatorActionProvider extends CommonActionProvider
     /**
      * @generated
      */
+    @Override
     public void run()
     {
       if (myDiagram == null || myDiagram.eResource() == null)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java
index 4c01a2b951..7abbfae0ca 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
@@ -94,6 +94,9 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     myEditingDomain = (AdapterFactoryEditingDomain)editingDomain;
     myEditingDomain.setResourceToReadOnlyMap(new HashMap()
     {
+      private static final long serialVersionUID = 1L;
+
+      @Override
       public Object get(Object key)
       {
         if (!containsKey(key))
@@ -322,8 +325,8 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
       AcoreNavigatorGroup incominglinks = new AcoreNavigatorGroup(
-          Messages.NavigatorGroupName_AInterface_2001_incominglinks,
-          "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+          Messages.NavigatorGroupName_AInterface_2001_incominglinks, "icons/incomingLinksNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
       Collection<View> connectedViews;
       connectedViews = getChildrenByType(Collections.singleton(view),
           AcoreVisualIDRegistry.getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID));
@@ -372,11 +375,11 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
       AcoreNavigatorGroup target = new AcoreNavigatorGroup(
-          Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_target,
-          "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+          Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_target, "icons/linkTargetNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
       AcoreNavigatorGroup source = new AcoreNavigatorGroup(
-          Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_source,
-          "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+          Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_source, "icons/linkSourceNavigatorGroup.gif", //$NON-NLS-1$
+          parentElement);
       Collection<View> connectedViews;
       connectedViews = getLinksTargetByType(Collections.singleton(view),
           AcoreVisualIDRegistry.getType(AInterfaceEditPart.VISUAL_ID));
@@ -398,10 +401,10 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider
     case AClassEditPart.VISUAL_ID:
     {
       LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>();
-      AcoreNavigatorGroup incominglinks = new AcoreNavigatorGroup(
-          Messages.NavigatorGroupName_AClass_2002_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
-      AcoreNavigatorGroup outgoinglinks = new AcoreNavigatorGroup(
-          Messages.NavigatorGroupName_AClass_2002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+      AcoreNavigatorGroup incominglinks = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClass_2002_incominglinks,
+          "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+      AcoreNavigatorGroup outgoinglinks = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClass_2002_outgoinglinks,
+          "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
       Collection<View> connectedViews;
       connectedViews = getChildrenByType(Collections.singleton(view),
           AcoreVisualIDRegistry.getType(AClassAAttributeCompartmentEditPart.VISUAL_ID));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorGroup.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorGroup.java
index 48f841deb0..b45c471d7c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorGroup.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorGroup.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
@@ -96,6 +96,7 @@ public class AcoreNavigatorGroup extends AcoreAbstractNavigatorItem
   /**
    * @generated
    */
+  @Override
   public boolean equals(Object obj)
   {
     if (obj instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorGroup)
@@ -112,6 +113,7 @@ public class AcoreNavigatorGroup extends AcoreAbstractNavigatorItem
   /**
    * @generated
    */
+  @Override
   public int hashCode()
   {
     return getGroupName().hashCode();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java
index 0e455b1861..6f02d32859 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
@@ -38,7 +38,8 @@ public class AcoreNavigatorItem extends AcoreAbstractNavigatorItem
         if (adaptableObject instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem
             && (adapterType == View.class || adapterType == EObject.class))
         {
-          return ((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)adaptableObject).getView();
+          return ((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)adaptableObject)
+              .getView();
         }
         return null;
       }
@@ -89,13 +90,13 @@ public class AcoreNavigatorItem extends AcoreAbstractNavigatorItem
   /**
    * @generated
    */
+  @Override
   public boolean equals(Object obj)
   {
     if (obj instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)
     {
-      return EcoreUtil.getURI(getView()).equals(
-          EcoreUtil.getURI(((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)obj)
-              .getView()));
+      return EcoreUtil.getURI(getView()).equals(EcoreUtil
+          .getURI(((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)obj).getView()));
     }
     return super.equals(obj);
   }
@@ -103,6 +104,7 @@ public class AcoreNavigatorItem extends AcoreAbstractNavigatorItem
   /**
    * @generated
    */
+  @Override
   public int hashCode()
   {
     return EcoreUtil.getURI(getView()).hashCode();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java
index 19ec0bc695..c39fe2f4be 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
@@ -58,10 +58,10 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
    */
   static
   {
-    AcoreDiagramEditorPlugin.getInstance().getImageRegistry()
-        .put("Navigator?UnknownElement", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$
-    AcoreDiagramEditorPlugin.getInstance().getImageRegistry()
-        .put("Navigator?ImageNotFound", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$
+    AcoreDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?UnknownElement", //$NON-NLS-1$
+        ImageDescriptor.getMissingImageDescriptor());
+    AcoreDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?ImageNotFound", //$NON-NLS-1$
+        ImageDescriptor.getMissingImageDescriptor());
   }
 
   /**
@@ -81,6 +81,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
   /**
    * @generated
    */
+  @Override
   public Image getImage(Object element)
   {
     if (element instanceof AcoreNavigatorGroup)
@@ -110,41 +111,42 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
     switch (AcoreVisualIDRegistry.getVisualID(view))
     {
     case AAttributeEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AAttribute", AcoreElementTypes.AAttribute_3001); //$NON-NLS-1$
+      return getImage("Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AAttribute", //$NON-NLS-1$
+          AcoreElementTypes.AAttribute_3001);
     case AOperation2EditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AOperation", AcoreElementTypes.AOperation_3004); //$NON-NLS-1$
+      return getImage("Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AOperation", //$NON-NLS-1$
+          AcoreElementTypes.AOperation_3004);
     case AClassSubClassesEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?subClasses", AcoreElementTypes.AClassSubClasses_4001); //$NON-NLS-1$
+      return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?subClasses", //$NON-NLS-1$
+          AcoreElementTypes.AClassSubClasses_4001);
     case AClassCompositionsEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?compositions", AcoreElementTypes.AClassCompositions_4005); //$NON-NLS-1$
+      return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?compositions", //$NON-NLS-1$
+          AcoreElementTypes.AClassCompositions_4005);
     case AInterfaceEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?TopLevelNode?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AInterface", AcoreElementTypes.AInterface_2001); //$NON-NLS-1$
+      return getImage("Navigator?TopLevelNode?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AInterface", //$NON-NLS-1$
+          AcoreElementTypes.AInterface_2001);
     case AClassAggregationsEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?aggregations", AcoreElementTypes.AClassAggregations_4004); //$NON-NLS-1$
+      return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?aggregations", //$NON-NLS-1$
+          AcoreElementTypes.AClassAggregations_4004);
     case AClassImplementedInterfacesEditPart.VISUAL_ID:
       return getImage(
-          "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?implementedInterfaces", AcoreElementTypes.AClassImplementedInterfaces_4002); //$NON-NLS-1$
+          "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?implementedInterfaces", //$NON-NLS-1$
+          AcoreElementTypes.AClassImplementedInterfaces_4002);
     case AAttribute2EditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AAttribute", AcoreElementTypes.AAttribute_3003); //$NON-NLS-1$
+      return getImage("Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AAttribute", //$NON-NLS-1$
+          AcoreElementTypes.AAttribute_3003);
     case AClassEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?TopLevelNode?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass", AcoreElementTypes.AClass_2002); //$NON-NLS-1$
+      return getImage("Navigator?TopLevelNode?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass", //$NON-NLS-1$
+          AcoreElementTypes.AClass_2002);
     case ACoreRootEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Diagram?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?ACoreRoot", AcoreElementTypes.ACoreRoot_1000); //$NON-NLS-1$
+      return getImage("Navigator?Diagram?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?ACoreRoot", //$NON-NLS-1$
+          AcoreElementTypes.ACoreRoot_1000);
     case AClassAssociationsEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?associations", AcoreElementTypes.AClassAssociations_4003); //$NON-NLS-1$
+      return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?associations", //$NON-NLS-1$
+          AcoreElementTypes.AClassAssociations_4003);
     case AOperationEditPart.VISUAL_ID:
-      return getImage(
-          "Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AOperation", AcoreElementTypes.AOperation_3002); //$NON-NLS-1$
+      return getImage("Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AOperation", //$NON-NLS-1$
+          AcoreElementTypes.AOperation_3002);
     }
     return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$
   }
@@ -173,6 +175,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
   /**
    * @generated
    */
+  @Override
   public String getText(Object element)
   {
     if (element instanceof AcoreNavigatorGroup)
@@ -240,7 +243,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
   {
     IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3001,
         view.getElement() != null ? view.getElement() : view,
-        AcoreVisualIDRegistry.getType(AAttributeEditPart.VISUAL_ID));
+            AcoreVisualIDRegistry.getType(AAttributeEditPart.VISUAL_ID));
     if (parser != null)
     {
       return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -260,7 +263,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
   {
     IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3004,
         view.getElement() != null ? view.getElement() : view,
-        AcoreVisualIDRegistry.getType(AOperation2EditPart.VISUAL_ID));
+            AcoreVisualIDRegistry.getType(AOperation2EditPart.VISUAL_ID));
     if (parser != null)
     {
       return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -296,7 +299,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
   {
     IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AInterface_2001,
         view.getElement() != null ? view.getElement() : view,
-        AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID));
+            AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID));
     if (parser != null)
     {
       return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -332,7 +335,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
   {
     IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3003,
         view.getElement() != null ? view.getElement() : view,
-        AcoreVisualIDRegistry.getType(AAttribute2EditPart.VISUAL_ID));
+            AcoreVisualIDRegistry.getType(AAttribute2EditPart.VISUAL_ID));
     if (parser != null)
     {
       return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -352,7 +355,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
   {
     IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AClass_2002,
         view.getElement() != null ? view.getElement() : view,
-        AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID));
+            AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID));
     if (parser != null)
     {
       return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -397,7 +400,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
   {
     IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3002,
         view.getElement() != null ? view.getElement() : view,
-        AcoreVisualIDRegistry.getType(AOperationEditPart.VISUAL_ID));
+            AcoreVisualIDRegistry.getType(AOperationEditPart.VISUAL_ID));
     if (parser != null)
     {
       return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view),
@@ -415,7 +418,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
    */
   private String getUnknownElementText(View view)
   {
-    return "<UnknownElement Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$  //$NON-NLS-2$
+    return "<UnknownElement Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
@@ -423,7 +426,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo
    */
   private String getUnresolvedDomainElementProxyText(View view)
   {
-    return "<Unresolved domain element Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$  //$NON-NLS-2$
+    return "<Unresolved domain element Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java
index 5cd1f7fd24..678c62cd95 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorSorter.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorSorter.java
index 9b53f4e12c..3500475485 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorSorter.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorSorter.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator;
 
@@ -29,6 +29,7 @@ public class AcoreNavigatorSorter extends ViewerSorter
   /**
    * @generated
    */
+  @Override
   public int category(Object element)
   {
     if (element instanceof AcoreNavigatorItem)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/AbstractParser.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/AbstractParser.java
index 7fa205ec31..2d9c3e3c12 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/AbstractParser.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/AbstractParser.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;
 
@@ -78,7 +78,7 @@ public abstract class AbstractParser implements IParser
     {
       throw new IllegalArgumentException();
     }
-    this.editableFeatures = this.features = features;
+    editableFeatures = this.features = features;
   }
 
   /**
@@ -233,7 +233,7 @@ public abstract class AbstractParser implements IParser
     {
       return UnexecutableCommand.INSTANCE;
     }
-    EObject element = (EObject)adapter.getAdapter(EObject.class);
+    EObject element = adapter.getAdapter(EObject.class);
     TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(element);
     if (editingDomain == null)
     {
@@ -577,6 +577,7 @@ public abstract class AbstractParser implements IParser
     /**
      * @generated
      */
+    @Override
     public String toString()
     {
       return description;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java
index 872f8a7425..3e1660493e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers;
 
@@ -100,6 +100,7 @@ public class MessageFormatParser extends AbstractParser
   /**
    * @generated
    */
+  @Override
   public void setViewPattern(String viewPattern)
   {
     super.setViewPattern(viewPattern);
@@ -109,6 +110,7 @@ public class MessageFormatParser extends AbstractParser
   /**
    * @generated
    */
+  @Override
   public void setEditorPattern(String editorPattern)
   {
     super.setEditorPattern(editorPattern);
@@ -134,7 +136,8 @@ public class MessageFormatParser extends AbstractParser
   {
     if (editorProcessor == null)
     {
-      editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());
+      editorProcessor = new MessageFormat(
+          getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());
     }
     return editorProcessor;
   }
@@ -165,6 +168,7 @@ public class MessageFormatParser extends AbstractParser
   /**
    * @generated
    */
+  @Override
   public void setEditPattern(String editPattern)
   {
     super.setEditPattern(editPattern);
@@ -188,7 +192,7 @@ public class MessageFormatParser extends AbstractParser
    */
   public String getEditString(IAdaptable adapter, int flags)
   {
-    EObject element = (EObject)adapter.getAdapter(EObject.class);
+    EObject element = adapter.getAdapter(EObject.class);
     return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString();
   }
 
@@ -201,8 +205,8 @@ public class MessageFormatParser extends AbstractParser
     Object[] values = getEditProcessor().parse(editString, pos);
     if (values == null)
     {
-      return new ParserEditStatus(AcoreDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, NLS.bind(
-          Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex())));
+      return new ParserEditStatus(AcoreDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE,
+          NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex())));
     }
     return validateNewValues(values);
   }
@@ -221,7 +225,7 @@ public class MessageFormatParser extends AbstractParser
    */
   public String getPrintString(IAdaptable adapter, int flags)
   {
-    EObject element = (EObject)adapter.getAdapter(EObject.class);
+    EObject element = adapter.getAdapter(EObject.class);
     return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java
index fd4bdb99eb..ee3da401b0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -110,13 +110,15 @@ public class AcoreCreationWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(Messages.AcoreCreationWizardTitle);
-    setDefaultPageImageDescriptor(AcoreDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewAcoreWizard.gif")); //$NON-NLS-1$
+    setDefaultPageImageDescriptor(
+        AcoreDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewAcoreWizard.gif")); //$NON-NLS-1$
     setNeedsProgressMonitor(true);
   }
 
   /**
    * @generated
    */
+  @Override
   public void addPages()
   {
     diagramModelFilePage = new AcoreCreationWizardPage("DiagramModelFile", getSelection(), "acore_diagram"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -124,8 +126,10 @@ public class AcoreCreationWizard extends Wizard implements INewWizard
     diagramModelFilePage.setDescription(Messages.AcoreCreationWizard_DiagramModelFilePageDescription);
     addPage(diagramModelFilePage);
 
-    domainModelFilePage = new AcoreCreationWizardPage("DomainModelFile", getSelection(), "acore") { //$NON-NLS-1$ //$NON-NLS-2$
+    domainModelFilePage = new AcoreCreationWizardPage("DomainModelFile", getSelection(), "acore") //$NON-NLS-1$ //$NON-NLS-2$
+    {
 
+      @Override
       public void setVisible(boolean visible)
       {
         if (visible)
@@ -145,11 +149,13 @@ public class AcoreCreationWizard extends Wizard implements INewWizard
   /**
    * @generated
    */
+  @Override
   public boolean performFinish()
   {
     IRunnableWithProgress op = new WorkspaceModifyOperation(null)
     {
 
+      @Override
       protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException
       {
         diagram = AcoreDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), domainModelFilePage.getURI(),
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizardPage.java
index 9d7f4f315d..8a2e758b75 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizardPage.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -42,7 +42,7 @@ public class AcoreCreationWizardPage extends WizardNewFileCreationPage
 
   /**
    * Override to create files with this extension.
-   * 
+   *
    * @generated
    */
   protected String getExtension()
@@ -79,6 +79,7 @@ public class AcoreCreationWizardPage extends WizardNewFileCreationPage
   /**
    * @generated
    */
+  @Override
   public void createControl(Composite parent)
   {
     super.createControl(parent);
@@ -89,6 +90,7 @@ public class AcoreCreationWizardPage extends WizardNewFileCreationPage
   /**
    * @generated
    */
+  @Override
   protected boolean validatePage()
   {
     if (!super.validatePage())
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramActionBarContributor.java
index 795214723d..5c39ab66f9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramActionBarContributor.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -26,6 +26,7 @@ public class AcoreDiagramActionBarContributor extends DiagramActionBarContributo
   /**
    * @generated
    */
+  @Override
   protected Class getEditorClass()
   {
     return AcoreDiagramEditor.class;
@@ -34,6 +35,7 @@ public class AcoreDiagramActionBarContributor extends DiagramActionBarContributo
   /**
    * @generated
    */
+  @Override
   protected String getEditorId()
   {
     return AcoreDiagramEditor.ID;
@@ -42,6 +44,7 @@ public class AcoreDiagramActionBarContributor extends DiagramActionBarContributo
   /**
    * @generated
    */
+  @Override
   public void init(IActionBars bars, IWorkbenchPage page)
   {
     super.init(bars, page);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java
index 5dd90391b2..aecdd3056f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -82,6 +82,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   protected String getContextID()
   {
     return CONTEXT_ID;
@@ -90,6 +91,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot)
   {
     PaletteRoot root = super.createPaletteRoot(existingPaletteRoot);
@@ -100,6 +102,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   protected PreferencesHint getPreferencesHint()
   {
     return AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
@@ -108,6 +111,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   public String getContributorId()
   {
     return AcoreDiagramEditorPlugin.ID;
@@ -116,6 +120,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   public Object getAdapter(Class type)
   {
     if (type == IShowInTargetList.class)
@@ -134,6 +139,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   protected IDocumentProvider getDocumentProvider(IEditorInput input)
   {
     if (input instanceof IFileEditorInput || input instanceof URIEditorInput)
@@ -146,6 +152,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   public TransactionalEditingDomain getEditingDomain()
   {
     IDocument document = getEditorInput() != null ? getDocumentProvider().getDocument(getEditorInput()) : null;
@@ -159,6 +166,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   protected void setDocumentProvider(IEditorInput input)
   {
     if (input instanceof IFileEditorInput || input instanceof URIEditorInput)
@@ -182,6 +190,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   public boolean isSaveAsAllowed()
   {
     return true;
@@ -190,6 +199,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   public void doSaveAs()
   {
     performSaveAs(new NullProgressMonitor());
@@ -198,6 +208,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   protected void performSaveAs(IProgressMonitor progressMonitor)
   {
     Shell shell = getSite().getShell();
@@ -288,6 +299,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   public ShowInContext getShowInContext()
   {
     return new ShowInContext(getEditorInput(), getNavigatorSelection());
@@ -316,6 +328,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa
   /**
    * @generated
    */
+  @Override
   protected void configureGraphicalViewer()
   {
     super.configureGraphicalViewer();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java
index 3d378f4941..cf16b4c2ea 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -76,6 +76,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin
   /**
    * @generated
    */
+  @Override
   public void start(BundleContext context) throws Exception
   {
     super.start(context);
@@ -87,6 +88,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin
   /**
    * @generated
    */
+  @Override
   public void stop(BundleContext context) throws Exception
   {
     adapterFactory.dispose();
@@ -146,7 +148,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin
 
   /**
    * Returns an image descriptor for the image file at the given plug-in relative path.
-   * 
+   *
    * @generated
    * @param path
    *          the path
@@ -160,7 +162,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin
   /**
    * Respects images residing in any plug-in. If path is relative, then this bundle is looked up for the image,
    * otherwise, for absolute path, first segment is taken as id of plug-in with image
-   * 
+   *
    * @generated
    * @param path
    *          the path to image, either absolute (with plug-in id as first segment), or relative for bundled images
@@ -171,8 +173,8 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin
     final IPath p = new Path(path);
     if (p.isAbsolute() && p.segmentCount() > 1)
     {
-      return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p.removeFirstSegments(1).makeAbsolute()
-          .toString());
+      return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0),
+          p.removeFirstSegments(1).makeAbsolute().toString());
     }
     else
     {
@@ -183,7 +185,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin
   /**
    * Returns an image for the image file at the given plug-in relative path. Client do not need to dispose this image.
    * Images will be disposed automatically.
-   * 
+   *
    * @generated
    * @param path
    *          the path
@@ -202,7 +204,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin
 
   /**
    * Returns string from plug-in's resource bundle
-   * 
+   *
    * @generated
    */
   public static String getString(String key)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java
index a13f9d4812..06d3ac45c2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -151,7 +151,7 @@ public class AcoreDiagramEditorUtil
 
   /**
    * Runs the wizard in a dialog.
-   * 
+   *
    * @generated
    */
   public static void runWizard(Shell shell, Wizard wizard, String settingsKey)
@@ -171,7 +171,7 @@ public class AcoreDiagramEditorUtil
 
   /**
    * This method should be called within a workspace modify operation since it creates resources.
-   * 
+   *
    * @generated
    */
   public static Resource createDiagram(URI diagramURI, URI modelURI, IProgressMonitor progressMonitor)
@@ -184,6 +184,7 @@ public class AcoreDiagramEditorUtil
     AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain,
         Messages.AcoreDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST)
     {
+      @Override
       protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
       {
         ACoreRoot model = createInitialModel();
@@ -200,10 +201,10 @@ public class AcoreDiagramEditorUtil
 
         try
         {
-          modelResource.save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil
-              .getSaveOptions());
-          diagramResource.save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil
-              .getSaveOptions());
+          modelResource
+              .save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil.getSaveOptions());
+          diagramResource
+              .save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil.getSaveOptions());
         }
         catch (IOException e)
         {
@@ -228,7 +229,7 @@ public class AcoreDiagramEditorUtil
 
   /**
    * Create a new instance of domain element associated with canvas. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static ACoreRoot createInitialModel()
@@ -238,7 +239,7 @@ public class AcoreDiagramEditorUtil
 
   /**
    * Store model element in the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static void attachModelToResource(ACoreRoot model, Resource resource)
@@ -249,7 +250,7 @@ public class AcoreDiagramEditorUtil
   /**
    * @generated
    */
-  public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List/* EditPart */editParts)
+  public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List/* EditPart */ editParts)
   {
     diagramPart.getDiagramGraphicalViewer().deselectAll();
 
@@ -346,7 +347,7 @@ public class AcoreDiagramEditorUtil
       view = editPart.getModel() instanceof View ? (View)editPart.getModel() : null;
     }
 
-    return (view == null) ? diagramEditPart.getDiagramView() : view;
+    return view == null ? diagramEditPart.getDiagramView() : view;
   }
 
   /**
@@ -380,7 +381,7 @@ public class AcoreDiagramEditorUtil
     public LazyElement2ViewMap(View scope, Set elements)
     {
       this.scope = scope;
-      this.elementSet = elements;
+      elementSet = elements;
     }
 
     /**
@@ -416,33 +417,43 @@ public class AcoreDiagramEditorUtil
     static Map buildElement2ViewMap(View parentView, Map element2ViewMap, Set elements)
     {
       if (elements.size() == element2ViewMap.size())
+      {
         return element2ViewMap;
+      }
 
       if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement())
           && elements.contains(parentView.getElement()))
       {
         element2ViewMap.put(parentView.getElement(), parentView);
         if (elements.size() == element2ViewMap.size())
+        {
           return element2ViewMap;
+        }
       }
 
       for (Iterator it = parentView.getChildren().iterator(); it.hasNext();)
       {
         buildElement2ViewMap((View)it.next(), element2ViewMap, elements);
         if (elements.size() == element2ViewMap.size())
+        {
           return element2ViewMap;
+        }
       }
       for (Iterator it = parentView.getSourceEdges().iterator(); it.hasNext();)
       {
         buildElement2ViewMap((View)it.next(), element2ViewMap, elements);
         if (elements.size() == element2ViewMap.size())
+        {
           return element2ViewMap;
+        }
       }
       for (Iterator it = parentView.getSourceEdges().iterator(); it.hasNext();)
       {
         buildElement2ViewMap((View)it.next(), element2ViewMap, elements);
         if (elements.size() == element2ViewMap.size())
+        {
           return element2ViewMap;
+        }
       }
       return element2ViewMap;
     }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java
index e7b8493bf5..cea551110e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java
index 3b80513c74..3ae3f67d76 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -475,8 +475,8 @@ public class AcoreDiagramUpdater
   /**
    * @generated
    */
-  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_SubClasses_4001(
-      AClass target, Map crossReferences)
+  private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_SubClasses_4001(AClass target,
+      Map crossReferences)
   {
     LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>();
     Collection settings = (Collection)crossReferences.get(target);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java
index a17f48fce0..648134da84 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -75,14 +75,16 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected ElementInfo createElementInfo(Object element) throws CoreException
   {
     if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput)
     {
-      throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, NLS.bind(
-          Messages.AcoreDocumentProvider_IncorrectInputError, new Object[] { element,
-              "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-          null));
+      throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
+          NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
+              new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
+                  "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
+              null));
     }
     IEditorInput editorInput = (IEditorInput)element;
     IDiagramDocument document = (IDiagramDocument)createDocument(editorInput);
@@ -96,14 +98,16 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected IDocument createDocument(Object element) throws CoreException
   {
     if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput)
     {
-      throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, NLS.bind(
-          Messages.AcoreDocumentProvider_IncorrectInputError, new Object[] { element,
-              "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-          null));
+      throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
+          NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
+              new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
+                  "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
+              null));
     }
     IDocument document = createEmptyDocument();
     setDocumentContent(document, (IEditorInput)element);
@@ -114,7 +118,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * Sets up the given document as it would be provided for the given element. The content of the document is not
    * changed. This default implementation is empty. Subclasses may reimplement.
-   * 
+   *
    * @param element
    *          the blue-print element
    * @param document
@@ -154,6 +158,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected IDocument createEmptyDocument()
   {
     DiagramDocument document = new DiagramDocument();
@@ -253,7 +258,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           EObject rootElement = resource.getEObject(uri.fragment());
           if (rootElement instanceof Diagram)
           {
-            document.setContent((Diagram)rootElement);
+            document.setContent(rootElement);
             return;
           }
         }
@@ -264,7 +269,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
             Object rootElement = it.next();
             if (rootElement instanceof Diagram)
             {
-              document.setContent((Diagram)rootElement);
+              document.setContent(rootElement);
               return;
             }
           }
@@ -281,24 +286,26 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
         else
         {
           String msg = e.getLocalizedMessage();
-          thrownExcp = new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, msg != null ? msg
-              : Messages.AcoreDocumentProvider_DiagramLoadingError, e));
+          thrownExcp = new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
+              msg != null ? msg : Messages.AcoreDocumentProvider_DiagramLoadingError, e));
         }
         throw thrownExcp;
       }
     }
     else
     {
-      throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, NLS.bind(
-          Messages.AcoreDocumentProvider_IncorrectInputError, new Object[] { element,
-              "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-          null));
+      throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
+          NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
+              new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
+                  "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
+              null));
     }
   }
 
   /**
    * @generated
    */
+  @Override
   public long getModificationStamp(Object element)
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -312,6 +319,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   public boolean isDeleted(Object element)
   {
     IDiagramDocument document = getDiagramDocument(element);
@@ -338,6 +346,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected void disposeElementInfo(Object element, ElementInfo info)
   {
     if (info instanceof ResourceSetInfo)
@@ -351,6 +360,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected void doValidateState(Object element, Object computationContext) throws CoreException
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -366,7 +376,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           files2Validate.add(file);
         }
       }
-      ResourcesPlugin.getWorkspace().validateEdit((IFile[])files2Validate.toArray(new IFile[files2Validate.size()]),
+      ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]),
           computationContext);
     }
 
@@ -376,6 +386,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   public boolean isReadOnly(Object element)
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -402,6 +413,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   public boolean isModifiable(Object element)
   {
     if (!isStateValidated(element))
@@ -460,6 +472,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected void doUpdateStateCache(Object element) throws CoreException
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -473,6 +486,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   public boolean isSynchronized(Object element)
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -486,6 +500,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected ISchedulingRule getResetRule(Object element)
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -501,7 +516,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file));
         }
       }
-      return new MultiRule((ISchedulingRule[])rules.toArray(new ISchedulingRule[rules.size()]));
+      return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()]));
     }
     return null;
   }
@@ -509,6 +524,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected ISchedulingRule getSaveRule(Object element)
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -524,7 +540,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           rules.add(computeSchedulingRule(file));
         }
       }
-      return new MultiRule((ISchedulingRule[])rules.toArray(new ISchedulingRule[rules.size()]));
+      return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()]));
     }
     return null;
   }
@@ -532,6 +548,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected ISchedulingRule getSynchronizeRule(Object element)
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -547,7 +564,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file));
         }
       }
-      return new MultiRule((ISchedulingRule[])rules.toArray(new ISchedulingRule[rules.size()]));
+      return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()]));
     }
     return null;
   }
@@ -555,6 +572,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected ISchedulingRule getValidateStateRule(Object element)
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -570,8 +588,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           files.add(file);
         }
       }
-      return ResourcesPlugin.getWorkspace().getRuleFactory()
-          .validateEditRule((IFile[])files.toArray(new IFile[files.size()]));
+      return ResourcesPlugin.getWorkspace().getRuleFactory().validateEditRule(files.toArray(new IFile[files.size()]));
     }
     return null;
   }
@@ -582,7 +599,9 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify)
   {
     if (toCreateOrModify.exists())
+    {
       return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify);
+    }
 
     IResource parent = toCreateOrModify;
     do
@@ -601,6 +620,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException
   {
     ResourceSetInfo info = getResourceSetInfo(element);
@@ -619,6 +639,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite)
       throws CoreException
   {
@@ -685,29 +706,30 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
       else
       {
         fireElementStateChangeFailed(element);
-        throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, NLS.bind(
-            Messages.AcoreDocumentProvider_IncorrectInputError, new Object[] { element,
-                "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-            null));
+        throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
+            NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError,
+                new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$
+                    "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$
+                null));
       }
       if (false == document instanceof IDiagramDocument)
       {
         fireElementStateChangeFailed(element);
         throw new CoreException(
-            new Status(
-                IStatus.ERROR,
-                AcoreDiagramEditorPlugin.ID,
-                0,
-                "Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$
+            new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0,
+                "Incorrect document used: " + document //$NON-NLS-1$
+                    + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", //$NON-NLS-1$
+                null));
       }
       IDiagramDocument diagramDocument = (IDiagramDocument)document;
       final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI);
-      final Diagram diagramCopy = (Diagram)EcoreUtil.copy(diagramDocument.getDiagram());
+      final Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram());
       try
       {
-        new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind(
-            Messages.AcoreDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles)
+        new AbstractTransactionalCommand(diagramDocument.getEditingDomain(),
+            NLS.bind(Messages.AcoreDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles)
         {
+          @Override
           protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
               throws ExecutionException
           {
@@ -813,6 +835,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
   /**
    * @generated
    */
+  @Override
   protected IRunnableContext getOperationRunner(IProgressMonitor monitor)
   {
     return null;
@@ -1056,7 +1079,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
         {
           if (ResourceSetInfo.this.fCanBeSaved)
           {
-            ResourceSetInfo.this.setUnSynchronized(resource);
+            setUnSynchronized(resource);
             return true;
           }
         }
@@ -1079,7 +1102,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
         {
           if (ResourceSetInfo.this.fCanBeSaved)
           {
-            ResourceSetInfo.this.setUnSynchronized(resource);
+            setUnSynchronized(resource);
             return true;
           }
         }
@@ -1087,7 +1110,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
         {
           public void run()
           {
-            fireElementDeleted(ResourceSetInfo.this.getEditorInput());
+            fireElementDeleted(getEditorInput());
           }
         });
         return true;
@@ -1102,7 +1125,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
         {
           if (ResourceSetInfo.this.fCanBeSaved)
           {
-            ResourceSetInfo.this.setUnSynchronized(resource);
+            setUnSynchronized(resource);
             return true;
           }
         }
@@ -1112,7 +1135,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           {
             public void run()
             {
-              handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI);
+              handleElementMoved(getEditorInput(), newURI);
             }
           });
         }
@@ -1157,6 +1180,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
     /**
      * @generated
      */
+    @Override
     public void notifyChanged(Notification notification)
     {
       if (notification.getNotifier() instanceof ResourceSet)
@@ -1171,7 +1195,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I
           if (resource.isLoaded())
           {
             boolean modified = false;
-            for (Iterator/* <org.eclipse.emf.ecore.resource.Resource> */it = myInfo.getLoadedResourcesIterator(); it
+            for (Iterator /* <org.eclipse.emf.ecore.resource.Resource> */it = myInfo.getLoadedResourcesIterator(); it
                 .hasNext() && !modified;)
             {
               Resource nextResource = (Resource)it.next();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java
index 6a4d53978f..d825f60381 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -91,7 +91,7 @@ public class AcoreInitDiagramFileAction implements IObjectActionDelegate
     try
     {
       Resource resource = resourceSet.getResource(domainModelURI, true);
-      diagramRoot = (EObject)resource.getContents().get(0);
+      diagramRoot = resource.getContents().get(0);
     }
     catch (WrappedException ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java
index 97c63af576..257860a120 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -78,6 +78,7 @@ public class AcoreLinkDescriptor extends AcoreNodeDescriptor
     final IElementType elementTypeCopy = elementType;
     mySemanticAdapter = new EObjectAdapter(linkElement)
     {
+      @Override
       public Object getAdapter(Class adapter)
       {
         if (IElementType.class.equals(adapter))
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreMatchingStrategy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreMatchingStrategy.java
index 79a0a20c73..4dbfa645d6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreMatchingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreMatchingStrategy.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java
index 9d880d6885..50d8d7c564 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -76,8 +76,8 @@ public class AcoreNewDiagramFileWizard extends Wizard
     myFileCreationPage = new WizardNewFileCreationPage(Messages.AcoreNewDiagramFileWizard_CreationPageName,
         StructuredSelection.EMPTY);
     myFileCreationPage.setTitle(Messages.AcoreNewDiagramFileWizard_CreationPageTitle);
-    myFileCreationPage.setDescription(NLS.bind(Messages.AcoreNewDiagramFileWizard_CreationPageDescription,
-        ACoreRootEditPart.MODEL_ID));
+    myFileCreationPage.setDescription(
+        NLS.bind(Messages.AcoreNewDiagramFileWizard_CreationPageDescription, ACoreRootEditPart.MODEL_ID));
     IPath filePath;
     String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());
     if (domainModelURI.isPlatformResource())
@@ -108,6 +108,7 @@ public class AcoreNewDiagramFileWizard extends Wizard
   /**
    * @generated
    */
+  @Override
   public void addPages()
   {
     addPage(myFileCreationPage);
@@ -117,6 +118,7 @@ public class AcoreNewDiagramFileWizard extends Wizard
   /**
    * @generated
    */
+  @Override
   public boolean performFinish()
   {
     List affectedFiles = new LinkedList();
@@ -130,6 +132,7 @@ public class AcoreNewDiagramFileWizard extends Wizard
         Messages.AcoreNewDiagramFileWizard_InitDiagramCommand, affectedFiles)
     {
 
+      @Override
       protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
       {
         int diagramVID = AcoreVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());
@@ -181,6 +184,7 @@ public class AcoreNewDiagramFileWizard extends Wizard
     /**
      * @generated
      */
+    @Override
     protected String getSelectionTitle()
     {
       return Messages.AcoreNewDiagramFileWizard_RootSelectionPageSelectionTitle;
@@ -189,6 +193,7 @@ public class AcoreNewDiagramFileWizard extends Wizard
     /**
      * @generated
      */
+    @Override
     protected boolean validatePage()
     {
       if (selectedModelElement == null)
@@ -196,8 +201,8 @@ public class AcoreNewDiagramFileWizard extends Wizard
         setErrorMessage(Messages.AcoreNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);
         return false;
       }
-      boolean result = ViewService.getInstance().provides(
-          new CreateDiagramViewOperation(new EObjectAdapter(selectedModelElement), ACoreRootEditPart.MODEL_ID,
+      boolean result = ViewService.getInstance()
+          .provides(new CreateDiagramViewOperation(new EObjectAdapter(selectedModelElement), ACoreRootEditPart.MODEL_ID,
               AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));
       setErrorMessage(result ? null : Messages.AcoreNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage);
       return result;
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNodeDescriptor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNodeDescriptor.java
index eb8ef719a5..1911b6f6bd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNodeDescriptor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNodeDescriptor.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java
index b7ef0ba495..0704d1dd14 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -43,7 +43,7 @@ public class AcorePaletteFactory
 
   /**
    * Creates "Node" palette tool group
-   * 
+   *
    * @generated
    */
   private PaletteContainer createNode1Group()
@@ -59,7 +59,7 @@ public class AcorePaletteFactory
 
   /**
    * Creates "Connections" palette tool group
-   * 
+   *
    * @generated
    */
   private PaletteContainer createConnections2Group()
@@ -231,6 +231,7 @@ public class AcorePaletteFactory
     /**
      * @generated
      */
+    @Override
     public Tool createTool()
     {
       Tool tool = new UnspecifiedTypeCreationTool(elementTypes);
@@ -262,6 +263,7 @@ public class AcorePaletteFactory
     /**
      * @generated
      */
+    @Override
     public Tool createTool()
     {
       Tool tool = new UnspecifiedTypeConnectionTool(relationshipTypes);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreUriEditorInputTester.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreUriEditorInputTester.java
index 9282b85566..7a04e15f9a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreUriEditorInputTester.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreUriEditorInputTester.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java
index eb29c78d77..43408a832e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -37,7 +37,7 @@ import org.eclipse.gmf.runtime.notation.View;
 /**
  * This registry is used to determine which type of visual object should be created for the corresponding Diagram, Node,
  * ChildNode or Link represented by a domain model object.
- * 
+ *
  * @generated
  */
 public class AcoreVisualIDRegistry
@@ -78,7 +78,7 @@ public class AcoreVisualIDRegistry
       EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
       if (annotation != null)
       {
-        return (String)annotation.getDetails().get("modelID"); //$NON-NLS-1$
+        return annotation.getDetails().get("modelID"); //$NON-NLS-1$
       }
       view = (View)view.eContainer();
     }
@@ -311,7 +311,7 @@ public class AcoreVisualIDRegistry
 
   /**
    * User can change implementation of this method to handle some specific situations not covered by default logic.
-   * 
+   *
    * @generated
    */
   private static boolean isDiagram(ACoreRoot element)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DeleteElementAction.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DeleteElementAction.java
index ff9775eeb7..a46008cc69 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DeleteElementAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DeleteElementAction.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -54,6 +54,7 @@ public class DeleteElementAction extends AbstractDeleteFromAction
   /**
    * @generated
    */
+  @Override
   public void init()
   {
     super.init();
@@ -69,6 +70,7 @@ public class DeleteElementAction extends AbstractDeleteFromAction
   /**
    * @generated
    */
+  @Override
   protected String getCommandLabel()
   {
     return DiagramUIMessages.DiagramEditor_Delete_from_Model;
@@ -77,6 +79,7 @@ public class DeleteElementAction extends AbstractDeleteFromAction
   /**
    * @generated
    */
+  @Override
   protected Command getCommand(Request request)
   {
     List operationSet = getOperationSet();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DiagramEditorContextMenuProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DiagramEditorContextMenuProvider.java
index 255a3100f4..334c9e21dd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DiagramEditorContextMenuProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -51,6 +51,7 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider
   /**
    * @generated
    */
+  @Override
   public void dispose()
   {
     if (deleteAction != null)
@@ -64,6 +65,7 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider
   /**
    * @generated
    */
+  @Override
   public void buildContextMenu(final IMenuManager menu)
   {
     getViewer().flush();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/LoadResourceAction.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/LoadResourceAction.java
index 13f3646328..795bcbf766 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/LoadResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/LoadResourceAction.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/Messages.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/Messages.java
index fad8630a25..17bebd7dec 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/Messages.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java
index 80086c301c..8299c9a80f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part;
 
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Label;
 
 /**
  * Wizard page that allows to select element from model.
- * 
+ *
  * @generated
  */
 public class ModelElementSelectionPage extends WizardPage
@@ -106,10 +106,10 @@ public class ModelElementSelectionPage extends WizardPage
     layoutData.heightHint = 300;
     layoutData.widthHint = 300;
     modelViewer.getTree().setLayoutData(layoutData);
-    modelViewer.setContentProvider(new AdapterFactoryContentProvider(AcoreDiagramEditorPlugin.getInstance()
-        .getItemProvidersAdapterFactory()));
-    modelViewer.setLabelProvider(new AdapterFactoryLabelProvider(AcoreDiagramEditorPlugin.getInstance()
-        .getItemProvidersAdapterFactory()));
+    modelViewer.setContentProvider(
+        new AdapterFactoryContentProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()));
+    modelViewer.setLabelProvider(
+        new AdapterFactoryLabelProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()));
     if (selectedModelElement != null)
     {
       modelViewer.setInput(selectedModelElement.eResource());
@@ -128,7 +128,7 @@ public class ModelElementSelectionPage extends WizardPage
 
   /**
    * Override to provide custom model element description.
-   * 
+   *
    * @generated
    */
   protected String getSelectionTitle()
@@ -163,7 +163,7 @@ public class ModelElementSelectionPage extends WizardPage
 
   /**
    * Override to provide specific validation of the selected model element.
-   * 
+   *
    * @generated
    */
   protected boolean validatePage()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramAppearancePreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramAppearancePreferencePage.java
index f93dfa0fc0..fff01e9259 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramAppearancePreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramAppearancePreferencePage.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramConnectionsPreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramConnectionsPreferencePage.java
index f082cf459d..95406a7985 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramConnectionsPreferencePage.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramGeneralPreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramGeneralPreferencePage.java
index a6c24d35f3..0505f22022 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramGeneralPreferencePage.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPreferenceInitializer.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPreferenceInitializer.java
index 177cf75cdd..d23a2b2ebf 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPreferenceInitializer.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;
 
@@ -25,6 +25,7 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer
   /**
    * @generated
    */
+  @Override
   public void initializeDefaultPreferences()
   {
     IPreferenceStore store = getPreferenceStore();
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPrintingPreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPrintingPreferencePage.java
index 6fe58d5649..84250dcb65 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPrintingPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPrintingPreferencePage.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramRulersAndGridPreferencePage.java
index c112dc3d04..c22f5028ac 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramRulersAndGridPreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramRulersAndGridPreferencePage.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreEditPartProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreEditPartProvider.java
index e25008b0d1..6c1e34f6ff 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreEditPartProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreEditPartProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;
 
@@ -126,6 +126,7 @@ public class AcoreEditPartProvider extends AbstractEditPartProvider
   /**
    * @generated
    */
+  @Override
   public synchronized IGraphicalEditPart createGraphicEditPart(View view)
   {
     if (isAllowCaching())
@@ -144,6 +145,7 @@ public class AcoreEditPartProvider extends AbstractEditPartProvider
   /**
    * @generated
    */
+  @Override
   public synchronized boolean provides(IOperation operation)
   {
     if (operation instanceof CreateGraphicEditPartOperation)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java
index f1252b43aa..82b57d1a3c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;
 
@@ -74,62 +74,74 @@ public class AcoreElementTypes extends ElementInitializers
   /**
    * @generated
    */
-  public static final IElementType ACoreRoot_1000 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.ACoreRoot_1000"); //$NON-NLS-1$
+  public static final IElementType ACoreRoot_1000 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.ACoreRoot_1000"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AInterface_2001 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AInterface_2001"); //$NON-NLS-1$
+  public static final IElementType AInterface_2001 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AInterface_2001"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClass_2002 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClass_2002"); //$NON-NLS-1$
+  public static final IElementType AClass_2002 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClass_2002"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AAttribute_3001 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3001"); //$NON-NLS-1$
+  public static final IElementType AAttribute_3001 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3001"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AOperation_3002 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3002"); //$NON-NLS-1$
+  public static final IElementType AOperation_3002 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3002"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AAttribute_3003 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3003"); //$NON-NLS-1$
+  public static final IElementType AAttribute_3003 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3003"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AOperation_3004 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3004"); //$NON-NLS-1$
+  public static final IElementType AOperation_3004 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3004"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClassSubClasses_4001 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassSubClasses_4001"); //$NON-NLS-1$
+  public static final IElementType AClassSubClasses_4001 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassSubClasses_4001"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClassImplementedInterfaces_4002 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassImplementedInterfaces_4002"); //$NON-NLS-1$
+  public static final IElementType AClassImplementedInterfaces_4002 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassImplementedInterfaces_4002"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClassAssociations_4003 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAssociations_4003"); //$NON-NLS-1$
+  public static final IElementType AClassAssociations_4003 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAssociations_4003"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClassAggregations_4004 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAggregations_4004"); //$NON-NLS-1$
+  public static final IElementType AClassAggregations_4004 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAggregations_4004"); //$NON-NLS-1$
 
   /**
    * @generated
    */
-  public static final IElementType AClassCompositions_4005 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassCompositions_4005"); //$NON-NLS-1$
+  public static final IElementType AClassCompositions_4005 = getElementType(
+      "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassCompositions_4005"); //$NON-NLS-1$
 
   /**
    * @generated
@@ -158,7 +170,7 @@ public class AcoreElementTypes extends ElementInitializers
   {
     if (element instanceof EStructuralFeature)
     {
-      EStructuralFeature feature = ((EStructuralFeature)element);
+      EStructuralFeature feature = (EStructuralFeature)element;
       EClass eContainingClass = feature.getEContainingClass();
       EClassifier eType = feature.getEType();
       if (eContainingClass != null && !eContainingClass.isAbstract())
@@ -175,8 +187,8 @@ public class AcoreElementTypes extends ElementInitializers
       EClass eClass = (EClass)element;
       if (!eClass.isAbstract())
       {
-        return AcoreDiagramEditorPlugin.getInstance().getItemImageDescriptor(
-            eClass.getEPackage().getEFactoryInstance().create(eClass));
+        return AcoreDiagramEditorPlugin.getInstance()
+            .getItemImageDescriptor(eClass.getEPackage().getEFactoryInstance().create(eClass));
       }
     }
     // TODO : support structural features
@@ -250,7 +262,7 @@ public class AcoreElementTypes extends ElementInitializers
 
   /**
    * Returns 'type' of the ecore object associated with the hint.
-   * 
+   *
    * @generated
    */
   public static ENamedElement getElement(IAdaptable hint)
@@ -284,7 +296,7 @@ public class AcoreElementTypes extends ElementInitializers
 
       elements.put(AClassCompositions_4005, AcorePackage.eINSTANCE.getAClass_Compositions());
     }
-    return (ENamedElement)elements.get(type);
+    return elements.get(type);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreIconProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreIconProvider.java
index fd0c8092b0..1afab629f0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreIconProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreIconProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java
index a62c86a976..f18539b95c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;
 
@@ -48,9 +48,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   /**
    * @generated
    */
+  @Override
   public List getTypesForPopupBar(IAdaptable host)
   {
-    IGraphicalEditPart editPart = (IGraphicalEditPart)host.getAdapter(IGraphicalEditPart.class);
+    IGraphicalEditPart editPart = host.getAdapter(IGraphicalEditPart.class);
     if (editPart instanceof ACoreRootEditPart)
     {
       ArrayList<IElementType> types = new ArrayList<IElementType>(2);
@@ -78,9 +79,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   /**
    * @generated
    */
+  @Override
   public List getRelTypesOnSource(IAdaptable source)
   {
-    IGraphicalEditPart sourceEditPart = (IGraphicalEditPart)source.getAdapter(IGraphicalEditPart.class);
+    IGraphicalEditPart sourceEditPart = source.getAdapter(IGraphicalEditPart.class);
     if (sourceEditPart instanceof AClassEditPart)
     {
       return ((AClassEditPart)sourceEditPart).getMARelTypesOnSource();
@@ -91,9 +93,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   /**
    * @generated
    */
+  @Override
   public List getRelTypesOnTarget(IAdaptable target)
   {
-    IGraphicalEditPart targetEditPart = (IGraphicalEditPart)target.getAdapter(IGraphicalEditPart.class);
+    IGraphicalEditPart targetEditPart = target.getAdapter(IGraphicalEditPart.class);
     if (targetEditPart instanceof AInterfaceEditPart)
     {
       return ((AInterfaceEditPart)targetEditPart).getMARelTypesOnTarget();
@@ -108,10 +111,11 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   /**
    * @generated
    */
+  @Override
   public List getRelTypesOnSourceAndTarget(IAdaptable source, IAdaptable target)
   {
-    IGraphicalEditPart sourceEditPart = (IGraphicalEditPart)source.getAdapter(IGraphicalEditPart.class);
-    IGraphicalEditPart targetEditPart = (IGraphicalEditPart)target.getAdapter(IGraphicalEditPart.class);
+    IGraphicalEditPart sourceEditPart = source.getAdapter(IGraphicalEditPart.class);
+    IGraphicalEditPart targetEditPart = target.getAdapter(IGraphicalEditPart.class);
     if (sourceEditPart instanceof AClassEditPart)
     {
       return ((AClassEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);
@@ -122,9 +126,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   /**
    * @generated
    */
+  @Override
   public List getTypesForSource(IAdaptable target, IElementType relationshipType)
   {
-    IGraphicalEditPart targetEditPart = (IGraphicalEditPart)target.getAdapter(IGraphicalEditPart.class);
+    IGraphicalEditPart targetEditPart = target.getAdapter(IGraphicalEditPart.class);
     if (targetEditPart instanceof AInterfaceEditPart)
     {
       return ((AInterfaceEditPart)targetEditPart).getMATypesForSource(relationshipType);
@@ -139,9 +144,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   /**
    * @generated
    */
+  @Override
   public List getTypesForTarget(IAdaptable source, IElementType relationshipType)
   {
-    IGraphicalEditPart sourceEditPart = (IGraphicalEditPart)source.getAdapter(IGraphicalEditPart.class);
+    IGraphicalEditPart sourceEditPart = source.getAdapter(IGraphicalEditPart.class);
     if (sourceEditPart instanceof AClassEditPart)
     {
       return ((AClassEditPart)sourceEditPart).getMATypesForTarget(relationshipType);
@@ -152,6 +158,7 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   /**
    * @generated
    */
+  @Override
   public EObject selectExistingElementForSource(IAdaptable target, IElementType relationshipType)
   {
     return selectExistingElement(target, getTypesForSource(target, relationshipType));
@@ -160,6 +167,7 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   /**
    * @generated
    */
+  @Override
   public EObject selectExistingElementForTarget(IAdaptable source, IElementType relationshipType)
   {
     return selectExistingElement(source, getTypesForTarget(source, relationshipType));
@@ -174,7 +182,7 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
     {
       return null;
     }
-    IGraphicalEditPart editPart = (IGraphicalEditPart)host.getAdapter(IGraphicalEditPart.class);
+    IGraphicalEditPart editPart = host.getAdapter(IGraphicalEditPart.class);
     if (editPart == null)
     {
       return null;
@@ -193,7 +201,7 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
     {
       return null;
     }
-    return selectElement((EObject[])elements.toArray(new EObject[elements.size()]));
+    return selectElement(elements.toArray(new EObject[elements.size()]));
   }
 
   /**
@@ -211,8 +219,8 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider
   protected EObject selectElement(EObject[] elements)
   {
     Shell shell = Display.getCurrent().getActiveShell();
-    ILabelProvider labelProvider = new AdapterFactoryLabelProvider(AcoreDiagramEditorPlugin.getInstance()
-        .getItemProvidersAdapterFactory());
+    ILabelProvider labelProvider = new AdapterFactoryLabelProvider(
+        AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
     ElementListSelectionDialog dialog = new ElementListSelectionDialog(shell, labelProvider);
     dialog.setMessage(Messages.AcoreModelingAssistantProviderMessage);
     dialog.setTitle(Messages.AcoreModelingAssistantProviderTitle);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java
index ff71c631df..979701e6ae 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;
 
@@ -196,7 +196,7 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv
 
   /**
    * Utility method that consults ParserService
-   * 
+   *
    * @generated
    */
   public static IParser getParser(IElementType type, EObject object, String parserHint)
@@ -209,12 +209,12 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv
    */
   public IParser getParser(IAdaptable hint)
   {
-    String vid = (String)hint.getAdapter(String.class);
+    String vid = hint.getAdapter(String.class);
     if (vid != null)
     {
       return getParser(AcoreVisualIDRegistry.getVisualID(vid));
     }
-    View view = (View)hint.getAdapter(View.class);
+    View view = hint.getAdapter(View.class);
     if (view != null)
     {
       return getParser(AcoreVisualIDRegistry.getVisualID(view));
@@ -263,6 +263,7 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv
     /**
      * @generated
      */
+    @Override
     public Object getAdapter(Class adapter)
     {
       if (IElementType.class.equals(adapter))
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java
index 9c42191c2d..fb9f815f78 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;
 
@@ -154,7 +154,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
       visualID = AcoreVisualIDRegistry.getVisualID(op.getSemanticHint());
       if (elementType != null)
       {
-        if (!AcoreElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType)))
+        if (!AcoreElementTypes.isKnownElementType(elementType) || !(elementType instanceof IHintedType))
         {
           return false; // foreign element type
         }
@@ -184,7 +184,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
         case AAttribute2EditPart.VISUAL_ID:
         case AOperation2EditPart.VISUAL_ID:
           if (domainElement == null
-              || visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))
+          || visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))
           {
             return false; // visual id in semantic hint should match visual id for domain element
           }
@@ -205,12 +205,12 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
   protected boolean provides(CreateEdgeViewOperation op)
   {
     IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-    if (!AcoreElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType)))
+    if (!AcoreElementTypes.isKnownElementType(elementType) || !(elementType instanceof IHintedType))
     {
       return false; // foreign element type
     }
     String elementTypeHint = ((IHintedType)elementType).getSemanticHint();
-    if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint())))
+    if (elementTypeHint == null || op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))
     {
       return false; // our hint is visual id and must be specified, and it should be the same as in element type
     }
@@ -314,8 +314,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializeFromPreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter
-        .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
+        IPreferenceConstants.PREF_LINE_COLOR);
     ViewUtil.setStructuralFeatureValue(node, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
         FigureUtilities.RGBToInteger(lineRGB));
     FontStyle nodeFontStyle = (FontStyle)node.getStyle(NotationPackage.Literals.FONT_STYLE);
@@ -356,8 +356,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializeFromPreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter
-        .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
+        IPreferenceConstants.PREF_LINE_COLOR);
     ViewUtil.setStructuralFeatureValue(node, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
         FigureUtilities.RGBToInteger(lineRGB));
     FontStyle nodeFontStyle = (FontStyle)node.getStyle(NotationPackage.Literals.FONT_STYLE);
@@ -456,8 +456,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter
-        .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
+        IPreferenceConstants.PREF_LINE_COLOR);
     ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
         FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
@@ -500,8 +500,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter
-        .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
+        IPreferenceConstants.PREF_LINE_COLOR);
     ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
         FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
@@ -544,8 +544,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter
-        .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
+        IPreferenceConstants.PREF_LINE_COLOR);
     ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
         FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
@@ -588,8 +588,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter
-        .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
+        IPreferenceConstants.PREF_LINE_COLOR);
     ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
         FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
@@ -632,8 +632,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     // initializePreferences
     final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();
 
-    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter
-        .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR);
+    org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore,
+        IPreferenceConstants.PREF_LINE_COLOR);
     ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(),
         FigureUtilities.RGBToInteger(lineRGB));
     FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE);
@@ -727,7 +727,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     {
       return null;
     }
-    EObject eObject = (EObject)semanticAdapter.getAdapter(EObject.class);
+    EObject eObject = semanticAdapter.getAdapter(EObject.class);
     if (eObject != null)
     {
       return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);
@@ -744,6 +744,6 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider
     {
       return null;
     }
-    return (IElementType)semanticAdapter.getAdapter(IElementType.class);
+    return semanticAdapter.getAdapter(IElementType.class);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/ElementInitializers.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/ElementInitializers.java
index 0f9906de30..2d7e119c58 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/ElementInitializers.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/ElementInitializers.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcorePropertySection.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcorePropertySection.java
index c691200338..7905c549bb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcorePropertySection.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcorePropertySection.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;
 
@@ -57,7 +57,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr
     }
     if (object instanceof IAdaptable)
     {
-      return (IPropertySource)((IAdaptable)object).getAdapter(IPropertySource.class);
+      return ((IAdaptable)object).getAdapter(IPropertySource.class);
     }
     return null;
   }
@@ -65,6 +65,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr
   /**
    * @generated
    */
+  @Override
   protected IPropertySourceProvider getPropertySourceProvider()
   {
     return this;
@@ -72,7 +73,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr
 
   /**
    * Modify/unwrap selection.
-   * 
+   *
    * @generated
    */
   protected Object transformSelection(Object selected)
@@ -89,7 +90,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr
     }
     if (selected instanceof IAdaptable)
     {
-      View view = (View)((IAdaptable)selected).getAdapter(View.class);
+      View view = ((IAdaptable)selected).getAdapter(View.class);
       if (view != null)
       {
         return view.getElement();
@@ -101,6 +102,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr
   /**
    * @generated
    */
+  @Override
   public void setInput(IWorkbenchPart part, ISelection selection)
   {
     if (selection.isEmpty() || false == selection instanceof StructuredSelection)
@@ -108,7 +110,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr
       super.setInput(part, selection);
       return;
     }
-    final StructuredSelection structuredSelection = ((StructuredSelection)selection);
+    final StructuredSelection structuredSelection = (StructuredSelection)selection;
     ArrayList transformedSelection = new ArrayList(structuredSelection.size());
     for (Iterator it = structuredSelection.iterator(); it.hasNext();)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcoreSheetLabelProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcoreSheetLabelProvider.java
index f169780a15..e3a3f47806 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcoreSheetLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcoreSheetLabelProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet;
 
@@ -75,7 +75,7 @@ public class AcoreSheetLabelProvider extends BaseLabelProvider implements ILabel
     }
     if (element instanceof IAdaptable)
     {
-      return (View)((IAdaptable)element).getAdapter(View.class);
+      return ((IAdaptable)element).getAdapter(View.class);
     }
     return null;
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF
index 4a7d771c4a..fa50101356 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.edit;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.provider.AcoreEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java
index d116a71ff7..2adda49996 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AAttributeItemProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -28,15 +28,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AAttribute} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AAttributeItemProvider extends AClassChildItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AAttributeItemProvider(AdapterFactory adapterFactory)
@@ -46,7 +46,7 @@ public class AAttributeItemProvider extends AClassChildItemProvider implements I
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -62,7 +62,7 @@ public class AAttributeItemProvider extends AClassChildItemProvider implements I
 
   /**
    * This returns AAttribute.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,21 +73,21 @@ public class AAttributeItemProvider extends AClassChildItemProvider implements I
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
   public String getText(Object object)
   {
     String label = ((AAttribute)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AAttribute_type") : getString("_UI_AAttribute_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AAttribute_type")
+        : getString("_UI_AAttribute_type") + " " + label;
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -100,7 +100,7 @@ public class AAttributeItemProvider extends AClassChildItemProvider implements I
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java
index f6be02a1d0..8223c3a7fd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ABasicClassItemProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ABasicClassItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ABasicClassItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,17 +71,17 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_ABasicClass_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_ABasicClass_name_feature", "_UI_ABasicClass_type"),
-        AcorePackage.Literals.ABASIC_CLASS__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_ABasicClass_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_ABasicClass_name_feature", "_UI_ABasicClass_type"),
+            AcorePackage.Literals.ABASIC_CLASS__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -89,7 +89,7 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -106,7 +106,7 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -120,7 +120,7 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This returns ABasicClass.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -131,21 +131,21 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
   public String getText(Object object)
   {
     String label = ((ABasicClass)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_ABasicClass_type") : getString("_UI_ABasicClass_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_ABasicClass_type")
+        : getString("_UI_ABasicClass_type") + " " + label;
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -169,7 +169,7 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -186,7 +186,7 @@ public class ABasicClassItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java
index 4dfc5d5fcb..47d23694f1 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassChildItemProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -34,15 +34,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AClassChildItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AClassChildItemProvider(AdapterFactory adapterFactory)
@@ -52,7 +52,7 @@ public class AClassChildItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,52 +71,55 @@ public class AClassChildItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AClassChild_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_name_feature", "_UI_AClassChild_type"),
-        AcorePackage.Literals.ACLASS_CHILD__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_AClassChild_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_name_feature", "_UI_AClassChild_type"),
+            AcorePackage.Literals.ACLASS_CHILD__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This adds a property descriptor for the Accessright feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addAccessrightPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AClassChild_accessright_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_accessright_feature", "_UI_AClassChild_type"),
-        AcorePackage.Literals.ACLASS_CHILD__ACCESSRIGHT, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_AClassChild_accessright_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_accessright_feature",
+                "_UI_AClassChild_type"),
+            AcorePackage.Literals.ACLASS_CHILD__ACCESSRIGHT, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
    * This adds a property descriptor for the Data Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addDataTypePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AClassChild_dataType_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_dataType_feature", "_UI_AClassChild_type"),
-        AcorePackage.Literals.ACLASS_CHILD__DATA_TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_AClassChild_dataType_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_AClassChild_dataType_feature",
+                    "_UI_AClassChild_type"),
+                AcorePackage.Literals.ACLASS_CHILD__DATA_TYPE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
    * This returns AClassChild.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -127,21 +130,21 @@ public class AClassChildItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
   public String getText(Object object)
   {
     String label = ((AClassChild)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AClassChild_type") : getString("_UI_AClassChild_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AClassChild_type")
+        : getString("_UI_AClassChild_type") + " " + label;
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -163,7 +166,7 @@ public class AClassChildItemProvider extends ItemProviderAdapter implements IEdi
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -174,7 +177,7 @@ public class AClassChildItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java
index 096e2f66d4..55c54d067a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AClassItemProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -30,15 +30,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AClass} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AClassItemProvider extends ABasicClassItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AClassItemProvider(AdapterFactory adapterFactory)
@@ -48,7 +48,7 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -69,78 +69,79 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
 
   /**
    * This adds a property descriptor for the Sub Classes feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addSubClassesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AClass_subClasses_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AClass_subClasses_feature", "_UI_AClass_type"),
-        AcorePackage.Literals.ACLASS__SUB_CLASSES, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_AClass_subClasses_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_AClass_subClasses_feature", "_UI_AClass_type"),
+            AcorePackage.Literals.ACLASS__SUB_CLASSES, true, false, true, null, null, null));
   }
 
   /**
    * This adds a property descriptor for the Implemented Interfaces feature. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   protected void addImplementedInterfacesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AClass_implementedInterfaces_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AClass_implementedInterfaces_feature", "_UI_AClass_type"),
-        AcorePackage.Literals.ACLASS__IMPLEMENTED_INTERFACES, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_AClass_implementedInterfaces_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_AClass_implementedInterfaces_feature",
+                "_UI_AClass_type"),
+            AcorePackage.Literals.ACLASS__IMPLEMENTED_INTERFACES, true, false, true, null, null, null));
   }
 
   /**
    * This adds a property descriptor for the Associations feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addAssociationsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AClass_associations_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AClass_associations_feature", "_UI_AClass_type"),
-        AcorePackage.Literals.ACLASS__ASSOCIATIONS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_AClass_associations_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_AClass_associations_feature", "_UI_AClass_type"),
+            AcorePackage.Literals.ACLASS__ASSOCIATIONS, true, false, true, null, null, null));
   }
 
   /**
    * This adds a property descriptor for the Compositions feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addCompositionsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AClass_compositions_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AClass_compositions_feature", "_UI_AClass_type"),
-        AcorePackage.Literals.ACLASS__COMPOSITIONS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_AClass_compositions_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_AClass_compositions_feature", "_UI_AClass_type"),
+            AcorePackage.Literals.ACLASS__COMPOSITIONS, true, false, true, null, null, null));
   }
 
   /**
    * This adds a property descriptor for the Aggregations feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addAggregationsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AClass_aggregations_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AClass_aggregations_feature", "_UI_AClass_type"),
-        AcorePackage.Literals.ACLASS__AGGREGATIONS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_AClass_aggregations_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_AClass_aggregations_feature", "_UI_AClass_type"),
+            AcorePackage.Literals.ACLASS__AGGREGATIONS, true, false, true, null, null, null));
   }
 
   /**
    * This returns AClass.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -151,21 +152,21 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
   public String getText(Object object)
   {
     String label = ((AClass)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AClass_type") : getString("_UI_AClass_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_AClass_type")
+        : getString("_UI_AClass_type") + " " + label;
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -178,7 +179,7 @@ public class AClassItemProvider extends ABasicClassItemProvider implements IEdit
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java
index 0036c4ee0f..5db86750b5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/ACoreRootItemProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ACoreRootItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,17 +71,17 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
 
   /**
    * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_ACoreRoot_title_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_ACoreRoot_title_feature", "_UI_ACoreRoot_type"),
-        AcorePackage.Literals.ACORE_ROOT__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_ACoreRoot_title_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_ACoreRoot_title_feature", "_UI_ACoreRoot_type"),
+            AcorePackage.Literals.ACORE_ROOT__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -89,7 +89,7 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -106,7 +106,7 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -120,7 +120,7 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
 
   /**
    * This returns ACoreRoot.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -131,21 +131,21 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
   public String getText(Object object)
   {
     String label = ((ACoreRoot)object).getTitle();
-    return label == null || label.length() == 0 ? getString("_UI_ACoreRoot_type") : getString("_UI_ACoreRoot_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_ACoreRoot_type")
+        : getString("_UI_ACoreRoot_type") + " " + label;
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -169,7 +169,7 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -177,16 +177,16 @@ public class ACoreRootItemProvider extends ItemProviderAdapter implements IEditi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.ACORE_ROOT__CLASSES,
-        AcoreFactory.eINSTANCE.createAClass()));
+    newChildDescriptors
+        .add(createChildParameter(AcorePackage.Literals.ACORE_ROOT__CLASSES, AcoreFactory.eINSTANCE.createAClass()));
 
-    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.ACORE_ROOT__INTERFACES,
-        AcoreFactory.eINSTANCE.createAInterface()));
+    newChildDescriptors.add(
+        createChildParameter(AcorePackage.Literals.ACORE_ROOT__INTERFACES, AcoreFactory.eINSTANCE.createAInterface()));
   }
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java
index 256ffd5f96..e89f57ad2e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AInterfaceItemProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -28,15 +28,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AInterface} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AInterfaceItemProvider extends ABasicClassItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AInterfaceItemProvider(AdapterFactory adapterFactory)
@@ -46,7 +46,7 @@ public class AInterfaceItemProvider extends ABasicClassItemProvider implements I
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -62,7 +62,7 @@ public class AInterfaceItemProvider extends ABasicClassItemProvider implements I
 
   /**
    * This returns AInterface.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,21 +73,21 @@ public class AInterfaceItemProvider extends ABasicClassItemProvider implements I
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
   public String getText(Object object)
   {
     String label = ((AInterface)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AInterface_type") : getString("_UI_AInterface_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AInterface_type")
+        : getString("_UI_AInterface_type") + " " + label;
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -100,7 +100,7 @@ public class AInterfaceItemProvider extends ABasicClassItemProvider implements I
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java
index 27b182bccb..4b772608fc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AOperationItemProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -32,15 +32,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AOperation} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AOperationItemProvider extends AClassChildItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AOperationItemProvider(AdapterFactory adapterFactory)
@@ -50,7 +50,7 @@ public class AOperationItemProvider extends AClassChildItemProvider implements I
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -69,7 +69,7 @@ public class AOperationItemProvider extends AClassChildItemProvider implements I
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -85,7 +85,7 @@ public class AOperationItemProvider extends AClassChildItemProvider implements I
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -99,7 +99,7 @@ public class AOperationItemProvider extends AClassChildItemProvider implements I
 
   /**
    * This returns AOperation.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -110,21 +110,21 @@ public class AOperationItemProvider extends AClassChildItemProvider implements I
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
   public String getText(Object object)
   {
     String label = ((AOperation)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AOperation_type") : getString("_UI_AOperation_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AOperation_type")
+        : getString("_UI_AOperation_type") + " " + label;
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -144,7 +144,7 @@ public class AOperationItemProvider extends AClassChildItemProvider implements I
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -152,8 +152,8 @@ public class AOperationItemProvider extends AClassChildItemProvider implements I
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(AcorePackage.Literals.AOPERATION__PARAMETERS,
-        AcoreFactory.eINSTANCE.createAParameter()));
+    newChildDescriptors.add(
+        createChildParameter(AcorePackage.Literals.AOPERATION__PARAMETERS, AcoreFactory.eINSTANCE.createAParameter()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java
index e1f3ed18b0..2c3209f5c4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AParameterItemProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -34,15 +34,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AParameterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AParameterItemProvider(AdapterFactory adapterFactory)
@@ -52,7 +52,7 @@ public class AParameterItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -70,37 +70,37 @@ public class AParameterItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AParameter_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AParameter_name_feature", "_UI_AParameter_type"),
-        AcorePackage.Literals.APARAMETER__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_AParameter_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_AParameter_name_feature", "_UI_AParameter_type"),
+            AcorePackage.Literals.APARAMETER__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addTypePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_AParameter_type_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_AParameter_type_feature", "_UI_AParameter_type"),
-        AcorePackage.Literals.APARAMETER__TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_AParameter_type_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_AParameter_type_feature", "_UI_AParameter_type"),
+            AcorePackage.Literals.APARAMETER__TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This returns AParameter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -111,21 +111,21 @@ public class AParameterItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
   public String getText(Object object)
   {
     String label = ((AParameter)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_AParameter_type") : getString("_UI_AParameter_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_AParameter_type")
+        : getString("_UI_AParameter_type") + " " + label;
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -146,7 +146,7 @@ public class AParameterItemProvider extends ItemProviderAdapter implements IEdit
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -157,7 +157,7 @@ public class AParameterItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreEditPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreEditPlugin.java
index efa79d4543..7a059f5efd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreEditPlugin.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -16,28 +16,28 @@ import org.eclipse.emf.common.util.ResourceLocator;
 
 /**
  * This is the central singleton for the Acore edit plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public final class AcoreEditPlugin extends EMFPlugin
 {
   /**
    * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static final AcoreEditPlugin INSTANCE = new AcoreEditPlugin();
 
   /**
    * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static Implementation plugin;
 
   /**
    * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcoreEditPlugin()
@@ -47,7 +47,7 @@ public final class AcoreEditPlugin extends EMFPlugin
 
   /**
    * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the singleton instance.
    * @generated
    */
@@ -59,7 +59,7 @@ public final class AcoreEditPlugin extends EMFPlugin
 
   /**
    * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the singleton instance.
    * @generated
    */
@@ -70,14 +70,14 @@ public final class AcoreEditPlugin extends EMFPlugin
 
   /**
    * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static class Implementation extends EclipsePlugin
   {
     /**
      * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public Implementation()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreItemProviderAdapterFactory.java
index 2c8f038e4d..798077b580 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.edit/src/org/eclipse/emf/cdo/dawn/examples/acore/provider/AcoreItemProviderAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.provider;
 
@@ -36,16 +36,16 @@ import java.util.Collection;
  * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable
+public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ComposedAdapterFactory parentAdapterFactory;
@@ -53,7 +53,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -61,14 +61,14 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
   /**
    * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcoreItemProviderAdapterFactory()
@@ -83,7 +83,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.dawn.examples.acore.AClass} instances.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AClassItemProvider aClassItemProvider;
@@ -91,7 +91,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This creates an adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AClass}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -108,7 +108,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.dawn.examples.acore.AInterface}
    * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AInterfaceItemProvider aInterfaceItemProvider;
@@ -116,7 +116,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This creates an adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AInterface}. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -133,7 +133,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot}
    * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ACoreRootItemProvider aCoreRootItemProvider;
@@ -141,7 +141,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This creates an adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot}. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -158,7 +158,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.dawn.examples.acore.AAttribute}
    * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AAttributeItemProvider aAttributeItemProvider;
@@ -166,7 +166,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This creates an adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AAttribute}. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -183,7 +183,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.dawn.examples.acore.AOperation}
    * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AOperationItemProvider aOperationItemProvider;
@@ -191,7 +191,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This creates an adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AOperation}. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -208,7 +208,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass}
    * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ABasicClassItemProvider aBasicClassItemProvider;
@@ -216,7 +216,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This creates an adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass}. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -233,7 +233,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter}
    * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AParameterItemProvider aParameterItemProvider;
@@ -241,7 +241,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This creates an adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter}. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -258,7 +258,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild}
    * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AClassChildItemProvider aClassChildItemProvider;
@@ -266,7 +266,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This creates an adapter for a {@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild}. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -282,7 +282,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
 
   /**
    * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ComposeableAdapterFactory getRootAdapterFactory()
@@ -292,7 +292,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
 
   /**
    * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
@@ -302,7 +302,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -314,7 +314,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -325,7 +325,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -334,7 +334,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
       {
         return adapter;
       }
@@ -345,7 +345,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
 
   /**
    * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void addListener(INotifyChangedListener notifyChangedListener)
@@ -355,7 +355,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
 
   /**
    * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void removeListener(INotifyChangedListener notifyChangedListener)
@@ -366,7 +366,7 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
   /**
    * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void fireNotifyChanged(Notification notification)
@@ -381,27 +381,43 @@ public class AcoreItemProviderAdapterFactory extends AcoreAdapterFactory impleme
 
   /**
    * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void dispose()
   {
     if (aClassItemProvider != null)
+    {
       aClassItemProvider.dispose();
+    }
     if (aInterfaceItemProvider != null)
+    {
       aInterfaceItemProvider.dispose();
+    }
     if (aCoreRootItemProvider != null)
+    {
       aCoreRootItemProvider.dispose();
+    }
     if (aAttributeItemProvider != null)
+    {
       aAttributeItemProvider.dispose();
+    }
     if (aOperationItemProvider != null)
+    {
       aOperationItemProvider.dispose();
+    }
     if (aBasicClassItemProvider != null)
+    {
       aBasicClassItemProvider.dispose();
+    }
     if (aParameterItemProvider != null)
+    {
       aParameterItemProvider.dispose();
+    }
     if (aClassChildItemProvider != null)
+    {
       aClassChildItemProvider.dispose();
+    }
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF
index a380fb884b..7095266b08 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-Localization: fragment
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
index 8c42088b9c..e5a067cffa 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreEditor.java
@@ -4,11 +4,11 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  *     Christian W. Damus (CEA) - bug 399933 NPE in editor when finishing Ecore wizard
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.presentation;
 
@@ -34,7 +34,7 @@ import org.eclipse.ui.IEditorInput;
 
 /**
  * This is an example of a Acore model editor. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
@@ -101,13 +101,13 @@ public class DawnAcoreEditor extends AcoreEditor implements IDawnEditor
     selectionViewer.setContentProvider(new DawnSelectionViewerAdapterFactoryContentProvider(adapterFactory,
         ((DawnEditorInput)getEditorInput()).getResource()));
     selectionViewer
-        .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
+    .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     parentViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     listViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     treeViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
     tableViewer.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
-    treeViewerWithColumns.setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(),
-        selectionViewer));
+    treeViewerWithColumns
+        .setLabelProvider(new DawnLabelProvider(adapterFactory, dawnEditorSupport.getView(), selectionViewer));
 
     CDOResource resource = ((DawnEditorInput)getEditorInput()).getResource();
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreModelWizard.java
index 84f16ee3e1..3790be79fc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/DawnAcoreModelWizard.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.presentation;
 
@@ -63,8 +63,8 @@ public class DawnAcoreModelWizard extends AcoreModelWizard implements INewWizard
 
     initialObjectCreationPage = new AcoreModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreModelWizard_label"));
-    initialObjectCreationPage.setDescription(AcoreEditorPlugin.INSTANCE
-        .getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage
+        .setDescription(AcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/META-INF/MANIFEST.MF
index 40a9a33a98..6e60f22599 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.editor;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.dawn.examples.acore.presentation.AcoreEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreActionBarContributor.java
index 2ef5436d28..7962e82f6e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreActionBarContributor.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.presentation;
 
@@ -46,28 +46,28 @@ import java.util.Collection;
 
 /**
  * This is the action bar contributor for the Acore model editor. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AcoreActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IEditorPart activeEditorPart;
 
   /**
    * This keeps track of the current selection provider. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ISelectionProvider selectionProvider;
 
   /**
    * This action opens the Properties view. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IAction showPropertiesViewAction = new Action(
@@ -90,7 +90,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
   /**
    * This action refreshes the viewer of the current editor if the editor implements
    * {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IAction refreshViewerAction = new Action(
@@ -119,7 +119,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
   /**
    * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
    * generated for the current selection by the item provider. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<IAction> createChildActions;
@@ -127,7 +127,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
   /**
    * This is the menu manager into which menu contribution items should be added for CreateChild actions. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IMenuManager createChildMenuManager;
@@ -135,7 +135,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
   /**
    * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
    * generated for the current selection by the item provider. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<IAction> createSiblingActions;
@@ -143,14 +143,14 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
   /**
    * This is the menu manager into which menu contribution items should be added for CreateSibling actions. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IMenuManager createSiblingMenuManager;
 
   /**
    * This creates an instance of the contributor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcoreActionBarContributor()
@@ -163,7 +163,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
 
   /**
    * This adds Separators for editor additions to the tool bar. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -176,7 +176,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
   /**
    * This adds to the menu bar a menu and some separators for editor additions, as well as the sub-menus for object
    * creation items. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -218,7 +218,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
   /**
    * When the active editor changes, this remembers the change and registers with it as a selection provider. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -255,7 +255,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
    * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, handling
    * {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings that can be
    * added to the selected object and updating the menus accordingly. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void selectionChanged(SelectionChangedEvent event)
@@ -308,7 +308,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
    * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in
    * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection)
@@ -328,7 +328,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
    * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in
    * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection)
@@ -349,7 +349,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
    * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection, by
    * inserting them before the specified contribution item <code>contributionID</code>. If <code>contributionID</code>
    * is <code>null</code>, they are simply added. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
@@ -375,7 +375,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
    * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
    * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions)
@@ -409,7 +409,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
 
   /**
    * This populates the pop-up menu before it appears. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -429,7 +429,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
 
   /**
    * This inserts global actions before the "additions-end" separator. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -447,7 +447,7 @@ public class AcoreActionBarContributor extends EditingDomainActionBarContributor
   /**
    * This ensures that a delete action will clean up all references to deleted objects. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java
index cd87c361a4..852514178a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditor.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.presentation;
 
@@ -131,16 +131,16 @@ import java.util.Map;
 
 /**
  * This is an example of a Acore model editor. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker
+public class AcoreEditor extends MultiPageEditorPart
+    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AdapterFactoryEditingDomain editingDomain;
@@ -148,35 +148,35 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This is the one adapter factory used for providing views of the model. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   protected ComposedAdapterFactory adapterFactory;
 
   /**
    * This is the content outline page. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IContentOutlinePage contentOutlinePage;
 
   /**
    * This is a kludge... <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IStatusLineManager contentOutlineStatusLineManager;
 
   /**
    * This is the content outline page's viewer. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TreeViewer contentOutlineViewer;
 
   /**
    * This is the property sheet page. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected PropertySheetPage propertySheetPage;
@@ -184,7 +184,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This is the viewer that shadows the selection in the content outline. The parent relation must be correctly defined
    * for this to work. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TreeViewer selectionViewer;
@@ -192,14 +192,14 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This inverts the roll of parent and child in the content provider and show parents as a tree. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TreeViewer parentViewer;
 
   /**
    * This shows how a tree view works. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TreeViewer treeViewer;
@@ -207,7 +207,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This shows how a list view works. A list viewer doesn't support icons. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   protected ListViewer listViewer;
@@ -215,21 +215,21 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This shows how a table view works. A table can be used as a list with icons. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TableViewer tableViewer;
 
   /**
    * This shows how a tree view with columns works. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TreeViewer treeViewerWithColumns;
 
   /**
    * This keeps track of the active viewer pane, in the book. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ViewerPane currentViewerPane;
@@ -237,14 +237,14 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content
    * outline viewer. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Viewer currentViewer;
 
   /**
    * This listens to which ever viewer is active. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ISelectionChangedListener selectionChangedListener;
@@ -252,14 +252,14 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this
    * editor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
 
   /**
    * This keeps track of the selection of the editor as a whole. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -267,14 +267,14 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * The MarkerHelper is responsible for creating workspace resource markers presented in Eclipse's Problems View. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected MarkerHelper markerHelper = new EditUIMarkerHelper();
 
   /**
    * This listens for when the outline becomes active <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IPartListener partListener = new IPartListener()
@@ -327,35 +327,35 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * Resources that have been removed since last activation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
   /**
    * Resources that have been changed since last activation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Resource> changedResources = new ArrayList<Resource>();
 
   /**
    * Resources that have been saved. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Resource> savedResources = new ArrayList<Resource>();
 
   /**
    * Map to store the diagnostic associated with a resource. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
 
   /**
    * Controls whether the problem indication should be updated. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected boolean updateProblemIndication = true;
@@ -363,7 +363,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * Adapter used to update the problem indication when resources are demanded loaded. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected EContentAdapter problemIndicationAdapter = new EContentAdapter()
@@ -425,7 +425,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This listens for workspace changes. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener()
@@ -447,11 +447,11 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED
-                  && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED
+                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet.getResource(
-                    URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet
+                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -522,7 +522,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * Handles activation of the editor or it's associated views. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void handleActivate()
@@ -562,7 +562,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * Handles what to do with changed resources on activation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void handleChangedResources()
@@ -608,7 +608,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * Updates the problems indication with the information described in the specified diagnostic. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void updateProblemIndication()
@@ -672,7 +672,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * Shows a dialog that asks if conflicting changes should be discarded. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected boolean handleDirtyConflict()
@@ -683,7 +683,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This creates a model editor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcoreEditor()
@@ -694,7 +694,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This sets up the editing domain for the model editor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void initializeEditingDomain()
@@ -746,7 +746,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This is here for the listener to be able to call it. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -757,7 +757,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This sets the selection into whichever viewer is active. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setSelectionToViewer(Collection<?> collection)
@@ -787,7 +787,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
    * This returns the editing domain as required by the {@link IEditingDomainProvider} interface. This is important for
    * implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting
    * {@link org.eclipse.emf.edit.ui.action.CommandAction}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EditingDomain getEditingDomain()
@@ -797,14 +797,14 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider
   {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory)
@@ -814,7 +814,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -826,7 +826,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -838,7 +838,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -850,7 +850,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -862,7 +862,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setCurrentViewerPane(ViewerPane viewerPane)
@@ -881,7 +881,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This makes sure that one content viewer, either for the current page or the outline view, if it has focus, is the
    * current one. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setCurrentViewer(Viewer viewer)
@@ -932,7 +932,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This returns the viewer as required by the {@link IViewerProvider} interface. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Viewer getViewer()
@@ -943,7 +943,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void createContextMenuFor(StructuredViewer viewer)
@@ -965,7 +965,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void createModel()
@@ -996,7 +996,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * Returns a diagnostic describing the errors and warnings listed in the resource and the specified exception (if
    * any). <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Diagnostic analyzeResourceProblems(Resource resource, Exception exception)
@@ -1004,15 +1004,16 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
       BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
-          "org.eclipse.emf.cdo.dawn.examples.acore.editor", 0, getString("_UI_CreateModelError_message",
-              resource.getURI()), new Object[] { exception == null ? (Object)resource : exception });
+          "org.eclipse.emf.cdo.dawn.examples.acore.editor", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()),
+          new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
     else if (exception != null)
     {
-      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.dawn.examples.acore.editor", 0, getString(
-          "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
+      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.dawn.examples.acore.editor", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
     }
     else
     {
@@ -1023,7 +1024,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This is the method used by the framework to install your own controls. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -1297,7 +1298,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * If there is just one page in the multi-page editor part, this hides the single tab at the bottom. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void hideTabs()
@@ -1317,7 +1318,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * If there is more than one page in the multi-page editor part, this shows the tabs at the bottom. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void showTabs()
@@ -1336,7 +1337,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This is used to track the active viewer. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -1352,7 +1353,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This is how the framework determines which interfaces we implement. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("rawtypes")
@@ -1379,7 +1380,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This accesses a cached version of the content outliner. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public IContentOutlinePage getContentOutlinePage()
@@ -1411,8 +1412,8 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources()
-                .get(0)), true);
+            contentOutlineViewer
+                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
@@ -1452,7 +1453,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This accesses a cached version of the property sheet. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public IPropertySheetPage getPropertySheetPage()
@@ -1484,7 +1485,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This deals with how we want selection in the outliner to affect the other views. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void handleContentOutlineSelection(ISelection selection)
@@ -1530,7 +1531,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This is for implementing {@link IEditorPart} and simply tests the command stack. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -1542,7 +1543,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This is for implementing {@link IEditorPart} and simply saves the model file. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -1615,7 +1616,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
    * This returns whether something has been persisted to the URI of the specified resource. The implementation uses the
    * URI converter from the editor's resource set to try to open an input stream. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected boolean isPersisted(Resource resource)
@@ -1639,7 +1640,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This always returns true because it is not currently supported. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -1650,7 +1651,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This also changes the editor's input. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -1671,22 +1672,22 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void doSaveAs(URI uri, IEditorInput editorInput)
   {
-    (editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+    editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
-        .getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-    doSave(progressMonitor);
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
+        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+        doSave(progressMonitor);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void gotoMarker(IMarker marker)
@@ -1715,7 +1716,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This is called during startup. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -1731,7 +1732,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -1749,7 +1750,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void addSelectionChangedListener(ISelectionChangedListener listener)
@@ -1759,7 +1760,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void removeSelectionChangedListener(ISelectionChangedListener listener)
@@ -1770,7 +1771,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ISelection getSelection()
@@ -1781,7 +1782,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
    * Calling this result will notify the listeners. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setSelection(ISelection selection)
@@ -1797,13 +1798,13 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
-        : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
@@ -1839,7 +1840,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This looks up a string in the plugin's plugin.properties file. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static String getString(String key)
@@ -1849,7 +1850,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * This looks up a string in plugin.properties, making a substitution. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static String getString(String key, Object s1)
@@ -1860,7 +1861,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
   /**
    * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions
    * from the Edit menu. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void menuAboutToShow(IMenuManager menuManager)
@@ -1870,7 +1871,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EditingDomainActionBarContributor getActionBarContributor()
@@ -1880,7 +1881,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public IActionBars getActionBars()
@@ -1890,7 +1891,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AdapterFactory getAdapterFactory()
@@ -1900,7 +1901,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -1934,7 +1935,7 @@ public class AcoreEditor extends MultiPageEditorPart implements IEditingDomainPr
 
   /**
    * Returns whether the outline view should be presented to the user. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected boolean showOutlineView()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditorPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditorPlugin.java
index 627a3ca77c..02181e1ea4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditorPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreEditorPlugin.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.presentation;
 
@@ -17,28 +17,28 @@ import org.eclipse.emf.common.util.ResourceLocator;
 
 /**
  * This is the central singleton for the Acore editor plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public final class AcoreEditorPlugin extends EMFPlugin
 {
   /**
    * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static final AcoreEditorPlugin INSTANCE = new AcoreEditorPlugin();
 
   /**
    * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static Implementation plugin;
 
   /**
    * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcoreEditorPlugin()
@@ -48,7 +48,7 @@ public final class AcoreEditorPlugin extends EMFPlugin
 
   /**
    * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the singleton instance.
    * @generated
    */
@@ -60,7 +60,7 @@ public final class AcoreEditorPlugin extends EMFPlugin
 
   /**
    * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the singleton instance.
    * @generated
    */
@@ -71,14 +71,14 @@ public final class AcoreEditorPlugin extends EMFPlugin
 
   /**
    * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static class Implementation extends EclipseUIPlugin
   {
     /**
      * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public Implementation()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreModelWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreModelWizard.java
index 669fa3b37a..2cab7ea105 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.editor/src/org/eclipse/emf/cdo/dawn/examples/acore/presentation/AcoreModelWizard.java
@@ -71,51 +71,51 @@ import java.util.StringTokenizer;
 
 /**
  * This is a simple wizard for creating a new model file. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AcoreModelWizard extends Wizard implements INewWizard
 {
   /**
    * The supported extensions for created files. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays
-      .asList(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreEditorFilenameExtensions").split("\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(
+      Arrays.asList(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = AcoreEditorPlugin.INSTANCE.getString(
-      "_UI_AcoreEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = AcoreEditorPlugin.INSTANCE
+      .getString("_UI_AcoreEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
 
   /**
    * This caches an instance of the model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AcorePackage acorePackage = AcorePackage.eINSTANCE;
 
   /**
    * This caches an instance of the model factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AcoreFactory acoreFactory = acorePackage.getAcoreFactory();
 
   /**
    * This is the file creation page. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AcoreModelWizardNewFileCreationPage newFileCreationPage;
 
   /**
    * This is the initial object creation page. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AcoreModelWizardInitialObjectCreationPage initialObjectCreationPage;
@@ -123,28 +123,28 @@ public class AcoreModelWizard extends Wizard implements INewWizard
   /**
    * Remember the selection during initialization for populating the default container. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IStructuredSelection selection;
 
   /**
    * Remember the workbench during initialization. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IWorkbench workbench;
 
   /**
    * Caches the names of the types that can be created as the root object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected List<String> initialObjectNames;
 
   /**
    * This just records the information. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void init(IWorkbench workbench, IStructuredSelection selection)
@@ -152,14 +152,14 @@ public class AcoreModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(AcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(AcoreEditorPlugin.INSTANCE
-        .getImage("full/wizban/NewAcore")));
+    setDefaultPageImageDescriptor(
+        ExtendedImageRegistry.INSTANCE.getImageDescriptor(AcoreEditorPlugin.INSTANCE.getImage("full/wizban/NewAcore")));
   }
 
   /**
    * Returns the names of the types that can be created as the root object. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   protected Collection<String> getInitialObjectNames()
@@ -185,7 +185,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
   /**
    * Create a new model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected EObject createInitialModel()
@@ -197,7 +197,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
   /**
    * Do the work after everything is specified. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -299,14 +299,14 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
   /**
    * This is the one page of the wizard. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public class AcoreModelWizardNewFileCreationPage extends WizardNewFileCreationPage
   {
     /**
      * Pass in the selection. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public AcoreModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection)
@@ -316,7 +316,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * The framework calls this to see if the file is correct. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -338,7 +338,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public IFile getModelFile()
@@ -349,14 +349,14 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
   /**
    * This is the page where the type of object to create is selected. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public class AcoreModelWizardInitialObjectCreationPage extends WizardPage
   {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected Combo initialObjectField;
@@ -368,14 +368,14 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected Combo encodingField;
 
     /**
      * Pass in the selection. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public AcoreModelWizardInitialObjectCreationPage(String pageId)
@@ -385,7 +385,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated NOT
      */
     public void createControl(Composite parent)
@@ -469,7 +469,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ModifyListener validator = new ModifyListener()
@@ -482,7 +482,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected boolean validatePage()
@@ -492,7 +492,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -516,7 +516,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public String getInitialObjectName()
@@ -535,7 +535,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public String getEncoding()
@@ -545,7 +545,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * Returns the label for the specified type name. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected String getLabel(String typeName)
@@ -563,7 +563,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected Collection<String> getEncodings()
@@ -583,7 +583,7 @@ public class AcoreModelWizard extends Wizard implements INewWizard
 
   /**
    * The framework calls this to create the contents of the wizard. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -594,8 +594,8 @@ public class AcoreModelWizard extends Wizard implements INewWizard
     newFileCreationPage = new AcoreModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreModelWizard_label"));
     newFileCreationPage.setDescription(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreModelWizard_description"));
-    newFileCreationPage.setFileName(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreEditorFilenameDefaultBase") + "."
-        + FILE_EXTENSIONS.get(0));
+    newFileCreationPage.setFileName(
+        AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -638,14 +638,14 @@ public class AcoreModelWizard extends Wizard implements INewWizard
     }
     initialObjectCreationPage = new AcoreModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(AcoreEditorPlugin.INSTANCE.getString("_UI_AcoreModelWizard_label"));
-    initialObjectCreationPage.setDescription(AcoreEditorPlugin.INSTANCE
-        .getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage
+        .setDescription(AcoreEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
   /**
    * Get the file from the page. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public IFile getModelFile()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/META-INF/MANIFEST.MF
index 0fb5dd9696..85788023af 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-Localization: fragment
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.emf.cdo.dawn.examples.acore.graphiti
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.cdo.dawn.graphiti;bundle-version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn;version="1.0.200"
+Export-Package: org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn;version="1.0.300"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/dawn/DawnAcoreGraphitiDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/dawn/DawnAcoreGraphitiDiagramEditor.java
index da31f7e6ac..89772d4fe8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/dawn/DawnAcoreGraphitiDiagramEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti.dawn/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/dawn/DawnAcoreGraphitiDiagramEditor.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/Activator.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/Activator.java
index e1d07a03b5..7a02fa12a4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/Activator.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java
index 3b9e7259c1..36e7596fb5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreDiagramTypeProvider.java
@@ -51,7 +51,7 @@ public class AcoreDiagramTypeProvider extends AbstractDiagramTypeProvider
   public void init(Diagram diagram, IDiagramBehavior diagramEditor)
   {
     super.init(diagram, diagramEditor);
-    DawnGraphitiAcoreResourceUtil.wireDomainModel(diagram, diagram.eResource().getResourceSet(), getDiagramBehavior()
-        .getEditingDomain());
+    DawnGraphitiAcoreResourceUtil.wireDomainModel(diagram, diagram.eResource().getResourceSet(),
+        getDiagramBehavior().getEditingDomain());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreFeatureProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreFeatureProvider.java
index a0eec279d9..c07a4380f9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreFeatureProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreFeatureProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreToolBehaviorProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreToolBehaviorProvider.java
index 146d99e468..7ceefd29a6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreToolBehaviorProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/diagram/AcoreToolBehaviorProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.diagram;
 
@@ -113,8 +113,8 @@ public class AcoreToolBehaviorProvider extends DefaultToolBehaviorProvider
   // {
   // // create a sub-menu for all custom features
   // ContextMenuEntry subMenu = new ContextMenuEntry(null, context);
-  //    subMenu.setText("Cu&stom"); //$NON-NLS-1$
-  //    subMenu.setDescription("Custom features submenu"); //$NON-NLS-1$
+  // subMenu.setText("Cu&stom"); //$NON-NLS-1$
+  // subMenu.setDescription("Custom features submenu"); //$NON-NLS-1$
   // // display sub-menu hierarchical or flat
   // subMenu.setSubmenu(true);
   //
@@ -147,11 +147,11 @@ public class AcoreToolBehaviorProvider extends DefaultToolBehaviorProvider
   // }
   //
   // // add new compartment at the end of the existing compartments
-  //    PaletteCompartmentEntry compartmentEntry = new PaletteCompartmentEntry("Stacked", null); //$NON-NLS-1$
+  // PaletteCompartmentEntry compartmentEntry = new PaletteCompartmentEntry("Stacked", null); //$NON-NLS-1$
   // ret.add(compartmentEntry);
   //
   // // add new stack entry to new compartment
-  //    StackEntry stackEntry = new StackEntry("EObject", "EObject", null); //$NON-NLS-1$ //$NON-NLS-2$
+  // StackEntry stackEntry = new StackEntry("EObject", "EObject", null); //$NON-NLS-1$ //$NON-NLS-2$
   // compartmentEntry.addToolEntry(stackEntry);
   //
   // // add all create-features to the new stack-entry
@@ -204,7 +204,7 @@ public class AcoreToolBehaviorProvider extends DefaultToolBehaviorProvider
   // if (name != null && name.length() > 0 && !(name.charAt(0) >= 'A' && name.charAt(0) <= 'Z'))
   // {
   // IDecorator imageRenderingDecorator = new ImageDecorator(IPlatformImageConstants.IMG_ECLIPSE_WARNING_TSK);
-  //        imageRenderingDecorator.setMessage("Name should start with upper case letter"); //$NON-NLS-1$
+  // imageRenderingDecorator.setMessage("Name should start with upper case letter"); //$NON-NLS-1$
   // return new IDecorator[] { imageRenderingDecorator };
   // }
   // }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAClassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAClassFeature.java
index e520fda8d8..8c32b65090 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAClassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAClassFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAInterfaceFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAInterfaceFeature.java
index d08deacaaa..842bea8a0a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAInterfaceFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAInterfaceFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAggregationFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAggregationFeature.java
index 09adbe8126..80ba79e0de 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAggregationFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAggregationFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAssociationFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAssociationFeature.java
index 6a240e7bf3..f899796b56 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAssociationFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddAssociationFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddCompositionFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddCompositionFeature.java
index a3122939c0..02c18650a6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddCompositionFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddCompositionFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddImplementationFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddImplementationFeature.java
index 47d62da64e..2535f1204e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddImplementationFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddImplementationFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddSubClassesFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddSubClassesFeature.java
index 60b87b7b84..9487d25774 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddSubClassesFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreAddSubClassesFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddConnectionFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddConnectionFeature.java
index 1ede3a6c1b..49fe7555d2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddConnectionFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddConnectionFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddElementFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddElementFeature.java
index 70818d03d3..9e198c2367 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddElementFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicAddElementFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicCreateConnectionFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicCreateConnectionFeature.java
index 8713e1f912..b46aaf1f15 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicCreateConnectionFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicCreateConnectionFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicCreateElementFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicCreateElementFeature.java
index 1ec81de360..8694fcb729 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicCreateElementFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreBasicCreateElementFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCollapseDummyFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCollapseDummyFeature.java
index 42370a6f88..691d2bb2ec 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCollapseDummyFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCollapseDummyFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
@@ -76,7 +76,7 @@ public class AcoreCollapseDummyFeature extends AbstractCustomFeature
 
   public void execute(ICustomContext context)
   {
-    MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "Information",//$NON-NLS-1$
+    MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "Information", //$NON-NLS-1$
         "The 'Collapse Feature' is intentionally not implemented yet."); //$NON-NLS-1$
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCopyAClassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCopyAClassFeature.java
index 1e0445b811..5c0ed901b7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCopyAClassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCopyAClassFeature.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAClassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAClassFeature.java
index c809caa324..d09f71c5d4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAClassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAClassFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAInterfaceFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAInterfaceFeature.java
index 9e6a200084..cef9ea9f71 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAInterfaceFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAInterfaceFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAggregationFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAggregationFeature.java
index 8d96bfe6cb..c9b2db6b7c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAggregationFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAggregationFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAssociationFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAssociationFeature.java
index 52aadbca49..74fbd824d6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAssociationFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateAssociationFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateCompositionsFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateCompositionsFeature.java
index 4f8917a957..171a64854f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateCompositionsFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateCompositionsFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateImplementationFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateImplementationFeature.java
index 7e09571e41..ffdd23b8c7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateImplementationFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateImplementationFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateSubclassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateSubclassFeature.java
index 151a6eeb04..12effaf1f0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateSubclassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreCreateSubclassFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreDirectEditAClassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreDirectEditAClassFeature.java
index 46d537672a..8e367bbdee 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreDirectEditAClassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreDirectEditAClassFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcorePasteAClassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcorePasteAClassFeature.java
index 48f2daaf19..2db7c6132d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcorePasteAClassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcorePasteAClassFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreReconnectionFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreReconnectionFeature.java
index 3defcacb58..8c43d5bf72 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreReconnectionFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreReconnectionFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreRenameAClassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreRenameAClassFeature.java
index b150a95d59..bdbd794a62 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreRenameAClassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreRenameAClassFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreUpdateAClassFeature.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreUpdateAClassFeature.java
index 5048164911..5bc603a849 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreUpdateAClassFeature.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/features/AcoreUpdateAClassFeature.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.features;
 
@@ -69,8 +69,8 @@ public class AcoreUpdateAClassFeature extends AbstractUpdateFeature
     }
 
     // update needed, if names are different
-    boolean updateNameNeeded = pictogramName == null && businessName != null || pictogramName != null
-        && !pictogramName.equals(businessName);
+    boolean updateNameNeeded = pictogramName == null && businessName != null
+        || pictogramName != null && !pictogramName.equals(businessName);
     if (updateNameNeeded)
     {
       return Reason.createTrueReason("Name is out of date");
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/AcoreGraphitiContextUtil.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/AcoreGraphitiContextUtil.java
index 655d2cb974..4d0c616b75 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/AcoreGraphitiContextUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/AcoreGraphitiContextUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/AcoreImageProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/AcoreImageProvider.java
index 567dc14ce1..a5b659a8db 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/AcoreImageProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/AcoreImageProvider.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.graphiti.util;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/DawnGraphitiAcoreResourceUtil.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/DawnGraphitiAcoreResourceUtil.java
index f290e4a8da..bc627176f8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/DawnGraphitiAcoreResourceUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.graphiti/src/org/eclipse/emf/cdo/dawn/examples/acore/graphiti/util/DawnGraphitiAcoreResourceUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF
index a544cf3005..89855b6d6c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.examples.acore;singleton:=true
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.examples.acore;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.impl;version="1.0.300",
- org.eclipse.emf.cdo.dawn.examples.acore.util;version="1.0.300"
+Export-Package: org.eclipse.emf.cdo.dawn.examples.acore;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.impl;version="1.0.400",
+ org.eclipse.emf.cdo.dawn.examples.acore.util;version="1.0.400"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AAttribute.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AAttribute.java
index d4943f8ca9..d219f17f22 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AAttribute.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AAttribute.java
@@ -4,16 +4,16 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>AAttribute</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAAttribute()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/ABasicClass.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/ABasicClass.java
index 803a42981b..c59acb965b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/ABasicClass.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/ABasicClass.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getABasicClass()
  * @model
  * @extends CDOObject
@@ -41,7 +41,7 @@ public interface ABasicClass extends CDOObject
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Operations</em>' containment reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getABasicClass_Operations()
    * @model containment="true"
@@ -57,7 +57,7 @@ public interface ABasicClass extends CDOObject
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Attributes</em>' containment reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getABasicClass_Attributes()
    * @model containment="true"
@@ -71,7 +71,7 @@ public interface ABasicClass extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getABasicClass_Name()
@@ -83,7 +83,7 @@ public interface ABasicClass extends CDOObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass#getName <em>Name</em>}'
    * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AClass.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AClass.java
index c771637614..65d22bb2de 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AClass.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AClass.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.AClass#getAggregations <em>Aggregations</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAClass()
  * @model
  * @generated
@@ -40,7 +40,7 @@ public interface AClass extends ABasicClass
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Sub Classes</em>' reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAClass_SubClasses()
    * @model
@@ -56,7 +56,7 @@ public interface AClass extends ABasicClass
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Implemented Interfaces</em>' reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAClass_ImplementedInterfaces()
    * @model
@@ -72,7 +72,7 @@ public interface AClass extends ABasicClass
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Associations</em>' reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAClass_Associations()
    * @model
@@ -88,7 +88,7 @@ public interface AClass extends ABasicClass
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Compositions</em>' reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAClass_Compositions()
    * @model
@@ -104,7 +104,7 @@ public interface AClass extends ABasicClass
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Aggregations</em>' reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAClass_Aggregations()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AClassChild.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AClassChild.java
index 9d4016821b..6999f3133d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AClassChild.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AClassChild.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getDataType <em>Data Type</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAClassChild()
  * @model
  * @extends CDOObject
@@ -38,7 +38,7 @@ public interface AClassChild extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAClassChild_Name()
@@ -50,7 +50,7 @@ public interface AClassChild extends CDOObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getName <em>Name</em>}'
    * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -67,7 +67,7 @@ public interface AClassChild extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Accessright</em>' attribute.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AccessType
    * @see #isSetAccessright()
@@ -82,7 +82,7 @@ public interface AClassChild extends CDOObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getAccessright
    * <em>Accessright</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Accessright</em>' attribute.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AccessType
@@ -96,7 +96,7 @@ public interface AClassChild extends CDOObject
   /**
    * Unsets the value of the '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getAccessright
    * <em>Accessright</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isSetAccessright()
    * @see #getAccessright()
    * @see #setAccessright(AccessType)
@@ -107,7 +107,7 @@ public interface AClassChild extends CDOObject
   /**
    * Returns whether the value of the '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getAccessright
    * <em>Accessright</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return whether the value of the '<em>Accessright</em>' attribute is set.
    * @see #unsetAccessright()
    * @see #getAccessright()
@@ -123,7 +123,7 @@ public interface AClassChild extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Data Type</em>' attribute.
    * @see #setDataType(String)
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAClassChild_DataType()
@@ -135,7 +135,7 @@ public interface AClassChild extends CDOObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getDataType <em>Data Type</em>}'
    * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Data Type</em>' attribute.
    * @see #getDataType()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/ACoreRoot.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/ACoreRoot.java
index 34ae77ed68..54d3ca4be7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/ACoreRoot.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/ACoreRoot.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot#getInterfaces <em>Interfaces</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getACoreRoot()
  * @model
  * @extends CDOObject
@@ -39,7 +39,7 @@ public interface ACoreRoot extends CDOObject
    * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Title</em>' attribute.
    * @see #setTitle(String)
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getACoreRoot_Title()
@@ -51,7 +51,7 @@ public interface ACoreRoot extends CDOObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot#getTitle <em>Title</em>}'
    * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Title</em>' attribute.
    * @see #getTitle()
@@ -67,7 +67,7 @@ public interface ACoreRoot extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Classes</em>' containment reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getACoreRoot_Classes()
    * @model containment="true"
@@ -83,7 +83,7 @@ public interface ACoreRoot extends CDOObject
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Interfaces</em>' containment reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getACoreRoot_Interfaces()
    * @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AInterface.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AInterface.java
index 9f9c7c816a..dd542fac63 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AInterface.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AInterface.java
@@ -4,16 +4,16 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>AInterface</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAInterface()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AOperation.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AOperation.java
index 2d149135aa..b773adaa52 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AOperation.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AOperation.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
@@ -21,7 +21,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.AOperation#getParameters <em>Parameters</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAOperation()
  * @model
  * @generated
@@ -36,7 +36,7 @@ public interface AOperation extends AClassChild
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Parameters</em>' containment reference list.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAOperation_Parameters()
    * @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AParameter.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AParameter.java
index d37d46b9ac..643b4d8a40 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AParameter.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AParameter.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAParameter()
  * @model
  * @extends CDOObject
@@ -36,7 +36,7 @@ public interface AParameter extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAParameter_Name()
@@ -48,7 +48,7 @@ public interface AParameter extends CDOObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter#getName <em>Name</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -62,7 +62,7 @@ public interface AParameter extends CDOObject
    * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Type</em>' attribute.
    * @see #setType(String)
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAParameter_Type()
@@ -74,7 +74,7 @@ public interface AParameter extends CDOObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter#getType <em>Type</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Type</em>' attribute.
    * @see #getType()
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AccessType.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AccessType.java
index a9962df7e2..c2b390191a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AccessType.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AccessType.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
@@ -20,7 +20,7 @@ import java.util.List;
 /**
  * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Access Type</b></em>', and
  * utility methods for working with them. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#getAccessType()
  * @model extendedMetaData="name='AccessType'"
  * @generated
@@ -29,7 +29,7 @@ public enum AccessType implements Enumerator
 {
   /**
    * The '<em><b>PUBLIC</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #PUBLIC_VALUE
    * @generated
    * @ordered
@@ -38,7 +38,7 @@ public enum AccessType implements Enumerator
 
   /**
    * The '<em><b>PRIVATE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #PRIVATE_VALUE
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public enum AccessType implements Enumerator
 
   /**
    * The '<em><b>PROECTED</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #PROECTED_VALUE
    * @generated
    * @ordered
@@ -56,7 +56,7 @@ public enum AccessType implements Enumerator
 
   /**
    * The '<em><b>PACKAGE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #PACKAGE_VALUE
    * @generated
    * @ordered
@@ -70,7 +70,7 @@ public enum AccessType implements Enumerator
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @see #PUBLIC
    * @model literal="public"
    * @generated
@@ -85,7 +85,7 @@ public enum AccessType implements Enumerator
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @see #PRIVATE
    * @model literal="private"
    * @generated
@@ -100,7 +100,7 @@ public enum AccessType implements Enumerator
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @see #PROECTED
    * @model literal="protected"
    * @generated
@@ -115,7 +115,7 @@ public enum AccessType implements Enumerator
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @see #PACKAGE
    * @model literal="package"
    * @generated
@@ -125,7 +125,7 @@ public enum AccessType implements Enumerator
 
   /**
    * An array of all the '<em><b>Access Type</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static final AccessType[] VALUES_ARRAY = new AccessType[] { PUBLIC, PRIVATE, PROECTED, PACKAGE, };
@@ -133,7 +133,7 @@ public enum AccessType implements Enumerator
   /**
    * A public read-only list of all the '<em><b>Access Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static final List<AccessType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -141,7 +141,7 @@ public enum AccessType implements Enumerator
   /**
    * Returns the '<em><b>Access Type</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static AccessType get(String literal)
@@ -160,7 +160,7 @@ public enum AccessType implements Enumerator
   /**
    * Returns the '<em><b>Access Type</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static AccessType getByName(String name)
@@ -179,7 +179,7 @@ public enum AccessType implements Enumerator
   /**
    * Returns the '<em><b>Access Type</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static AccessType get(int value)
@@ -200,28 +200,28 @@ public enum AccessType implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private final int value;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private final String name;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private final String literal;
 
   /**
    * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private AccessType(int value, String name, String literal)
@@ -233,7 +233,7 @@ public enum AccessType implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public int getValue()
@@ -243,7 +243,7 @@ public enum AccessType implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -253,7 +253,7 @@ public enum AccessType implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getLiteral()
@@ -264,7 +264,7 @@ public enum AccessType implements Enumerator
   /**
    * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AcoreFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AcoreFactory.java
index 4c6cfdc5ad..affaecf44b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AcoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AcoreFactory.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage
  * @generated
  */
@@ -24,14 +24,14 @@ public interface AcoreFactory extends EFactory
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   AcoreFactory eINSTANCE = org.eclipse.emf.cdo.dawn.examples.acore.impl.AcoreFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>AClass</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>AClass</em>'.
    * @generated
    */
@@ -39,7 +39,7 @@ public interface AcoreFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>AInterface</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>AInterface</em>'.
    * @generated
    */
@@ -47,7 +47,7 @@ public interface AcoreFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>ACore Root</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>ACore Root</em>'.
    * @generated
    */
@@ -55,7 +55,7 @@ public interface AcoreFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>AAttribute</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>AAttribute</em>'.
    * @generated
    */
@@ -63,7 +63,7 @@ public interface AcoreFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>AOperation</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>AOperation</em>'.
    * @generated
    */
@@ -71,7 +71,7 @@ public interface AcoreFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>ABasic Class</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>ABasic Class</em>'.
    * @generated
    */
@@ -79,7 +79,7 @@ public interface AcoreFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>AParameter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>AParameter</em>'.
    * @generated
    */
@@ -87,7 +87,7 @@ public interface AcoreFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>AClass Child</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>AClass Child</em>'.
    * @generated
    */
@@ -95,7 +95,7 @@ public interface AcoreFactory extends EFactory
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AcorePackage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AcorePackage.java
index cdda052425..eef2d7c829 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AcorePackage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/AcorePackage.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore;
 
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcoreFactory
  * @model kind="package"
  * @generated
@@ -36,28 +36,28 @@ public interface AcorePackage extends EPackage
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNAME = "acore";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore";
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_PREFIX = "acore";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   AcorePackage eINSTANCE = org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl.init();
@@ -65,7 +65,7 @@ public interface AcorePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.ABasicClassImpl
    * <em>ABasic Class</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.ABasicClassImpl
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getABasicClass()
    * @generated
@@ -75,7 +75,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Operations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -84,7 +84,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Attributes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -92,7 +92,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -101,7 +101,7 @@ public interface AcorePackage extends EPackage
   /**
    * The number of structural features of the '<em>ABasic Class</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -110,7 +110,7 @@ public interface AcorePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassImpl <em>AClass</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassImpl
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAClass()
    * @generated
@@ -120,7 +120,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Operations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -129,7 +129,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Attributes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -137,7 +137,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -145,7 +145,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Sub Classes</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -154,7 +154,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Implemented Interfaces</b></em>' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -162,7 +162,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Associations</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -170,7 +170,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Compositions</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -178,7 +178,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Aggregations</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -186,7 +186,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>AClass</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -195,7 +195,7 @@ public interface AcorePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AInterfaceImpl <em>AInterface</em>}
    * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AInterfaceImpl
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAInterface()
    * @generated
@@ -205,7 +205,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Operations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -214,7 +214,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Attributes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -222,7 +222,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -230,7 +230,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>AInterface</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -239,7 +239,7 @@ public interface AcorePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.ACoreRootImpl <em>ACore Root</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.ACoreRootImpl
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getACoreRoot()
    * @generated
@@ -248,7 +248,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -257,7 +257,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Classes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -266,7 +266,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Interfaces</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -274,7 +274,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>ACore Root</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -283,7 +283,7 @@ public interface AcorePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassChildImpl
    * <em>AClass Child</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassChildImpl
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAClassChild()
    * @generated
@@ -292,7 +292,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -300,7 +300,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Accessright</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -308,7 +308,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Data Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -317,7 +317,7 @@ public interface AcorePackage extends EPackage
   /**
    * The number of structural features of the '<em>AClass Child</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -326,7 +326,7 @@ public interface AcorePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AAttributeImpl <em>AAttribute</em>}
    * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AAttributeImpl
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAAttribute()
    * @generated
@@ -335,7 +335,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -343,7 +343,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Accessright</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -351,7 +351,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Data Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -359,7 +359,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>AAttribute</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -368,7 +368,7 @@ public interface AcorePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AOperationImpl <em>AOperation</em>}
    * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AOperationImpl
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAOperation()
    * @generated
@@ -377,7 +377,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -385,7 +385,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Accessright</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -393,7 +393,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Data Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -402,7 +402,7 @@ public interface AcorePackage extends EPackage
   /**
    * The feature id for the '<em><b>Parameters</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -410,7 +410,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>AOperation</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -419,7 +419,7 @@ public interface AcorePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AParameterImpl <em>AParameter</em>}
    * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AParameterImpl
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAParameter()
    * @generated
@@ -428,7 +428,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -436,7 +436,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -444,7 +444,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>AParameter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -453,7 +453,7 @@ public interface AcorePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.AccessType <em>Access Type</em>}' enum.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AccessType
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAccessType()
    * @generated
@@ -462,7 +462,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * The meta object id for the '<em>Access Type Object</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AccessType
    * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAccessTypeObject()
    * @generated
@@ -472,7 +472,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClass <em>AClass</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>AClass</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClass
    * @generated
@@ -483,7 +483,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.AClass#getSubClasses <em>Sub Classes</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Sub Classes</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClass#getSubClasses()
    * @see #getAClass()
@@ -495,7 +495,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.AClass#getImplementedInterfaces <em>Implemented Interfaces</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Implemented Interfaces</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClass#getImplementedInterfaces()
    * @see #getAClass()
@@ -507,7 +507,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.AClass#getAssociations <em>Associations</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Associations</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClass#getAssociations()
    * @see #getAClass()
@@ -519,7 +519,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.AClass#getCompositions <em>Compositions</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Compositions</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClass#getCompositions()
    * @see #getAClass()
@@ -531,7 +531,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.AClass#getAggregations <em>Aggregations</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Aggregations</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClass#getAggregations()
    * @see #getAClass()
@@ -542,7 +542,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AInterface <em>AInterface</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>AInterface</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AInterface
    * @generated
@@ -552,7 +552,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot <em>ACore Root</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>ACore Root</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot
    * @generated
@@ -562,7 +562,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot#getTitle
    * <em>Title</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Title</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot#getTitle()
    * @see #getACoreRoot()
@@ -574,7 +574,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot#getClasses <em>Classes</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Classes</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot#getClasses()
    * @see #getACoreRoot()
@@ -586,7 +586,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot#getInterfaces <em>Interfaces</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Interfaces</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot#getInterfaces()
    * @see #getACoreRoot()
@@ -597,7 +597,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AAttribute <em>AAttribute</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>AAttribute</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AAttribute
    * @generated
@@ -607,7 +607,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AOperation <em>AOperation</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>AOperation</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AOperation
    * @generated
@@ -618,7 +618,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.AOperation#getParameters <em>Parameters</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Parameters</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AOperation#getParameters()
    * @see #getAOperation()
@@ -629,7 +629,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass
    * <em>ABasic Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>ABasic Class</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass
    * @generated
@@ -640,7 +640,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass#getOperations <em>Operations</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Operations</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass#getOperations()
    * @see #getABasicClass()
@@ -652,7 +652,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass#getAttributes <em>Attributes</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Attributes</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass#getAttributes()
    * @see #getABasicClass()
@@ -663,7 +663,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass#getName
    * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass#getName()
    * @see #getABasicClass()
@@ -674,7 +674,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter <em>AParameter</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>AParameter</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AParameter
    * @generated
@@ -684,7 +684,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter#getName
    * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AParameter#getName()
    * @see #getAParameter()
@@ -695,7 +695,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter#getType
    * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Type</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AParameter#getType()
    * @see #getAParameter()
@@ -706,7 +706,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild
    * <em>AClass Child</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>AClass Child</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClassChild
    * @generated
@@ -716,7 +716,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getName
    * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getName()
    * @see #getAClassChild()
@@ -728,7 +728,7 @@ public interface AcorePackage extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getAccessright <em>Accessright</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Accessright</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getAccessright()
    * @see #getAClassChild()
@@ -739,7 +739,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getDataType
    * <em>Data Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Data Type</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClassChild#getDataType()
    * @see #getAClassChild()
@@ -750,7 +750,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for enum '{@link org.eclipse.emf.cdo.dawn.examples.acore.AccessType <em>Access Type</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for enum '<em>Access Type</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AccessType
    * @generated
@@ -760,7 +760,7 @@ public interface AcorePackage extends EPackage
   /**
    * Returns the meta object for data type '{@link org.eclipse.emf.cdo.dawn.examples.acore.AccessType
    * <em>Access Type Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for data type '<em>Access Type Object</em>'.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AccessType
    * @model instanceClass="org.eclipse.emf.cdo.dawn.examples.acore.AccessType"
@@ -771,7 +771,7 @@ public interface AcorePackage extends EPackage
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -786,7 +786,7 @@ public interface AcorePackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   interface Literals
@@ -794,7 +794,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassImpl <em>AClass</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassImpl
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAClass()
      * @generated
@@ -804,7 +804,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Sub Classes</b></em>' reference list feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ACLASS__SUB_CLASSES = eINSTANCE.getAClass_SubClasses();
@@ -812,7 +812,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Implemented Interfaces</b></em>' reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ACLASS__IMPLEMENTED_INTERFACES = eINSTANCE.getAClass_ImplementedInterfaces();
@@ -820,7 +820,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Associations</b></em>' reference list feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ACLASS__ASSOCIATIONS = eINSTANCE.getAClass_Associations();
@@ -828,7 +828,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Compositions</b></em>' reference list feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ACLASS__COMPOSITIONS = eINSTANCE.getAClass_Compositions();
@@ -836,7 +836,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Aggregations</b></em>' reference list feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ACLASS__AGGREGATIONS = eINSTANCE.getAClass_Aggregations();
@@ -844,7 +844,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AInterfaceImpl
      * <em>AInterface</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AInterfaceImpl
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAInterface()
      * @generated
@@ -854,7 +854,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.ACoreRootImpl
      * <em>ACore Root</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.ACoreRootImpl
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getACoreRoot()
      * @generated
@@ -864,7 +864,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Title</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute ACORE_ROOT__TITLE = eINSTANCE.getACoreRoot_Title();
@@ -872,7 +872,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Classes</b></em>' containment reference list feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ACORE_ROOT__CLASSES = eINSTANCE.getACoreRoot_Classes();
@@ -880,7 +880,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Interfaces</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ACORE_ROOT__INTERFACES = eINSTANCE.getACoreRoot_Interfaces();
@@ -888,7 +888,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AAttributeImpl
      * <em>AAttribute</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AAttributeImpl
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAAttribute()
      * @generated
@@ -898,7 +898,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AOperationImpl
      * <em>AOperation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AOperationImpl
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAOperation()
      * @generated
@@ -908,7 +908,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference AOPERATION__PARAMETERS = eINSTANCE.getAOperation_Parameters();
@@ -916,7 +916,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.ABasicClassImpl
      * <em>ABasic Class</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.ABasicClassImpl
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getABasicClass()
      * @generated
@@ -926,7 +926,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ABASIC_CLASS__OPERATIONS = eINSTANCE.getABasicClass_Operations();
@@ -934,7 +934,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ABASIC_CLASS__ATTRIBUTES = eINSTANCE.getABasicClass_Attributes();
@@ -942,7 +942,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute ABASIC_CLASS__NAME = eINSTANCE.getABasicClass_Name();
@@ -950,7 +950,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AParameterImpl
      * <em>AParameter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AParameterImpl
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAParameter()
      * @generated
@@ -960,7 +960,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute APARAMETER__NAME = eINSTANCE.getAParameter_Name();
@@ -968,7 +968,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Type</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute APARAMETER__TYPE = eINSTANCE.getAParameter_Type();
@@ -976,7 +976,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassChildImpl
      * <em>AClass Child</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassChildImpl
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAClassChild()
      * @generated
@@ -986,7 +986,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute ACLASS_CHILD__NAME = eINSTANCE.getAClassChild_Name();
@@ -994,7 +994,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Accessright</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute ACLASS_CHILD__ACCESSRIGHT = eINSTANCE.getAClassChild_Accessright();
@@ -1002,7 +1002,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Data Type</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute ACLASS_CHILD__DATA_TYPE = eINSTANCE.getAClassChild_DataType();
@@ -1010,7 +1010,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.dawn.examples.acore.AccessType <em>Access Type</em>}'
      * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.AccessType
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAccessType()
      * @generated
@@ -1020,7 +1020,7 @@ public interface AcorePackage extends EPackage
     /**
      * The meta object literal for the '<em>Access Type Object</em>' data type. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.dawn.examples.acore.AccessType
      * @see org.eclipse.emf.cdo.dawn.examples.acore.impl.AcorePackageImpl#getAccessTypeObject()
      * @generated
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AAttributeImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AAttributeImpl.java
index 1c5e2b30b8..caf08b5626 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AAttributeImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -20,14 +20,14 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>AAttribute</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class AAttributeImpl extends AClassChildImpl implements AAttribute
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AAttributeImpl()
@@ -37,7 +37,7 @@ public class AAttributeImpl extends AClassChildImpl implements AAttribute
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/ABasicClassImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/ABasicClassImpl.java
index ba64254891..c00eeef437 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/ABasicClassImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/ABasicClassImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -31,14 +31,14 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.ABasicClassImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ABasicClassImpl extends CDOObjectImpl implements ABasicClass
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ABasicClassImpl()
@@ -48,7 +48,7 @@ public class ABasicClassImpl extends CDOObjectImpl implements ABasicClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -59,7 +59,7 @@ public class ABasicClassImpl extends CDOObjectImpl implements ABasicClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -70,7 +70,7 @@ public class ABasicClassImpl extends CDOObjectImpl implements ABasicClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -81,7 +81,7 @@ public class ABasicClassImpl extends CDOObjectImpl implements ABasicClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -92,7 +92,7 @@ public class ABasicClassImpl extends CDOObjectImpl implements ABasicClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -102,7 +102,7 @@ public class ABasicClassImpl extends CDOObjectImpl implements ABasicClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AClassChildImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AClassChildImpl.java
index d741a5345a..bd14188ae6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AClassChildImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AClassChildImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -29,14 +29,14 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassChildImpl#getDataType <em>Data Type</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AClassChildImpl()
@@ -46,7 +46,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -57,7 +57,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -68,7 +68,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -78,7 +78,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -88,7 +88,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AccessType getAccessright()
@@ -98,7 +98,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setAccessright(AccessType newAccessright)
@@ -108,7 +108,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void unsetAccessright()
@@ -118,7 +118,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public boolean isSetAccessright()
@@ -128,7 +128,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getDataType()
@@ -138,7 +138,7 @@ public class AClassChildImpl extends CDOObjectImpl implements AClassChild
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setDataType(String newDataType)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AClassImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AClassImpl.java
index 272a8fe3e6..e24e38ce93 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AClassImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AClassImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -31,14 +31,14 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AClassImpl#getAggregations <em>Aggregations</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class AClassImpl extends ABasicClassImpl implements AClass
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AClassImpl()
@@ -48,7 +48,7 @@ public class AClassImpl extends ABasicClassImpl implements AClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -59,7 +59,7 @@ public class AClassImpl extends ABasicClassImpl implements AClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -70,7 +70,7 @@ public class AClassImpl extends ABasicClassImpl implements AClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -81,7 +81,7 @@ public class AClassImpl extends ABasicClassImpl implements AClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -92,7 +92,7 @@ public class AClassImpl extends ABasicClassImpl implements AClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -103,7 +103,7 @@ public class AClassImpl extends ABasicClassImpl implements AClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/ACoreRootImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/ACoreRootImpl.java
index 739367f366..c4948bc3fd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/ACoreRootImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/ACoreRootImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -31,14 +31,14 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.ACoreRootImpl#getInterfaces <em>Interfaces</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ACoreRootImpl extends CDOObjectImpl implements ACoreRoot
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ACoreRootImpl()
@@ -48,7 +48,7 @@ public class ACoreRootImpl extends CDOObjectImpl implements ACoreRoot
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -59,7 +59,7 @@ public class ACoreRootImpl extends CDOObjectImpl implements ACoreRoot
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -70,7 +70,7 @@ public class ACoreRootImpl extends CDOObjectImpl implements ACoreRoot
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getTitle()
@@ -80,7 +80,7 @@ public class ACoreRootImpl extends CDOObjectImpl implements ACoreRoot
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setTitle(String newTitle)
@@ -90,7 +90,7 @@ public class ACoreRootImpl extends CDOObjectImpl implements ACoreRoot
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -101,7 +101,7 @@ public class ACoreRootImpl extends CDOObjectImpl implements ACoreRoot
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AInterfaceImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AInterfaceImpl.java
index d6cf9ecd01..f491432afe 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AInterfaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AInterfaceImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -20,14 +20,14 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>AInterface</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class AInterfaceImpl extends ABasicClassImpl implements AInterface
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AInterfaceImpl()
@@ -37,7 +37,7 @@ public class AInterfaceImpl extends ABasicClassImpl implements AInterface
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AOperationImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AOperationImpl.java
index 4f45603793..61af199881 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AOperationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AOperationImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -26,14 +26,14 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AOperationImpl#getParameters <em>Parameters</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class AOperationImpl extends AClassChildImpl implements AOperation
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AOperationImpl()
@@ -43,7 +43,7 @@ public class AOperationImpl extends AClassChildImpl implements AOperation
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -54,7 +54,7 @@ public class AOperationImpl extends AClassChildImpl implements AOperation
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AParameterImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AParameterImpl.java
index ee788b1798..819507dafe 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AParameterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AParameterImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -27,14 +27,14 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.dawn.examples.acore.impl.AParameterImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class AParameterImpl extends CDOObjectImpl implements AParameter
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AParameterImpl()
@@ -44,7 +44,7 @@ public class AParameterImpl extends CDOObjectImpl implements AParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -55,7 +55,7 @@ public class AParameterImpl extends CDOObjectImpl implements AParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -66,7 +66,7 @@ public class AParameterImpl extends CDOObjectImpl implements AParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -76,7 +76,7 @@ public class AParameterImpl extends CDOObjectImpl implements AParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -86,7 +86,7 @@ public class AParameterImpl extends CDOObjectImpl implements AParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getType()
@@ -96,7 +96,7 @@ public class AParameterImpl extends CDOObjectImpl implements AParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setType(String newType)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcoreFactoryImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcoreFactoryImpl.java
index 3b2cfdef9a..174c364aba 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcoreFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcoreFactoryImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -32,14 +32,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static AcoreFactory init()
@@ -62,7 +62,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcoreFactoryImpl()
@@ -72,7 +72,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -81,21 +81,21 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
     switch (eClass.getClassifierID())
     {
     case AcorePackage.ACLASS:
-      return (EObject)createAClass();
+      return createAClass();
     case AcorePackage.AINTERFACE:
-      return (EObject)createAInterface();
+      return createAInterface();
     case AcorePackage.ACORE_ROOT:
-      return (EObject)createACoreRoot();
+      return createACoreRoot();
     case AcorePackage.AATTRIBUTE:
-      return (EObject)createAAttribute();
+      return createAAttribute();
     case AcorePackage.AOPERATION:
-      return (EObject)createAOperation();
+      return createAOperation();
     case AcorePackage.ABASIC_CLASS:
-      return (EObject)createABasicClass();
+      return createABasicClass();
     case AcorePackage.APARAMETER:
-      return (EObject)createAParameter();
+      return createAParameter();
     case AcorePackage.ACLASS_CHILD:
-      return (EObject)createAClassChild();
+      return createAClassChild();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -103,7 +103,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -122,7 +122,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -141,7 +141,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AClass createAClass()
@@ -152,7 +152,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AInterface createAInterface()
@@ -163,7 +163,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ACoreRoot createACoreRoot()
@@ -174,7 +174,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AAttribute createAAttribute()
@@ -185,7 +185,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AOperation createAOperation()
@@ -196,7 +196,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ABasicClass createABasicClass()
@@ -207,7 +207,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AParameter createAParameter()
@@ -218,7 +218,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AClassChild createAClassChild()
@@ -229,21 +229,23 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AccessType createAccessTypeFromString(EDataType eDataType, String initialValue)
   {
     AccessType result = AccessType.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String convertAccessTypeToString(EDataType eDataType, Object instanceValue)
@@ -253,7 +255,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AccessType createAccessTypeObjectFromString(EDataType eDataType, String initialValue)
@@ -263,7 +265,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String convertAccessTypeObjectToString(EDataType eDataType, Object instanceValue)
@@ -273,7 +275,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcorePackage getAcorePackage()
@@ -283,7 +285,7 @@ public class AcoreFactoryImpl extends EFactoryImpl implements AcoreFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcorePackageImpl.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcorePackageImpl.java
index 01d824c98a..669bdb765e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcorePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/impl/AcorePackageImpl.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.impl;
 
@@ -33,77 +33,77 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass aClassEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass aInterfaceEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass aCoreRootEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass aAttributeEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass aOperationEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass aBasicClassEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass aParameterEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass aClassChildEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EEnum accessTypeEEnum = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EDataType accessTypeObjectEDataType = null;
@@ -115,7 +115,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage#eNS_URI
    * @see #init()
@@ -128,7 +128,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static boolean isInited = false;
@@ -139,7 +139,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
    * This method is used to initialize {@link AcorePackage#eINSTANCE} when that field is accessed. Clients should not
    * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -148,11 +148,13 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
   public static AcorePackage init()
   {
     if (isInited)
+    {
       return (AcorePackage)EPackage.Registry.INSTANCE.getEPackage(AcorePackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    AcorePackageImpl theAcorePackage = (AcorePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AcorePackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new AcorePackageImpl());
+    AcorePackageImpl theAcorePackage = (AcorePackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof AcorePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AcorePackageImpl());
 
     isInited = true;
 
@@ -172,7 +174,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getAClass()
@@ -182,7 +184,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getAClass_SubClasses()
@@ -192,7 +194,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getAClass_ImplementedInterfaces()
@@ -202,7 +204,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getAClass_Associations()
@@ -212,7 +214,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getAClass_Compositions()
@@ -222,7 +224,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getAClass_Aggregations()
@@ -232,7 +234,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getAInterface()
@@ -242,7 +244,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getACoreRoot()
@@ -252,7 +254,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getACoreRoot_Title()
@@ -262,7 +264,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getACoreRoot_Classes()
@@ -272,7 +274,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getACoreRoot_Interfaces()
@@ -282,7 +284,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getAAttribute()
@@ -292,7 +294,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getAOperation()
@@ -302,7 +304,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getAOperation_Parameters()
@@ -312,7 +314,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getABasicClass()
@@ -322,7 +324,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getABasicClass_Operations()
@@ -332,7 +334,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getABasicClass_Attributes()
@@ -342,7 +344,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getABasicClass_Name()
@@ -352,7 +354,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getAParameter()
@@ -362,7 +364,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getAParameter_Name()
@@ -372,7 +374,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getAParameter_Type()
@@ -382,7 +384,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getAClassChild()
@@ -392,7 +394,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getAClassChild_Name()
@@ -402,7 +404,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getAClassChild_Accessright()
@@ -412,7 +414,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getAClassChild_DataType()
@@ -422,7 +424,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EEnum getAccessType()
@@ -432,7 +434,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EDataType getAccessTypeObject()
@@ -442,7 +444,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcoreFactory getAcoreFactory()
@@ -452,7 +454,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isCreated = false;
@@ -460,13 +462,15 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -512,7 +516,7 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isInitialized = false;
@@ -520,13 +524,15 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -539,26 +545,26 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    aClassEClass.getESuperTypes().add(this.getABasicClass());
-    aInterfaceEClass.getESuperTypes().add(this.getABasicClass());
-    aAttributeEClass.getESuperTypes().add(this.getAClassChild());
-    aOperationEClass.getESuperTypes().add(this.getAClassChild());
+    aClassEClass.getESuperTypes().add(getABasicClass());
+    aInterfaceEClass.getESuperTypes().add(getABasicClass());
+    aAttributeEClass.getESuperTypes().add(getAClassChild());
+    aOperationEClass.getESuperTypes().add(getAClassChild());
 
     // Initialize classes and features; add operations and parameters
     initEClass(aClassEClass, AClass.class, "AClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAClass_SubClasses(), this.getAClass(), null, "subClasses", null, 0, -1, AClass.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getAClass_ImplementedInterfaces(), this.getAInterface(), null, "implementedInterfaces", null, 0, -1,
+    initEReference(getAClass_SubClasses(), getAClass(), null, "subClasses", null, 0, -1, AClass.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getAClass_ImplementedInterfaces(), getAInterface(), null, "implementedInterfaces", null, 0, -1,
         AClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getAClass_Associations(), this.getAClass(), null, "associations", null, 0, -1, AClass.class,
+    initEReference(getAClass_Associations(), getAClass(), null, "associations", null, 0, -1, AClass.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getAClass_Compositions(), this.getAClass(), null, "compositions", null, 0, -1, AClass.class,
+    initEReference(getAClass_Compositions(), getAClass(), null, "compositions", null, 0, -1, AClass.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getAClass_Aggregations(), this.getAClass(), null, "aggregations", null, 0, -1, AClass.class,
+    initEReference(getAClass_Aggregations(), getAClass(), null, "aggregations", null, 0, -1, AClass.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
@@ -566,12 +572,12 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
         IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(aCoreRootEClass, ACoreRoot.class, "ACoreRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getACoreRoot_Title(), ecorePackage.getEString(), "title", null, 0, 1, ACoreRoot.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getACoreRoot_Classes(), this.getAClass(), null, "classes", null, 0, -1, ACoreRoot.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getACoreRoot_Interfaces(), this.getAInterface(), null, "interfaces", null, 0, -1, ACoreRoot.class,
+    initEAttribute(getACoreRoot_Title(), ecorePackage.getEString(), "title", null, 0, 1, ACoreRoot.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getACoreRoot_Classes(), getAClass(), null, "classes", null, 0, -1, ACoreRoot.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getACoreRoot_Interfaces(), getAInterface(), null, "interfaces", null, 0, -1, ACoreRoot.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
@@ -580,35 +586,34 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
 
     initEClass(aOperationEClass, AOperation.class, "AOperation", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAOperation_Parameters(), this.getAParameter(), null, "parameters", null, 0, -1, AOperation.class,
+    initEReference(getAOperation_Parameters(), getAParameter(), null, "parameters", null, 0, -1, AOperation.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(aBasicClassEClass, ABasicClass.class, "ABasicClass", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getABasicClass_Operations(), this.getAOperation(), null, "operations", null, 0, -1,
-        ABasicClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getABasicClass_Attributes(), this.getAAttribute(), null, "attributes", null, 0, -1,
-        ABasicClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getABasicClass_Operations(), getAOperation(), null, "operations", null, 0, -1, ABasicClass.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getABasicClass_Attributes(), getAAttribute(), null, "attributes", null, 0, -1, ABasicClass.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
     initEAttribute(getABasicClass_Name(), ecorePackage.getEString(), "name", null, 0, 1, ABasicClass.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(aParameterEClass, AParameter.class, "AParameter", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, AParameter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAParameter_Type(), ecorePackage.getEString(), "type", null, 0, 1, AParameter.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, AParameter.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAParameter_Type(), ecorePackage.getEString(), "type", null, 0, 1, AParameter.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(aClassChildEClass, AClassChild.class, "AClassChild", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAClassChild_Name(), ecorePackage.getEString(), "name", "", 0, 1, AClassChild.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAClassChild_Accessright(), this.getAccessType(), "accessright", "public", 0, 1,
-        AClassChild.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEAttribute(getAClassChild_Name(), ecorePackage.getEString(), "name", "", 0, 1, AClassChild.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAClassChild_Accessright(), getAccessType(), "accessright", "public", 0, 1, AClassChild.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getAClassChild_DataType(), ecorePackage.getEString(), "dataType", null, 0, 1, AClassChild.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -634,15 +639,15 @@ public class AcorePackageImpl extends EPackageImpl implements AcorePackage
   /**
    * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void createExtendedMetaDataAnnotations()
   {
     String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
     addAnnotation(accessTypeEEnum, source, new String[] { "name", "AccessType" });
-    addAnnotation(accessTypeObjectEDataType, source, new String[] { "name", "AccessType:Object", "baseType",
-        "AccessType" });
+    addAnnotation(accessTypeObjectEDataType, source,
+        new String[] { "name", "AccessType:Object", "baseType", "AccessType" });
   }
 
 } // AcorePackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/util/AcoreAdapterFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/util/AcoreAdapterFactory.java
index 156eee129a..283c5e1c84 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/util/AcoreAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/util/AcoreAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.util;
 
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage
  * @generated
  */
@@ -37,14 +37,14 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static AcorePackage modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcoreAdapterFactory()
@@ -59,7 +59,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
+   *
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -79,7 +79,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected AcoreSwitch<Adapter> modelSwitch = new AcoreSwitch<Adapter>()
@@ -141,7 +141,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -157,7 +157,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClass
    * <em>AClass</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClass
    * @generated
@@ -171,7 +171,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AInterface
    * <em>AInterface</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AInterface
    * @generated
@@ -185,7 +185,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot
    * <em>ACore Root</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ACoreRoot
    * @generated
@@ -199,7 +199,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AAttribute
    * <em>AAttribute</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AAttribute
    * @generated
@@ -213,7 +213,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AOperation
    * <em>AOperation</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AOperation
    * @generated
@@ -227,7 +227,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass
    * <em>ABasic Class</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.ABasicClass
    * @generated
@@ -241,7 +241,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AParameter
    * <em>AParameter</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AParameter
    * @generated
@@ -255,7 +255,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.dawn.examples.acore.AClassChild
    * <em>AClass Child</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.dawn.examples.acore.AClassChild
    * @generated
@@ -268,7 +268,7 @@ public class AcoreAdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/util/AcoreSwitch.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/util/AcoreSwitch.java
index 5c04a14732..9fa493043a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/util/AcoreSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/dawn/examples/acore/util/AcoreSwitch.java
@@ -4,10 +4,10 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
- * 
+ *
  */
 package org.eclipse.emf.cdo.dawn.examples.acore.util;
 
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.util.Switch;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.examples.acore.AcorePackage
  * @generated
  */
@@ -38,14 +38,14 @@ public class AcoreSwitch<T> extends Switch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static AcorePackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public AcoreSwitch()
@@ -58,7 +58,7 @@ public class AcoreSwitch<T> extends Switch<T>
 
   /**
    * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @parameter ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
@@ -72,7 +72,7 @@ public class AcoreSwitch<T> extends Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -86,9 +86,13 @@ public class AcoreSwitch<T> extends Switch<T>
       AClass aClass = (AClass)theEObject;
       T result = caseAClass(aClass);
       if (result == null)
+      {
         result = caseABasicClass(aClass);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case AcorePackage.AINTERFACE:
@@ -96,9 +100,13 @@ public class AcoreSwitch<T> extends Switch<T>
       AInterface aInterface = (AInterface)theEObject;
       T result = caseAInterface(aInterface);
       if (result == null)
+      {
         result = caseABasicClass(aInterface);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case AcorePackage.ACORE_ROOT:
@@ -106,7 +114,9 @@ public class AcoreSwitch<T> extends Switch<T>
       ACoreRoot aCoreRoot = (ACoreRoot)theEObject;
       T result = caseACoreRoot(aCoreRoot);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case AcorePackage.AATTRIBUTE:
@@ -114,9 +124,13 @@ public class AcoreSwitch<T> extends Switch<T>
       AAttribute aAttribute = (AAttribute)theEObject;
       T result = caseAAttribute(aAttribute);
       if (result == null)
+      {
         result = caseAClassChild(aAttribute);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case AcorePackage.AOPERATION:
@@ -124,9 +138,13 @@ public class AcoreSwitch<T> extends Switch<T>
       AOperation aOperation = (AOperation)theEObject;
       T result = caseAOperation(aOperation);
       if (result == null)
+      {
         result = caseAClassChild(aOperation);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case AcorePackage.ABASIC_CLASS:
@@ -134,7 +152,9 @@ public class AcoreSwitch<T> extends Switch<T>
       ABasicClass aBasicClass = (ABasicClass)theEObject;
       T result = caseABasicClass(aBasicClass);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case AcorePackage.APARAMETER:
@@ -142,7 +162,9 @@ public class AcoreSwitch<T> extends Switch<T>
       AParameter aParameter = (AParameter)theEObject;
       T result = caseAParameter(aParameter);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case AcorePackage.ACLASS_CHILD:
@@ -150,7 +172,9 @@ public class AcoreSwitch<T> extends Switch<T>
       AClassChild aClassChild = (AClassChild)theEObject;
       T result = caseAClassChild(aClassChild);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -161,7 +185,7 @@ public class AcoreSwitch<T> extends Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>AClass</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>AClass</em>'.
@@ -176,7 +200,7 @@ public class AcoreSwitch<T> extends Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>AInterface</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>AInterface</em>'.
@@ -191,7 +215,7 @@ public class AcoreSwitch<T> extends Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>ACore Root</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>ACore Root</em>'.
@@ -206,7 +230,7 @@ public class AcoreSwitch<T> extends Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>AAttribute</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>AAttribute</em>'.
@@ -221,7 +245,7 @@ public class AcoreSwitch<T> extends Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>AOperation</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>AOperation</em>'.
@@ -236,7 +260,7 @@ public class AcoreSwitch<T> extends Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>ABasic Class</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>ABasic Class</em>'.
@@ -251,7 +275,7 @@ public class AcoreSwitch<T> extends Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>AParameter</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>AParameter</em>'.
@@ -266,7 +290,7 @@ public class AcoreSwitch<T> extends Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>AClass Child</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>AClass Child</em>'.
@@ -282,7 +306,7 @@ public class AcoreSwitch<T> extends Switch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/Activator.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/Activator.java
index 2f9645b50e..61e1c4c0d2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/Activator.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizer.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizer.java
index de0a9b5990..61a2e51a8c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizer.java
@@ -19,7 +19,7 @@ import org.eclipse.gef.EditPart;
  * conflicted and locked. By implementing an own DawnStylizer you can influence the appearance of the three states for
  * your EditPart and it's related models. New stylizer can be registered to Dawn using the
  * <b>org.eclipse.emf.cdo.dawn.editpartstylizers</b> extension point.
- * 
+ *
  * @author Martin Fluegge
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java
index 825c0d3a05..3cdae2e94e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/appearance/DawnEditPartStylizerRegistry.java
@@ -99,8 +99,8 @@ public class DawnEditPartStylizerRegistry
   {
     try
     {
-      IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(
-          DAWN_STYLIZER_EXTENSION_POINT_ID);
+      IConfigurationElement[] config = Platform.getExtensionRegistry()
+          .getConfigurationElementsFor(DAWN_STYLIZER_EXTENSION_POINT_ID);
       for (IConfigurationElement e : config)
       {
         if (editPart.getClass().getCanonicalName().equals(e.getAttribute("editpart")))
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelper.java
index df0c278429..cc6fc20209 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelper.java
@@ -4,14 +4,14 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
 package org.eclipse.emf.cdo.dawn.gmf.elementtypes;
 
 /**
- * 
+ *
  * @author Martin Fluegge
  *  @since 2.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelperFactory.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelperFactory.java
index f6135b6e93..c66f573290 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelperFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/elementtypes/DawnElementTypeHelperFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java
index 23fabd4919..d50088498c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  *     Christian W. Damus (CEA) - bug 399285 support IDawnEditor adapters
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFLockingHandler.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFLockingHandler.java
index 292ed0d7e1..0879cb1e35 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFLockingHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/notifications/impl/DawnGMFLockingHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/resources/DawnPathmapManager.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/resources/DawnPathmapManager.java
index 8310d1e811..3a74121b85 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/resources/DawnPathmapManager.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/resources/DawnPathmapManager.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/stylizer/DawnGMFElementStylizerFactory.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/stylizer/DawnGMFElementStylizerFactory.java
index ddf4212995..5a1e580b1c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/stylizer/DawnGMFElementStylizerFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/stylizer/DawnGMFElementStylizerFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java
index e0cdb4fa04..cf616f69dd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnChangeHelper.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -84,6 +84,7 @@ public class DawnChangeHelper
   protected static final java.util.Map<String, Boolean> options = new HashMap<String, Boolean>();
 
   protected static final java.util.Map<Object, Object> setElementOptions = new HashMap<Object, Object>();
+
   static
   {
     options.put(Transaction.OPTION_UNPROTECTED, Boolean.FALSE);
@@ -93,7 +94,7 @@ public class DawnChangeHelper
 
   /**
    * generic Method to create an EditPart by the given view
-   * 
+   *
    * @param node
    * @param elementType
    * @param diagramEP
@@ -133,7 +134,7 @@ public class DawnChangeHelper
     ViewAndElementDescriptor viewAndElementDescriptor = new ViewAndElementDescriptor(createElementRequestAdapter,
         Node.class, ((IHintedType)elementType).getSemanticHint(),
 
-        parentEditpart.getDiagramPreferencesHint());
+    parentEditpart.getDiagramPreferencesHint());
 
     CreateViewAndElementRequest createViewRequest = new CreateViewAndElementRequest(viewAndElementDescriptor);
 
@@ -150,7 +151,7 @@ public class DawnChangeHelper
   /***************************************
    * This method creates an EditPart given by the specified ElemetType and PLaces it to the give coordinates
    * Element-Types could be: DawnElementTypes.Klasse_1001
-   * 
+   *
    * @param p
    *          the point where the view shoudl be created
    * @param elementType
@@ -174,7 +175,7 @@ public class DawnChangeHelper
 
   /***************************************
    * sets a property for an editpart
-   * 
+   *
    * @param editPart
    * @param name
    * @param object
@@ -194,7 +195,7 @@ public class DawnChangeHelper
 
   /***************************************
    * resizes an Editpart to the given dimension
-   * 
+   *
    * @param editpart
    * @param d
    *          dimension
@@ -235,7 +236,7 @@ public class DawnChangeHelper
 
   /***************************************
    * moves an EdidPart to the given postione
-   * 
+   *
    * @param editpart
    * @param p
    ********************************************************************************************************************/
@@ -272,7 +273,7 @@ public class DawnChangeHelper
 
   /**
    * deletes the EditPart an the concerning model element
-   * 
+   *
    * @param editPart
    * @param editor
    */
@@ -318,7 +319,7 @@ public class DawnChangeHelper
 
   /***************************************
    * Deletes a view and it's contained element
-   * 
+   *
    * @param view
    * @param editor
    ********************************************************************************************************************/
@@ -363,7 +364,7 @@ public class DawnChangeHelper
 
   /***************************************
    * creates an edge for a given elementType
-   * 
+   *
    * @param oldEdge
    * @param sourceEditPart
    * @param targetEditPart
@@ -382,15 +383,16 @@ public class DawnChangeHelper
     CreateConnectionViewAndElementRequest req = new CreateConnectionViewAndElementRequest(elementType,
         ((IHintedType)elementType).getSemanticHint(), root.getDiagramPreferencesHint());
 
-    ICommand createConnectionCmd = new DeferredCreateConnectionViewAndElementCommand(req, new EObjectAdapter(
-        (EObject)sourceEditPart.getModel()), new EObjectAdapter((EObject)targetEditPart.getModel()), root.getViewer());
+    ICommand createConnectionCmd = new DeferredCreateConnectionViewAndElementCommand(req,
+        new EObjectAdapter((EObject)sourceEditPart.getModel()), new EObjectAdapter((EObject)targetEditPart.getModel()),
+        root.getViewer());
 
     root.getDiagramEditDomain().getDiagramCommandStack().execute(new ICommandProxy(createConnectionCmd));
 
     final EditPartViewer viewer = root.getViewer();
 
-    final EditPart ret = (EditPart)viewer.getEditPartRegistry().get(
-        ((ConnectionViewAndElementDescriptor)req.getNewObject()).getAdapter(View.class));
+    final EditPart ret = (EditPart)viewer.getEditPartRegistry()
+        .get(((ConnectionViewAndElementDescriptor)req.getNewObject()).getAdapter(View.class));
 
     if (ret != null)
     {
@@ -401,12 +403,13 @@ public class DawnChangeHelper
 
   /***************************************
    * This Method sets the Anchors and Bendpoint from an old Edge to the edge of the given EditPart
-   * 
+   *
    * @param edgeEditpart
    * @param oldEdge
    * @param root
    ********************************************************************************************************************/
-  public static void setAnchorsAndBendPoints(final EditPart edgeEditpart, final Edge oldEdge, final DiagramEditPart root)
+  public static void setAnchorsAndBendPoints(final EditPart edgeEditpart, final Edge oldEdge,
+      final DiagramEditPart root)
   {
     TransactionalEditingDomain domain = root.getEditingDomain();// getEditingDomain();
     domain.getCommandStack().execute(new RecordingCommand(domain)
@@ -434,7 +437,7 @@ public class DawnChangeHelper
 
   /**
    * returns the border color from a given EditPart
-   * 
+   *
    * @param editPart
    * @return the border color of the EditPart
    */
@@ -465,7 +468,7 @@ public class DawnChangeHelper
 
   /**
    * activates a given EditPart
-   * 
+   *
    * @param editPart
    */
   public static void activateEditPart(final EditPart editPart)
@@ -483,7 +486,7 @@ public class DawnChangeHelper
 
   /**
    * activates the diagram EditPart
-   * 
+   *
    * @param diagramEditPart
    */
   public static void activateDiagramEditPart(DiagramEditPart diagramEditPart)
@@ -498,7 +501,7 @@ public class DawnChangeHelper
 
   /**
    * deactivates the given EditPart
-   * 
+   *
    * @param editPart
    */
   public static void deactivateEditPart(final EditPart editPart)
@@ -518,7 +521,7 @@ public class DawnChangeHelper
 
   /**
    * deactivates the DiagramEditPart
-   * 
+   *
    * @param diagramEditPart
    */
   public static void deactivateDiagramEditPart(DiagramEditPart diagramEditPart)
@@ -549,7 +552,7 @@ public class DawnChangeHelper
 
   /**
    * selects the given EditPart
-   * 
+   *
    * @param e
    */
   public static void select(final EditPart e)
@@ -566,7 +569,7 @@ public class DawnChangeHelper
 
   /***************************************
    * sets a property for an editpart
-   * 
+   *
    * @param editPart
    * @param name
    * @param object
@@ -584,7 +587,7 @@ public class DawnChangeHelper
 
   /***************************************
    * updates the model
-   * 
+   *
    * @param editPart
    * @param model
    * @param editor
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnConflictHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnConflictHelper.java
index 68b0b83952..ef5fc3eab6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnConflictHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/synchronize/DawnConflictHelper.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  *     Christian W. Damus (CEA) - Bug 404184: handle View that has no element
@@ -84,7 +84,7 @@ public class DawnConflictHelper
 
   /**
    * TODO this method should decide whether the object is conflicted or not using special Policies
-   * 
+   *
    * @param object a non-{@code null} object
    * @return whether the object is conflicted
    */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnDiagramUpdater.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnDiagramUpdater.java
index 4857be357f..96fb38bcd0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnDiagramUpdater.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnDiagramUpdater.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  *     Christian W. Damus (CEA) - bug 399733: tolerate UML CacheAdapter
@@ -347,7 +347,7 @@ public class DawnDiagramUpdater
    * <p>
    * In our scenario the Edges will be wrongly connected to the diagram itself, which makes the CanonicalEditingPolicy
    * to remove and restore the edge. Long, short story, we must 'touch' the elements here to have the element set.
-   * 
+   *
    * @param diagram
    */
   public static void initializeElement(Diagram diagram)
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java
index b0f545c4b2..f373c45b9e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/util/DawnResourceHelper.java
@@ -4,14 +4,14 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
 package org.eclipse.emf.cdo.dawn.gmf.util;
 
 /**
- * 
+ *
  * @author Martin Fluegge
  */
 
@@ -235,7 +235,7 @@ public class DawnResourceHelper
 
   /**
    * returns the diagram from the resource if no diagram can be found it returns null.
-   * 
+   *
    * @param res
    * @return if it exists the diagram otherwise null
    */
@@ -253,7 +253,7 @@ public class DawnResourceHelper
 
   /**
    * compares two eObjects by there xmi-id whether the are equal or not
-   * 
+   *
    * @param oldNode
    * @param newNode
    * @return true if xmi-id equal, else otherwise
@@ -272,7 +272,7 @@ public class DawnResourceHelper
 
   /**
    * returns the same Object in the other resource. The Object is identified by the xmi ID
-   * 
+   *
    * @param e
    * @param resource
    * @return an object in the given resource with the same xmi Id
@@ -287,7 +287,7 @@ public class DawnResourceHelper
 
   /**
    * finds changed objects
-   * 
+   *
    * @param serverO
    * @param clientO
    * @return true if the obejcts are different
@@ -467,7 +467,7 @@ public class DawnResourceHelper
 
   /**
    * copies the XMI-id from oldElement to new Element
-   * 
+   *
    * @param newElement
    * @param oldElement
    */
@@ -478,7 +478,7 @@ public class DawnResourceHelper
 
   /**
    * sets the objects id in the old resource to the new resource
-   * 
+   *
    * @param v
    * @param oldResource
    */
@@ -489,7 +489,7 @@ public class DawnResourceHelper
 
   /**
    * creates a deep Copy and also copies xmi ids This method can be used if the copy should be insertet into newParent
-   * 
+   *
    * @param oldObject
    * @param newParent
    * @return the copy of the oldObject
@@ -538,7 +538,7 @@ public class DawnResourceHelper
 
   /**
    * This method provides deep copying of all childrens xmi ids from oldObject to newObject
-   * 
+   *
    * @param oldObject
    * @param newObject
    */
@@ -581,9 +581,9 @@ public class DawnResourceHelper
 
     if (!leftObject.eClass().equals(rightObject.eClass()))
     {
-      throw new EClassIncompatibleException(leftObject.eClass().getName() + "("
-          + DawnResourceHelper.getXmiId(leftObject) + ")" + "/" + rightObject.eClass().getName() + "("
-          + DawnResourceHelper.getXmiId(leftObject) + ")");
+      throw new EClassIncompatibleException(
+          leftObject.eClass().getName() + "(" + DawnResourceHelper.getXmiId(leftObject) + ")" + "/"
+              + rightObject.eClass().getName() + "(" + DawnResourceHelper.getXmiId(leftObject) + ")");
     }
 
     updateEAttributes(leftObject, rightObject);
@@ -593,12 +593,12 @@ public class DawnResourceHelper
     {
       EObject rightChild = (EObject)o;
       EObject leftChild = getSameEObjectFromOtherResource(rightChild, (XMLResource)leftObject.eResource());
-      if (leftChild != null)// child exists
+      if (leftChild != null) // child exists
       {
         updateEObject(leftChild, rightChild); // removes it
       }
       else
-      // child must be created
+        // child must be created
       {
         if (o instanceof View)
         {
@@ -708,7 +708,7 @@ public class DawnResourceHelper
           EObject leftCollectionChild = getSameEObjectFromOtherResource(rightCollectionChild,
               (XMLResource)leftParent.eResource());
 
-          if (leftCollectionChild == null)// create
+          if (leftCollectionChild == null) // create
           {
             leftCollectionChild = DawnResourceHelper.createCopy(rightCollectionChild);
             leftCollection.add(leftCollectionChild);
@@ -731,7 +731,7 @@ public class DawnResourceHelper
       }
     }
     else
-    // create
+      // create
     {
       if (rightReferenceObject != null)
       {
@@ -819,7 +819,7 @@ public class DawnResourceHelper
 
   /**
    * checks if an element with element's id exists in the give resource
-   * 
+   *
    * @param res
    * @param element
    * @return true is the object with the same xmi id as element is contained in the given resource
@@ -944,7 +944,7 @@ public class DawnResourceHelper
 
   /**********************
    * finds EditPart from a View
-   * 
+   *
    * @param view
    * @param dawnDiagramEditor
    * @return find an Editpart for a view with the same xmi id
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java
index ac277996fd..90ae057857 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnDiagramEditingDomainFactory.java
@@ -75,8 +75,8 @@ public class DawnDiagramEditingDomainFactory extends DiagramEditingDomainFactory
     }
     WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
 
-    TransactionalEditingDomain result = new DawnDiagramEditingDomain(new ComposedAdapterFactory(
-        ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack);
+    TransactionalEditingDomain result = new DawnDiagramEditingDomain(
+        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack);
 
     mapResourceSet(result);
 
@@ -89,8 +89,8 @@ public class DawnDiagramEditingDomainFactory extends DiagramEditingDomainFactory
   {
     WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
 
-    TransactionalEditingDomain result = new DawnDiagramEditingDomain(new ComposedAdapterFactory(
-        ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, rset);
+    TransactionalEditingDomain result = new DawnDiagramEditingDomain(
+        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, rset);
 
     mapResourceSet(result);
     configure(result);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java
index debf3cf1d7..078b10888d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/transaction/DawnGMFEditingDomainFactory.java
@@ -55,8 +55,8 @@ public class DawnGMFEditingDomainFactory extends GMFEditingDomainFactory
     WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
     stack.setResourceUndoContextPolicy(getResourceUndoContextPolicy());
 
-    TransactionalEditingDomain result = new DawnTransactionalEditingDomainImpl(new ComposedAdapterFactory(
-        ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack);
+    TransactionalEditingDomain result = new DawnTransactionalEditingDomainImpl(
+        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack);
 
     mapResourceSet(result);
     // configures as the GMFEditingDomainFactory would do
@@ -78,8 +78,8 @@ public class DawnGMFEditingDomainFactory extends GMFEditingDomainFactory
     WorkspaceCommandStackImpl stack = new WorkspaceCommandStackImpl(history);
     stack.setResourceUndoContextPolicy(getResourceUndoContextPolicy());
 
-    TransactionalEditingDomain result = new DawnTransactionalEditingDomainImpl(new ComposedAdapterFactory(
-        ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, rset);
+    TransactionalEditingDomain result = new DawnTransactionalEditingDomainImpl(
+        new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), stack, rset);
 
     mapResourceSet(result);
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF
index e7fbc8b797..d08e195284 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.graphiti;singleton:=true
-Bundle-Version: 2.1.100.qualifier
+Bundle-Version: 2.1.200.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.graphiti.DawnGraphitiUIPlugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
@@ -21,9 +21,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.dawn.graphiti;version="2.1.100",
- org.eclipse.emf.cdo.dawn.graphiti.editors;version="2.1.100",
- org.eclipse.emf.cdo.dawn.graphiti.notifications;version="2.1.100",
- org.eclipse.emf.cdo.dawn.graphiti.util;version="2.1.100",
- org.eclipse.emf.cdo.dawn.graphiti.wizards;version="2.1.100"
+Export-Package: org.eclipse.emf.cdo.dawn.graphiti;version="2.1.200",
+ org.eclipse.emf.cdo.dawn.graphiti.editors;version="2.1.200",
+ org.eclipse.emf.cdo.dawn.graphiti.notifications;version="2.1.200",
+ org.eclipse.emf.cdo.dawn.graphiti.util;version="2.1.200",
+ org.eclipse.emf.cdo.dawn.graphiti.wizards;version="2.1.200"
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/DawnGraphitiUIPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/DawnGraphitiUIPlugin.java
index 40ed13cc6e..3f36ea2cc9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/DawnGraphitiUIPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/DawnGraphitiUIPlugin.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorInputFactory.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorInputFactory.java
index 765d333eee..f672e1d7fa 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorInputFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiDiagramEditorInputFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorInput.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorInput.java
index 9636b1e0e5..ee8b226883 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorInput.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorInput.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java
index b89907a7d4..d1b408e71f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/editors/DawnGraphitiEditorSupport.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -198,8 +198,8 @@ public class DawnGraphitiEditorSupport extends DawnAbstractEditorSupport
 
     DiagramEditor editor = (DiagramEditor)getEditor();
 
-    List<PictogramElement> pictogramElements = DawnGraphitiUtil.getPictgramElements(editor.getDiagramTypeProvider()
-        .getDiagram(), element);
+    List<PictogramElement> pictogramElements = DawnGraphitiUtil
+        .getPictgramElements(editor.getDiagramTypeProvider().getDiagram(), element);
 
     for (PictogramElement pictogramElement : pictogramElements)
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java
index 6a7a321e34..224b887ea0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -72,8 +72,8 @@ public class DawnGraphitiHandler extends BasicDawnTransactionHandler
 
     EObject element = CDOUtil.getEObject(cdoObject); // either semantic object or notational
 
-    List<PictogramElement> pictgramElements = DawnGraphitiUtil.getPictgramElements(((DiagramEditor)editor)
-        .getDiagramTypeProvider().getDiagram(), element);
+    List<PictogramElement> pictgramElements = DawnGraphitiUtil
+        .getPictgramElements(((DiagramEditor)editor).getDiagramTypeProvider().getDiagram(), element);
 
     GraphicalViewer graphicalViewer = ((DiagramEditor)editor).getGraphicalViewer();
 
@@ -207,7 +207,7 @@ public class DawnGraphitiHandler extends BasicDawnTransactionHandler
     // {
     // if (TRACER.isEnabled())
     // {
-    //        TRACER.format("Updating DiagramEditPart {0} ", ((DiagramEditor)editor).getDiagramEditPart()); //$NON-NLS-1$
+    // TRACER.format("Updating DiagramEditPart {0} ", ((DiagramEditor)editor).getDiagramEditPart()); //$NON-NLS-1$
     // }
     // DawnDiagramUpdater.refreshEditPart(((DiagramEditor)editor).getDiagramEditPart(), (DiagramDocumentEditor)editor);
     // }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiLockingHandler.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiLockingHandler.java
index 51646288f1..33575f2f0a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiLockingHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/notifications/DawnGraphitiLockingHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java
index e1bb7b8caf..fe2aefc211 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/util/DawnGraphitiUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/AbstractDawnGraphitiWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/AbstractDawnGraphitiWizardPage.java
index b7fa21a3f8..4a86b7b466 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/AbstractDawnGraphitiWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/AbstractDawnGraphitiWizardPage.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java
index 250d300b07..1bf8abc914 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnBasicGraphitiWizard.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -123,8 +123,8 @@ public class DawnBasicGraphitiWizard extends Wizard implements INewWizard
     URI diagramResourceURI = dawnDiagramModelFilePage.getURI();
     URI domainModelResourceURI = dawnDomainModelFilePage.getURI();
 
-    Diagram diagram = Graphiti.getPeCreateService()
-        .createDiagram(diagramTypeId, diagramResourceURI.lastSegment(), true);
+    Diagram diagram = Graphiti.getPeCreateService().createDiagram(diagramTypeId, diagramResourceURI.lastSegment(),
+        true);
 
     String editorID = DawnGraphitiDiagramEditor.ID;
 
@@ -135,7 +135,8 @@ public class DawnBasicGraphitiWizard extends Wizard implements INewWizard
     Resource diagramResource = createDiagramResource(diagramResourceURI, diagram, editingDomain);
 
     String providerId = GraphitiUi.getExtensionManager().getDiagramTypeProviderId(diagram.getDiagramTypeId());
-    DiagramEditorInput editorInput = new DawnGraphitiEditorInput(EcoreUtil.getURI(diagram), providerId, diagramResource);
+    DiagramEditorInput editorInput = new DawnGraphitiEditorInput(EcoreUtil.getURI(diagram), providerId,
+        diagramResource);
 
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnGenericGraphitiWizard.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnGenericGraphitiWizard.java
index 8f01b6c9cf..767f5bef30 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnGenericGraphitiWizard.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnGenericGraphitiWizard.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnGraphitiyDiagramTypeSelectionWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnGraphitiyDiagramTypeSelectionWizardPage.java
index a5b3dfc767..5ed961130c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnGraphitiyDiagramTypeSelectionWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.graphiti/src/org/eclipse/emf/cdo/dawn/graphiti/wizards/DawnGraphitiyDiagramTypeSelectionWizardPage.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java
index f7d6f08249..f52e3bbbaa 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java
@@ -55,18 +55,18 @@ public abstract class AbstractDawnTest extends AbstractCDOTest
     NotationPackage.eINSTANCE.getClass();
     String packageName = ePackage.getName();
     ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-        .put(packageName + "_diagram", new XMIResourceFactoryImpl());
+    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(packageName + "_diagram",
+        new XMIResourceFactoryImpl());
 
     resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(packageName, new XMIResourceFactoryImpl());
 
     URL resourceURI = GMFTest.class.getResource("");
     String resourcePath = resourceURI.toString().substring(0, resourceURI.toString().lastIndexOf("/bin"));
 
-    Resource emfResource = resourceSet.getResource(
-        URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName), true);
-    Resource gmfResource = resourceSet.getResource(
-        URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName + "_diagram"), true);
+    Resource emfResource = resourceSet
+        .getResource(URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName), true);
+    Resource gmfResource = resourceSet
+        .getResource(URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName + "_diagram"), true);
 
     EcoreUtil.resolveAll(emfResource);
     EcoreUtil.resolveAll(gmfResource);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java
index 8a664cf874..065977ef14 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 
 /**
  * This test suite should be executed as plain JUnit test.
- * 
+ *
  * @author Martin Fluegge
  */
 public class AllTestsDawn extends AllTests
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java
index 8387ccf55a..8594f5f24d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
 
 /**
  * This test suite should be executed as JUnit Plug-in test.
- * 
+ *
  * @author Martin Fluegge
  */
 public class AllTestsDawnUI extends AllTests
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotEMF.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotEMF.java
index 3fd684ade4..8fd853c1fe 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotEMF.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotEMF.java
@@ -20,18 +20,18 @@ import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * This test suite should be executed as SWTBot test.
- * 
+ *
  * @author Martin Fluegge
  * @formatter:off
  */
 @Deprecated
 @RunWith(Suite.class)
-@SuiteClasses({ 
+@SuiteClasses({
   DawnEMFCreationWizardTest.class,
   EMFEditorRollbackTest.class,
   DawnEMFHandleEditorTest.class
-   })
-   
+})
+
 public class AllTestsDawnUISWTBotEMF
 {
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotGMF.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotGMF.java
index 78e058c51c..e2147e9be0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotGMF.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotGMF.java
@@ -25,25 +25,25 @@ import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * This test suite should be executed as SWTBot test.
- * 
+ *
  * @author Martin Fluegge
  * @formatter:off
  */
 @Deprecated
 @RunWith(Suite.class)
-@SuiteClasses({ 
+@SuiteClasses({
   DawnPreferencesTest.class,
-  DawnCreationWizardSWTBotTest.class, 
-  SimpleDiagramTest.class, 
+  DawnCreationWizardSWTBotTest.class,
+  SimpleDiagramTest.class,
   MultipleResourcesTest.class,
   // MultipleResourcesDeletionTest.class,  //excluded because of ui freeze
   DawnProjectExplorerTest.class,
   ConflictTest.class,
   RollbackTest.class,
-  Bugzilla_321024_Test.class 
-   })
-   
-   
+  Bugzilla_321024_Test.class
+})
+
+
 public class AllTestsDawnUISWTBotGMF
 {
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java
index db06aafd72..938e39a04f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Martin Fluegge
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java
index c4fe1bdecb..cccd216460 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java
@@ -71,13 +71,14 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest
     assertEquals(true, new File(diagramFolder + "/providers/DawnAcoreEditPartProvider.java").exists());
     assertEquals(true, new File(diagramFolder + "/providers/DawnAcoreEditPolicyProvider.java").exists());
 
-    basicCompare(new File(new URI(DawnTestPlatform.instance.getBundlePathForClass(DawnAcoreDiagramEditor.class)
-        + ".dawn/src/")), new File(outputFolder + "/src"));
+    basicCompare(
+        new File(new URI(DawnTestPlatform.instance.getBundlePathForClass(DawnAcoreDiagramEditor.class) + ".dawn/src/")),
+        new File(outputFolder + "/src"));
   }
 
   /**
    * check whether the generated folder contains the same files as the reference editor
-   * 
+   *
    * @throws IOException
    */
   private void basicCompare(File reference, File expected) throws IOException
@@ -156,7 +157,8 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest
     {
       if (line.contains("AcoreDiagramEditorPlugin.getInstance().logInfo") || line.equals("") || line.startsWith("*")
           || line.equals("import org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin;")
-          | line.startsWith("/*") || line.startsWith("//") || line.contains("@"))
+              | line.startsWith("/*")
+          || line.startsWith("//") || line.contains("@"))
       {
         return false;
       }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java
index d008538feb..d2a35e5e26 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java
@@ -245,8 +245,8 @@ public class GMFTest extends AbstractCDOTest
     {
       ResourceSet resourceSet = new ResourceSetImpl();
       AcorePackage.eINSTANCE.eClass();
-      resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-          .put("acore_diagram", new XMIResourceFactoryImpl());
+      resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("acore_diagram",
+          new XMIResourceFactoryImpl());
 
       resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("acore", new XMIResourceFactoryImpl());
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java
index 011513876e..81cf9ddef3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 
 /**
  * This test tests the test framework itself.
- * 
+ *
  * @author Martin Fluegge
  */
 public class TestFrameworkTest extends AbstractDawnTest
@@ -43,8 +43,8 @@ public class TestFrameworkTest extends AbstractDawnTest
     CDOResource semanticResource = transaction.getResource("/simple.acore");
 
     assertInstanceOf(CDOResource.class, semanticResource);
-    DawnWrapperResource notationalResource = (DawnWrapperResource)resourceSet.getResource(
-        URI.createURI("dawn://repo1/simple.acore_diagram"), true);// container.getNotationalResource();
+    DawnWrapperResource notationalResource = (DawnWrapperResource)resourceSet
+        .getResource(URI.createURI("dawn://repo1/simple.acore_diagram"), true);// container.getNotationalResource();
     assertInstanceOf(DawnWrapperResource.class, notationalResource);
     ACoreRoot acoreRoot = (ACoreRoot)semanticResource.getContents().get(0);
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java
index 5da2984c7e..28d524febb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java
@@ -90,14 +90,13 @@ public class DawnCodeGenerationTest extends AbstractDawnUITest<SWTWorkbenchBot>
         DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnAcoreEditPartFactory.java"));
     assertEquals(true,
         DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnACoreRootEditPart.java"));
-    assertEquals(
-        true,
-        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder
-            + "/edit/policies/DawnACoreRootCanonicalEditPolicy.java"));
+    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment,
+        diagramFolder + "/edit/policies/DawnACoreRootCanonicalEditPolicy.java"));
 
     assertEquals(true,
         DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreCreationWizard.java"));
-    assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditor.java"));
+    assertEquals(true,
+        DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditor.java"));
     assertEquals(true,
         DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditorUtil.java"));
     assertEquals(true,
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
index 44d017893c..a91c469e91 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java
@@ -89,7 +89,8 @@ public class DawnAcoreTestUtil
     return openNewAcoreGMFEditor(diagramResourceName, diagramResourceName.replace("_diagram", ""), bot);
   }
 
-  public static SWTBotGefEditor openNewAcoreGMFEditor(String diagramResourceName, String semanticResource, SWTGefBot bot)
+  public static SWTBotGefEditor openNewAcoreGMFEditor(String diagramResourceName, String semanticResource,
+      SWTGefBot bot)
   {
     bot.menu("File").menu("New").menu("Other...").click();
 
@@ -132,7 +133,7 @@ public class DawnAcoreTestUtil
         try
         {
           PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage()
-              .openEditor(editorInput, editorID);
+          .openEditor(editorInput, editorID);
         }
         catch (PartInitException ex)
         {
@@ -302,8 +303,8 @@ public class DawnAcoreTestUtil
 
       IFigure figure = e.getFigure();
       Color color = ((LineBorder)figure.getBorder()).getColor();
-      return !(color.equals(DawnColorConstants.COLOR_LOCKED_REMOTELY) && color
-          .equals(DawnColorConstants.COLOR_LOCKED_LOCALLY));
+      return !(color.equals(DawnColorConstants.COLOR_LOCKED_REMOTELY)
+          && color.equals(DawnColorConstants.COLOR_LOCKED_LOCALLY));
     }
     return false;
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java
index 6fdb76d621..7530f50820 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
index 2456833b63..bee0b9b378 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java
@@ -100,7 +100,7 @@ public class DawnEcoreTestUtil
         try
         {
           PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage()
-              .openEditor(editorInput, editorID);
+          .openEditor(editorInput, editorID);
         }
         catch (PartInitException ex)
         {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java
index 7eb0f8694b..595876b44c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java
@@ -167,7 +167,7 @@ public class DawnSWTBotEMFEditor extends SWTBotEditor
   }
 
   protected void setActivePage(final MultiPageEditorPart editor, final int i) throws SecurityException,
-      NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
+  NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
   {
     editor.getSite().getShell().getDisplay().syncExec(new Runnable()
     {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
index 8881c892ab..2ee5af1a90 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
@@ -118,7 +118,7 @@ public class DawnSWTBotUtil
   public static List<SWTBotGefEditPart> getAllEditParts(SWTBotGefEditor editor)
   {
     List<SWTBotGefEditPart> editParts = editor.editParts(new AbstractMatcher<EditPart>()
-        {
+    {
       @Override
       protected boolean doMatch(Object item)
       {
@@ -128,7 +128,7 @@ public class DawnSWTBotUtil
       public void describeTo(Description description)
       {
       }
-        });
+    });
     return editParts;
   }
 
@@ -140,7 +140,7 @@ public class DawnSWTBotUtil
 
   public static List<SWTBotGefEditPart> getConnectionEditParts(SWTBotGefEditor editor, Class<? extends EditPart> clazz,
       List<SWTBotGefEditPart> editParts)
-      {
+  {
 
     List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>();
     for (SWTBotGefEditPart editPart : editParts)
@@ -155,7 +155,7 @@ public class DawnSWTBotUtil
       }
     }
     return ret;
-      }
+  }
 
   static Object monitor = new Object();
 
@@ -165,7 +165,7 @@ public class DawnSWTBotUtil
   public static List<SWTBotGefEditPart> getAllConnections(final SWTBotGefEditor editor)
   {
     AbstractMatcher<EditPart> matcher = new AbstractMatcher<EditPart>()
-        {
+    {
       @Override
       protected boolean doMatch(Object item)
       {
@@ -175,16 +175,16 @@ public class DawnSWTBotUtil
       public void describeTo(Description description)
       {
       }
-        };
-        List<SWTBotGefEditPart> aClassEditParts = editor.editParts(matcher);
+    };
+    List<SWTBotGefEditPart> aClassEditParts = editor.editParts(matcher);
 
-        List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>();
+    List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>();
 
-        for (SWTBotGefEditPart editPart : aClassEditParts)
-        {
-          ret.addAll(editPart.sourceConnections());
-        }
-        return ret;
+    for (SWTBotGefEditPart editPart : aClassEditParts)
+    {
+      ret.addAll(editPart.sourceConnections());
+    }
+    return ret;
   }
 
   public static Node createNewNodeRemote(Diagram diagram, AClass newAClass, String type)
@@ -322,7 +322,7 @@ public class DawnSWTBotUtil
     }
 
     final MenuItem menuItem = UIThreadRunnable.syncExec(new WidgetResult<MenuItem>()
-        {
+    {
       public MenuItem run()
       {
         MenuItem menuItem = null;
@@ -339,7 +339,7 @@ public class DawnSWTBotUtil
 
         return menuItem;
       }
-        });
+    });
     if (menuItem == null)
     {
       throw new WidgetNotFoundException("Could not find menu: " + Arrays.asList(texts));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
index 01dd0c264a..e4c701537e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ui;singleton:=true
-Bundle-Version: 2.0.200.qualifier
+Bundle-Version: 2.0.300.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.internal.ui.bundle.OM$Activator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -14,14 +14,14 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="2.0.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.ui;version="2.0.200",
- org.eclipse.emf.cdo.dawn.ui.composites;version="2.0.200",
- org.eclipse.emf.cdo.dawn.ui.handlers;version="2.0.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.ui.helper;version="2.0.200",
- org.eclipse.emf.cdo.dawn.ui.icons;version="2.0.200",
- org.eclipse.emf.cdo.dawn.ui.messages;version="2.0.200",
- org.eclipse.emf.cdo.dawn.ui.stylizer;version="2.0.200",
- org.eclipse.emf.cdo.dawn.ui.views;version="2.0.200",
- org.eclipse.emf.cdo.dawn.ui.wizards;version="2.0.200",
- org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="2.0.200"
+Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="2.0.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.ui;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.ui.composites;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.ui.handlers;version="2.0.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.ui.helper;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.ui.icons;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.ui.messages;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.ui.stylizer;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.ui.views;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.ui.wizards;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="2.0.300"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnColorConstants.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnColorConstants.java
index c864257e09..aff466be85 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnColorConstants.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnColorConstants.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnLabelProvider.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnLabelProvider.java
index bc2afcb217..6b373cd1e6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnLabelProvider.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnSelectionViewerAdapterFactoryContentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnSelectionViewerAdapterFactoryContentProvider.java
index b85aaac4a5..0230b62811 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnSelectionViewerAdapterFactoryContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/DawnSelectionViewerAdapterFactoryContentProvider.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/IDawnEditorInput.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/IDawnEditorInput.java
index 61a1a9aeb1..aee9e3a9a7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/IDawnEditorInput.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/IDawnEditorInput.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SelectionHandler.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SelectionHandler.java
index 64d0b59f42..2bc426d4af 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SelectionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SelectionHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/helper/EditorDescriptionHelper.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/helper/EditorDescriptionHelper.java
index 7c00564edd..d309ddf7f0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/helper/EditorDescriptionHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/helper/EditorDescriptionHelper.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/icons/DawnIconRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/icons/DawnIconRegistry.java
index 1bbe0eb152..ad9258c62f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/icons/DawnIconRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/icons/DawnIconRegistry.java
@@ -22,7 +22,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
 /**
  * Based on the implementation from org.eclipse.emf.cdo.ui.shared.SharedIcons. TODO clarify with Eike whether we could
  * provide a better extensibility.
- * 
+ *
  * @author Martin Fluegge
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/messages/Messages.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/messages/Messages.java
index 51e5e5204f..1f5985c5b6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -37,6 +37,7 @@ public class Messages extends NLS
   public static String DawnCreateNewResourceWizardPage_6;
 
   public static String DawnCreateNewResourceWizardPage_8;
+
   static
   {
     // initialize resource bundle
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnDefaultElementStylizer.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnDefaultElementStylizer.java
index 579f5e5d34..3677b1e31f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnDefaultElementStylizer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnDefaultElementStylizer.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java
index ef14de792d..4598410667 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java
@@ -26,7 +26,7 @@ import java.util.Map;
 
 /**
  * This registry provides the DawnElementStylizer implementation for a given object.
- * 
+ *
  * @see org.eclipse.emf.cdo.dawn.appearance.DawnElementStylizer
  * @author Martin Fluegge
  * @since 2.0
@@ -103,8 +103,8 @@ public class DawnElementStylizerRegistry
   {
     try
     {
-      IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(
-          DAWN_STYLIZER_FACTORY_EXTENSION_POINT_ID);
+      IConfigurationElement[] config = Platform.getExtensionRegistry()
+          .getConfigurationElementsFor(DAWN_STYLIZER_FACTORY_EXTENSION_POINT_ID);
       for (IConfigurationElement e : config)
       {
         String factoryClassName = e.getAttribute(ATTRIIBUTE_FACTORY);
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnItemProvider.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnItemProvider.java
index 87d1c019b0..79001dcae8 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnItemProvider.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  *     Christian W. Damus (CEA) - bug 404043: contents of views not shown in Dawn Explorer
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
index fd1424ea12..0cf1d943db 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -35,6 +35,6 @@ public class DawnCreateNewDiagramResourceWizardPage extends DawnCreateNewResourc
   {
     // TODO check why the dawn resource must be connected this way
     return URI.createURI("dawn://" + PreferenceConstants.getRepositoryName() + "/" + chooserComposite.getResourcePath()
-        + "/" + chooserComposite.getResourceName());
+    + "/" + chooserComposite.getResourceName());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewResourceWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewResourceWizardPage.java
index 5d1b7af1e4..fb27a0ca4c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewResourceWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewResourceWizardPage.java
@@ -46,7 +46,7 @@ public class DawnCreateNewResourceWizardPage extends WizardPage
 
   private final CDOView view;
 
-  //private String resourceNamePrefix = "default"; //$NON-NLS-1$
+  // private String resourceNamePrefix = "default"; //$NON-NLS-1$
 
   private boolean createAutomaticResourceName;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF
index 38f5321261..b5fbe9c447 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.util;singleton:=true
-Bundle-Version: 2.0.200.qualifier
+Bundle-Version: 2.0.300.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.internal.util.bundle.OM$Activator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn.internal.util.bundle;version="2.0.200",
- org.eclipse.emf.cdo.dawn.util.connection;version="2.0.200",
- org.eclipse.emf.cdo.dawn.util.exceptions;version="2.0.200"
+Export-Package: org.eclipse.emf.cdo.dawn.internal.util.bundle;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.util.connection;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.util.exceptions;version="2.0.300"
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java
index efed15cc0a..b64529f700 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java
@@ -96,8 +96,8 @@ public class CDOConnectionUtil
    */
   public CDOSession openSession()
   {
-    currentSession = (CDOSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions", "cdo", protocol
-        + "://" + host + "?repositoryName=" + repositoryName);
+    currentSession = (CDOSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions", "cdo",
+        protocol + "://" + host + "?repositoryName=" + repositoryName);
 
     return currentSession;
   }
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/exceptions/DawnInvalidIdException.java b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/exceptions/DawnInvalidIdException.java
index ebc13b0c82..1221f1de59 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/exceptions/DawnInvalidIdException.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/exceptions/DawnInvalidIdException.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/exceptions/EClassIncompatibleException.java b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/exceptions/EClassIncompatibleException.java
index 36e186ef63..1f1152820e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/exceptions/EClassIncompatibleException.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/exceptions/EClassIncompatibleException.java
@@ -4,9 +4,9 @@
  * 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:
- *     Martin Flüuege - initial API and implementation
+ *     Martin Fl�uege - initial API and implementation
  */
 package org.eclipse.emf.cdo.dawn.util.exceptions;
 
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java
index 34c445b8af..e5663eb9a9 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java
@@ -27,7 +27,7 @@ import org.eclipse.ui.IWorkbenchPart;
 /**
  * Since Dawn 0.2 this class is deprecated and replaced with "org.eclipse.emf.cdo.dawn.handlers.SolveConflictHandler".
  * It will be removed soon.
- * 
+ *
  * @author Martin Fluegge
  */
 @Deprecated
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java
index 57ddde377e..2242202213 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -18,7 +18,7 @@ import org.eclipse.swt.graphics.Image;
 /**
  * This interface is used do influence the appearance of an UI element by a certain state. Implementations allow to
  * change the appearance for the adapted types of editors.
- * 
+ *
  * @author Martin Fluegge
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/IDawnElementStylizerFactory.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/IDawnElementStylizerFactory.java
index 53f316e39a..c8fa122080 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/IDawnElementStylizerFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/IDawnElementStylizerFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java
index d08cb37b12..8f34bf46a4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java
@@ -28,8 +28,8 @@ public class CreateSemanticResourceRecordingCommand extends RecordingCommand
 
   private final String resourcePath;
 
-  public CreateSemanticResourceRecordingCommand(TransactionalEditingDomain editingDomain,
-      CDOTransaction cdoTransaction, String resourcePath)
+  public CreateSemanticResourceRecordingCommand(TransactionalEditingDomain editingDomain, CDOTransaction cdoTransaction,
+      String resourcePath)
   {
     super(editingDomain);
     this.cdoTransaction = cdoTransaction;
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java
index c139042cab..3b130c543d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -20,7 +20,7 @@ import java.util.Set;
 /**
  * Since Dawn 2.0 this interface is deprecated and will be removed soon. Because it was never really used, there will be
  * no surragote.
- * 
+ *
  * @author Martin Fluegge
  */
 @Deprecated
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditor.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditor.java
index b944a7907a..e28c44808b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditor.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditorSupport.java
index 51faf05327..fd28b26456 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditorSupport.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnAbstractEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnAbstractEditorSupport.java
index 1d8635b6d4..4e06d91da6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnAbstractEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnAbstractEditorSupport.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -69,7 +69,7 @@ public abstract class DawnAbstractEditorSupport implements IDawnEditorSupport
    * <li>getLockingHandler()</li>
    * </ul>
    * If one of these methods returns null the specific handler will not be registered and activated.
-   * 
+   *
    * @see #getBasicHandler()
    * @see #getLockingHandler()
    * @since 2.0
@@ -107,7 +107,7 @@ public abstract class DawnAbstractEditorSupport implements IDawnEditorSupport
   /**
    * Subclasses must implement this method to deliver a IDawnListener that implements the behavior for Session
    * invalidations. If the method returns null, the handler will not be registered.
-   * 
+   *
    * @since 2.0
    */
   protected abstract BasicDawnListener getBasicHandler();
@@ -115,7 +115,7 @@ public abstract class DawnAbstractEditorSupport implements IDawnEditorSupport
   /**
    * Subclasses must implement this method to deliver a IDawnListener that implements the behavior for remote locking
    * notifications. If the method returns null, the handler will not be registered.
-   * 
+   *
    * @since 2.0
    */
   protected abstract BasicDawnListener getLockingHandler();
@@ -123,7 +123,7 @@ public abstract class DawnAbstractEditorSupport implements IDawnEditorSupport
   /**
    * Subclasses must implement this method to deliver a CDOTransactionHandlerBase that implements the behavior for
    * remote changes notifications. If the method returns null, the handler will not be registered.
-   * 
+   *
    * @since 2.0
    */
   protected abstract CDOTransactionHandlerBase getTransactionHandler();
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/helper/DawnEditorHelper.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/helper/DawnEditorHelper.java
index 5a72fc759c..387fd9372b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/helper/DawnEditorHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/helper/DawnEditorHelper.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
@@ -19,14 +19,14 @@ import org.eclipse.ui.PlatformUI;
 
 /**
  * TODO move this one to the dawn.util bundle
- * 
+ *
  * @author Martin Fluegge
  */
 public class DawnEditorHelper
 {
   /**
    * Delivers the active shell from the current display.
-   * 
+   *
    * @return the active shell on the current display
    */
   public static Shell getActiveShell()
@@ -37,7 +37,7 @@ public class DawnEditorHelper
 
   /**
    * This method returns the active editor from the active workbench page
-   * 
+   *
    * @return the active editor from the active workbench page or null if there is none
    */
   public static IEditorPart getActiveEditor()
@@ -58,7 +58,7 @@ public class DawnEditorHelper
   /**
    * This method tries to retrieve a Display. First it tries to get the current display. If this fails it will return
    * the default display.
-   * 
+   *
    * @return the current display, if not null. If the current Display is null then the default Display.
    * @since 2.0
    */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java
index 1bc086f5e4..73c21e9cc7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnTransactionHandler.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnTransactionHandler.java
index c1a16149be..b15151f85e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnTransactionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnTransactionHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnListener.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnListener.java
index 451031991d..befc4a9a51 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnListener.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnListener.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -35,14 +35,14 @@ public interface IDawnListener extends IListener
 
   /**
    * Allows the user to react on lock change notifications:
-   * 
+   *
    * @since 2.0
    */
   public void handleLocksChangedEvent(CDOViewLocksChangedEvent event);
 
   /**
    * This method typically will be called for unprocessed events.
-   * 
+   *
    * @since 2.0
    */
   public void handleEvent(IEvent event);
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnTransactionHandler.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnTransactionHandler.java
index 19b711a62c..fe4ee6fd6a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnTransactionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnTransactionHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceConstants.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceConstants.java
index 51c01bf58e..508924340f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceConstants.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceConstants.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceInitializer.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceInitializer.java
index 8058eff601..8de439b49e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceInitializer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceInitializer.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java
index ba84c60f44..0bdfb9de90 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java
index 2c28fbadc6..8143ace25b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java
@@ -4,7 +4,7 @@
  * 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:
  *     Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java
index 0e5280bbab..43dfcf1c21 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java
@@ -30,7 +30,7 @@ import java.util.Map;
 /**
  * This class wrapper CDOResource and combines it with a XMLResource to avoid problems with all frameworks which are
  * internally using an XMLResource
- * 
+ *
  * @author Martin Fluegge
  */
 public class DawnWrapperResourceImpl extends CDOResourceImpl implements DawnWrapperResource
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/DawnState.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/DawnState.java
index f47c69148d..6fba617bd5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/DawnState.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/DawnState.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnEditingSupport.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnEditingSupport.java
index 0157fa9cca..2b62594f72 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnEditingSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnEditingSupport.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
@@ -19,7 +19,7 @@ import java.util.Map;
  * The IDawnEditingSupport is the direct connection the the Dawn Runtime. Service Providers must implement this
  * interface to react on repository changes or local data manipulation. For implementation example @see
  * org.eclipse.emf.cdo.dawn.gmf.editors.impl.DawnGMFEditorSupport.
- * 
+ *
  * @author Martin Fluegge
  * @since 2.0
  */
@@ -33,7 +33,7 @@ public interface IDawnEditingSupport
 
   /**
    * Returns the dirty state of the UI element.
-   * 
+   *
    * @return true if the specific parts of the model that should be reflected as dirty to the UI are dirty, else
    *         otherwise.
    */
@@ -62,21 +62,21 @@ public interface IDawnEditingSupport
   /**
    * Implementations must process all operations that are need to provide a clean rollback. This includes the rollback
    * on the repository site and the refreshing of the user interface.
-   * 
+   *
    * @since 1.0
    */
   public void rollback();
 
   /**
    * Refreshes the internal components of the IDawnEditor
-   * 
+   *
    * @since 2.0
    */
   public void refresh();
 
   /**
    * Locks the objects
-   * 
+   *
    * @since 2.0
    */
   public void lockObjects(List<Object> objectsToBeLocked);
@@ -88,7 +88,7 @@ public interface IDawnEditingSupport
 
   /**
    * Unlocks the objects
-   * 
+   *
    * @since 2.0
    */
   public void unlockObjects(List<Object> objectsToBeLocked);
@@ -101,7 +101,7 @@ public interface IDawnEditingSupport
   /**
    * Implementations must handle all operations which are necessary on remotely locked objects, like disabling them,
    * providing specific markers, like colors or icons, and so on.
-   * 
+   *
    * @since 2.0
    */
   public void handleRemoteLockChanges(Map<Object, DawnState> changedObjects);
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnUIElement.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnUIElement.java
index a305cd9dbb..491f48cc63 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnUIElement.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnUIElement.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Fluegge - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java
index afc738b826..07e613aafc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java
@@ -36,8 +36,8 @@ public class DawnTransactionChangeRecorder extends TransactionChangeRecorder
   @Override
   public void notifyChanged(Notification notification)
   {
-    if (!(notification.getOldValue() instanceof ResourceSet && notification.getNewValue() == null && notification
-        .getEventType() == Notification.SET))
+    if (!(notification.getOldValue() instanceof ResourceSet && notification.getNewValue() == null
+        && notification.getEventType() == Notification.SET))
     {
       if (!(notification instanceof CDODeltaNotification))
       {
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java
index 61d153301f..9f7eb313d5 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java
index c2f7b3779a..48fd41fe40 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolProviderDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolProviderDef.java
index e56476255e..fd4a7a5df4 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolProviderDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolProviderDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.net4j.defs.ProtocolProviderDef;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Client Protocol Provider Def</b></em>'. <!--
  * end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.cdodefs.CdodefsPackage#getCDOClientProtocolProviderDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java
index 92f23e2d27..7196571e7e 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -71,7 +71,7 @@ public interface CDODefsFactory extends EFactory
   /**
    * Returns a new object of class '<em>CDO Eager Package Registry Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>CDO Eager Package Registry Def</em>'.
    * @generated
    */
@@ -80,7 +80,7 @@ public interface CDODefsFactory extends EFactory
   /**
    * Returns a new object of class '<em>CDO Lazy Package Registry Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>CDO Lazy Package Registry Def</em>'.
    * @generated
    */
@@ -105,7 +105,7 @@ public interface CDODefsFactory extends EFactory
   /**
    * Returns a new object of class '<em>CDO Client Protocol Factory Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>CDO Client Protocol Factory Def</em>'.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java
index c8b964337d..95c6960d29 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -66,7 +66,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl <em>CDO View Def</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOViewDef()
    * @generated
@@ -84,7 +84,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>CDO View Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -144,7 +144,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>CDO Audit Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -303,7 +303,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>EPackage Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -432,7 +432,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.defs.ResourceMode <em>Resource Mode</em>}' enum. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.defs.ResourceMode
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getResourceMode()
    * @generated
@@ -442,7 +442,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOViewDef <em>CDO View Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>CDO View Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOViewDef
    * @generated
@@ -471,7 +471,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOAuditDef <em>CDO Audit Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>CDO Audit Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOAuditDef
    * @generated
@@ -491,7 +491,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOSessionDef <em>CDO Session Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>CDO Session Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef
    * @generated
@@ -579,7 +579,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EPackageDef <em>EPackage Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>EPackage Def</em>'.
    * @see org.eclipse.emf.cdo.defs.EPackageDef
    * @generated
@@ -636,7 +636,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOResourceDef <em>CDO Resource Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>CDO Resource Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOResourceDef
    * @generated
@@ -676,7 +676,7 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for enum '{@link org.eclipse.emf.cdo.defs.ResourceMode <em>Resource Mode</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for enum '<em>Resource Mode</em>'.
    * @see org.eclipse.emf.cdo.defs.ResourceMode
    * @generated
@@ -800,7 +800,7 @@ public interface CDODefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Packages</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CDO_PACKAGE_REGISTRY_DEF__PACKAGES = eINSTANCE.getCDOPackageRegistryDef_Packages();
@@ -911,7 +911,7 @@ public interface CDODefsPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.ResourceMode <em>Resource Mode</em>}' enum. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.defs.ResourceMode
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getResourceMode()
      * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java
index f54b71b1c3..f1df491091 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java
index cadf7d5143..bc482d5bfd 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java
index 2c41b0bfb9..8f4715d43e 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java
index a789391354..792b37da8d 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -24,7 +24,7 @@ import org.eclipse.net4j.util.defs.Def;
  * <li>{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getPath <em>Path</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOResourceDef()
  * @model
  * @generated
@@ -103,7 +103,7 @@ public interface CDOResourceDef extends Def
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getPath <em>Path</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Path</em>' attribute.
    * @see #getPath()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java
index 140bce016b..0da413c259 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOTransactionDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOTransactionDef.java
index 553d064d0c..555dee2d59 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOTransactionDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOTransactionDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Transaction Def</b></em>'. <!-- end-user-doc
  * -->
- * 
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOTransactionDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java
index 9d9dbab6c5..7c4f4c35b0 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java
index 30ac3ece7d..481dcb7af8 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java
index eb1a22c892..14bf8ace47 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java
index 202993e0c5..cd36c7dd51 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -47,7 +47,7 @@ public interface EPackageDef extends Def
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Ns URI</em>' attribute.
    * @see #getNsURI()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java
index 70ab663653..3352e38f41 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -31,7 +31,7 @@ public enum ResourceMode implements Enumerator
 {
   /**
    * The '<em><b>GET</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #GET_VALUE
    * @generated NOT
    * @ordered
@@ -48,7 +48,7 @@ public enum ResourceMode implements Enumerator
 
   /**
    * The '<em><b>CREATE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #CREATE_VALUE
    * @generated NOT
    * @ordered
@@ -64,7 +64,7 @@ public enum ResourceMode implements Enumerator
 
   /**
    * The '<em><b>GET OR CREATE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #GET_OR_CREATE_VALUE
    * @generated NOT
    * @ordered
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
index f44101714a..185846677b 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
@@ -93,8 +93,10 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
     Date oldTimeStamp = timeStamp;
     timeStamp = newTimeStamp;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP, oldTimeStamp,
           timeStamp));
+    }
   }
 
   /**
@@ -167,7 +169,9 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (timeStamp: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java
index 6818472d90..a88fbf375d 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java
@@ -27,8 +27,7 @@ import org.eclipse.emf.ecore.EClass;
  *
  * @generated
  */
-public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImpl implements
-    CDOClientProtocolFactoryDef
+public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImpl implements CDOClientProtocolFactoryDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
index 1ee96860d3..64904dc5a2 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
@@ -259,8 +259,10 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
   {
     ResourceMode result = ResourceMode.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
index 268455f794..f243635791 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -128,7 +128,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#eNS_URI
    * @see #init()
@@ -147,7 +147,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link CDODefsPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -160,11 +160,14 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
   public static CDODefsPackage init()
   {
     if (isInited)
+    {
       return (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new CDODefsPackageImpl());
+    CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new CDODefsPackageImpl());
 
     isInited = true;
 
@@ -434,7 +437,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -493,7 +498,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -513,24 +520,24 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
     // Add supertypes to classes
     cdoViewDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    cdoTransactionDefEClass.getESuperTypes().add(this.getCDOViewDef());
-    cdoAuditDefEClass.getESuperTypes().add(this.getCDOViewDef());
+    cdoTransactionDefEClass.getESuperTypes().add(getCDOViewDef());
+    cdoAuditDefEClass.getESuperTypes().add(getCDOViewDef());
     cdoSessionDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
     cdoPackageRegistryDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    cdoEagerPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
-    cdoLazyPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
+    cdoEagerPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef());
+    cdoLazyPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef());
     ePackageDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    eDynamicPackageDefEClass.getESuperTypes().add(this.getEPackageDef());
-    eGlobalPackageDefEClass.getESuperTypes().add(this.getEPackageDef());
+    eDynamicPackageDefEClass.getESuperTypes().add(getEPackageDef());
+    eGlobalPackageDefEClass.getESuperTypes().add(getEPackageDef());
     cdoClientProtocolFactoryDefEClass.getESuperTypes().add(theNet4jDefsPackage.getClientProtocolFactoryDef());
     cdoResourceDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
 
     // Initialize classes and features; add operations and parameters
     initEClass(cdoViewDefEClass, CDOViewDef.class, "CDOViewDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOViewDef_CdoSessionDef(), this.getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1,
-        CDOViewDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCDOViewDef_CdoSessionDef(), getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1,
+        CDOViewDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(cdoTransactionDefEClass, CDOTransactionDef.class, "CDOTransactionDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
@@ -548,16 +555,16 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
     initEAttribute(getCDOSessionDef_RepositoryName(), ecorePackage.getEString(), "repositoryName", null, 1, 1,
         CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
         !IS_DERIVED, !IS_ORDERED);
-    initEReference(getCDOSessionDef_CdoPackageRegistryDef(), this.getCDOPackageRegistryDef(), null,
-        "cdoPackageRegistryDef", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCDOSessionDef_LegacySupportEnabled(), ecorePackage.getEBoolean(), "legacySupportEnabled",
-        "false", 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCDOSessionDef_CdoPackageRegistryDef(), getCDOPackageRegistryDef(), null, "cdoPackageRegistryDef",
+        null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOSessionDef_LegacySupportEnabled(), ecorePackage.getEBoolean(), "legacySupportEnabled", "false",
+        1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(cdoPackageRegistryDefEClass, CDOPackageRegistryDef.class, "CDOPackageRegistryDef", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOPackageRegistryDef_Packages(), this.getEPackageDef(), null, "packages", null, 0, -1,
+    initEReference(getCDOPackageRegistryDef_Packages(), getEPackageDef(), null, "packages", null, 0, -1,
         CDOPackageRegistryDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -586,10 +593,10 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
     initEClass(cdoResourceDefEClass, CDOResourceDef.class, "CDOResourceDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOResourceDef_CdoTransaction(), this.getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1,
+    initEReference(getCDOResourceDef_CdoTransaction(), getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1,
         CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCDOResourceDef_ResourceMode(), this.getResourceMode(), "resourceMode", "null", 1, 1,
+    initEAttribute(getCDOResourceDef_ResourceMode(), getResourceMode(), "resourceMode", "null", 1, 1,
         CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOResourceDef_Path(), ecorePackage.getEString(), "path", null, 1, 1, CDOResourceDef.class,
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java
index c82fa930b0..fe9e4237d1 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -47,7 +47,7 @@ public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl im
 
   /**
    * Creates a {@link Eager}.
-   * 
+   *
    * @return the CDO package registry
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java
index 85d9c8b8c4..d7bc9359f2 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -47,7 +47,7 @@ public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl imp
 
   /**
    * Creates a {@link Lazy}.
-   * 
+   *
    * @return the CDO package registry
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java
index 0dc1f8295f..e358262eb5 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -51,7 +51,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @generated
    */
   protected CDOPackageRegistryDefImpl()
@@ -61,7 +61,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @return the e class
    * @generated
    */
@@ -73,7 +73,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @return the packages
    * @generated
    */
@@ -89,7 +89,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @param otherEnd
    *          the other end
    * @param featureID
@@ -112,7 +112,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @param featureID
    *          the feature id
    * @param resolve
@@ -135,7 +135,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @param featureID
    *          the feature id
    * @param newValue
@@ -158,7 +158,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @param featureID
    *          the feature id
    * @generated
@@ -177,7 +177,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @param featureID
    *          the feature id
    * @return true, if e is set
@@ -196,7 +196,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * Creates the instance.
-   * 
+   *
    * @return the CDO package registry
    */
   @Override
@@ -209,7 +209,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * Adds the packages.
-   * 
+   *
    * @param packageRegistry
    *          the package registry
    * @return the e package. registry
@@ -225,7 +225,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * Adds the given {@link EPackage} within the supplied <tt>definition<tt> to the given <tt>CDOPackageRegistry<tt> .
-   * 
+   *
    * @param ePackageDef
    *          the ePackage definition
    * @param packageRegistry
@@ -239,7 +239,7 @@ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegi
 
   /**
    * Adds the given {@link EPackage} within the supplied <tt>definition<tt> to the given <tt>CDOPackageRegistry<tt> .
-   * 
+   *
    * @param ePackageDef
    *          the ePackage definition
    * @param packageRegistry
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
index f55a4708e9..36cfbb4a95 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
@@ -37,7 +37,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl#getCdoTransaction <em>Cdo Transaction</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
@@ -56,7 +56,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   /**
    * The default value of the '{@link #getResourceMode() <em>Resource Mode</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @see #getResourceMode()
    * @generated NOT
    * @ordered
@@ -76,7 +76,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   /**
    * The default value of the '{@link #getPath() <em>Path</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getPath()
    * @generated
    * @ordered
@@ -124,8 +124,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
       if (cdoTransaction != oldCdoTransaction)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION,
               oldCdoTransaction, cdoTransaction));
+        }
       }
     }
     return cdoTransaction;
@@ -149,8 +151,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     CDOTransactionDef oldCdoTransaction = cdoTransaction;
     cdoTransaction = newCdoTransaction;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION,
           oldCdoTransaction, cdoTransaction));
+    }
   }
 
   /**
@@ -171,8 +175,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     ResourceMode oldResourceMode = resourceMode;
     resourceMode = newResourceMode == null ? RESOURCE_MODE_EDEFAULT : newResourceMode;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE,
           oldResourceMode, resourceMode));
+    }
   }
 
   /**
@@ -193,7 +199,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     String oldPath = path;
     path = newPath;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__PATH, oldPath, path));
+    }
   }
 
   /**
@@ -207,7 +215,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     {
     case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
       if (resolve)
+      {
         return getCdoTransaction();
+      }
       return basicGetCdoTransaction();
     case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
       return getResourceMode();
@@ -288,7 +298,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (resourceMode: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
index c12bc4e83d..d807b4bab1 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
@@ -43,7 +43,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
@@ -89,7 +89,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   /**
    * The cached value of the '{@link #getCdoPackageRegistryDef() <em>Cdo Package Registry Def</em>}' reference. <!--
    * begin-user-doc -->
-   * 
+   *
    * @since 3.0 <!-- end-user-doc -->
    * @see #getCdoPackageRegistryDef()
    * @generated
@@ -100,7 +100,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   /**
    * The default value of the '{@link #isLegacySupportEnabled() <em>Legacy Support Enabled</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isLegacySupportEnabled()
    * @generated
    * @ordered
@@ -110,7 +110,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   /**
    * The cached value of the '{@link #isLegacySupportEnabled() <em>Legacy Support Enabled</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isLegacySupportEnabled()
    * @generated
    * @ordered
@@ -149,8 +149,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (connectorDef != oldConnectorDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
               oldConnectorDef, connectorDef));
+        }
       }
     }
     return connectorDef;
@@ -169,7 +171,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
    * <!-- begin-user-doc --> Sets the {@link ConnectorDef} for this {@link CDOSessionDef}. If a
    * {@link FailOverStrategyDef} was already set, an IllegalStateException is thrown. ConnectorDef and
    * FailOverStrategyDef are mutually exclusive.
-   * 
+   *
    * @throws IllegalStateException
    *           if a {@link FailOverStrategyDef} was set before
    * @see CDOSessionConfigurationImpl#openSession() <!-- end-user-doc -->
@@ -191,8 +193,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldConnectorDefESet = connectorDefESet;
     connectorDefESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
           oldConnectorDef, connectorDef, !oldConnectorDefESet));
+    }
   }
 
   /**
@@ -206,8 +210,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     connectorDef = null;
     connectorDefESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
           oldConnectorDef, null, oldConnectorDefESet));
+    }
   }
 
   /**
@@ -237,8 +243,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     String oldRepositoryName = repositoryName;
     repositoryName = newRepositoryName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME,
           oldRepositoryName, repositoryName));
+    }
   }
 
   /**
@@ -254,8 +262,11 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (cdoPackageRegistryDef != oldCdoPackageRegistryDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef));
+              CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef,
+              cdoPackageRegistryDef));
+        }
       }
     }
     return cdoPackageRegistryDef;
@@ -279,8 +290,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     CDOPackageRegistryDef oldCdoPackageRegistryDef = cdoPackageRegistryDef;
     cdoPackageRegistryDef = newCdoPackageRegistryDef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF,
           oldCdoPackageRegistryDef, cdoPackageRegistryDef));
+    }
   }
 
   /**
@@ -301,8 +314,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldLegacySupportEnabled = legacySupportEnabled;
     legacySupportEnabled = newLegacySupportEnabled;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED,
           oldLegacySupportEnabled, legacySupportEnabled));
+    }
   }
 
   /**
@@ -316,13 +331,17 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     {
     case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
       if (resolve)
+      {
         return getConnectorDef();
+      }
       return basicGetConnectorDef();
     case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
       return getRepositoryName();
     case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
       if (resolve)
+      {
         return getCdoPackageRegistryDef();
+      }
       return basicGetCdoPackageRegistryDef();
     case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
       return isLegacySupportEnabled();
@@ -392,8 +411,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
       return isSetConnectorDef();
     case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
-      return REPOSITORY_NAME_EDEFAULT == null ? repositoryName != null : !REPOSITORY_NAME_EDEFAULT
-          .equals(repositoryName);
+      return REPOSITORY_NAME_EDEFAULT == null ? repositoryName != null
+          : !REPOSITORY_NAME_EDEFAULT.equals(repositoryName);
     case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
       return cdoPackageRegistryDef != null;
     case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
@@ -410,7 +429,9 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (repositoryName: ");
@@ -440,7 +461,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   protected void validateDefinition()
   {
     CheckUtil.checkState //
-        (eIsSet(CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME), "repository name not set yet!");
+    (eIsSet(CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME), "repository name not set yet!");
     /*
      * failoverStrategy and connector are mutually exclusive
      * @see CDOSessionConfiguration#openSession
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java
index 49cba2bf21..c20e90e7f1 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
index 89a167c9a9..0da3ebc919 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -81,8 +81,10 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
       if (cdoSessionDef != oldCdoSessionDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF,
               oldCdoSessionDef, cdoSessionDef));
+        }
       }
     }
     return cdoSessionDef;
@@ -106,8 +108,10 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
     CDOSessionDef oldCdoSessionDef = cdoSessionDef;
     cdoSessionDef = newCdoSessionDef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF,
           oldCdoSessionDef, cdoSessionDef));
+    }
   }
 
   /**
@@ -121,7 +125,9 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
     {
     case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
       if (resolve)
+      {
         return getCdoSessionDef();
+      }
       return basicGetCdoSessionDef();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
index 4103c64f40..139a625d64 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -91,8 +91,10 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
     String oldResourceURI = resourceURI;
     resourceURI = newResourceURI;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI,
           oldResourceURI, resourceURI));
+    }
   }
 
   /**
@@ -165,7 +167,9 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (resourceURI: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java
index b31f0f5628..e3a0bec081 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
index 45c9fe55b3..05205a66e2 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -32,7 +32,7 @@ import java.net.URI;
  * <li>{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl#getNsURI <em>Ns URI</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
@@ -40,7 +40,7 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
   /**
    * The default value of the '{@link #getNsURI() <em>Ns URI</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getNsURI()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
   /**
    * The cached value of the '{@link #getNsURI() <em>Ns URI</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getNsURI()
    * @generated
    * @ordered
@@ -94,7 +94,9 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
     String oldNsURI = nsURI;
     nsURI = newNsURI;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EPACKAGE_DEF__NS_URI, oldNsURI, nsURI));
+    }
   }
 
   /**
@@ -167,7 +169,9 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (nsURI: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java
index f7ca1e2278..503742c4cf 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java
@@ -369,7 +369,7 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.defs.Def
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
index bba5f02285..8453006fa1 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
@@ -39,7 +39,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage
  * @generated
  */
@@ -47,14 +47,14 @@ public class CDODefsSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static CDODefsPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public CDODefsSwitch()
@@ -68,7 +68,7 @@ public class CDODefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -80,7 +80,7 @@ public class CDODefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -100,7 +100,7 @@ public class CDODefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -316,7 +316,7 @@ public class CDODefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>CDO View Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO View Def</em>'.
@@ -331,7 +331,7 @@ public class CDODefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'.
@@ -346,7 +346,7 @@ public class CDODefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'.
@@ -361,7 +361,7 @@ public class CDODefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>CDO Session Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Session Def</em>'.
@@ -377,7 +377,7 @@ public class CDODefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>CDO Package Registry Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Package Registry Def</em>'.
@@ -393,7 +393,7 @@ public class CDODefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>CDO Eager Package Registry Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Eager Package Registry Def</em>'.
@@ -409,7 +409,7 @@ public class CDODefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>CDO Lazy Package Registry Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Lazy Package Registry Def</em>'.
@@ -424,7 +424,7 @@ public class CDODefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>EPackage Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EPackage Def</em>'.
@@ -440,7 +440,7 @@ public class CDODefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EDynamic Package Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EDynamic Package Def</em>'.
@@ -455,7 +455,7 @@ public class CDODefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'.
@@ -471,7 +471,7 @@ public class CDODefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>CDO Client Protocol Factory Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Client Protocol Factory Def</em>'.
@@ -486,7 +486,7 @@ public class CDODefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'.
@@ -501,7 +501,7 @@ public class CDODefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
@@ -517,7 +517,7 @@ public class CDODefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'.
@@ -533,7 +533,7 @@ public class CDODefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'.
@@ -549,7 +549,7 @@ public class CDODefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Legal.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Legal.java
index 588914d3f0..9b362ff3c7 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Legal.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Legal.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.doc;
 
 /**
  * Legal
- * 
+ *
  * @external about.html
  * @number 666
  */
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/Homepage.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/Homepage.java
index b9fa820d79..bca7fad380 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/Homepage.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/Homepage.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.doc.online;
 
 /**
  * Homepage
- * 
+ *
  * @external http://www.eclipse.org/cdo
  * @number 1
  */
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/Wiki.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/Wiki.java
index 99c86ab7b4..79db07e86f 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/Wiki.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/Wiki.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.doc.online;
 
 /**
  * Wiki
- * 
+ *
  * @external http://wiki.eclipse.org/CDO
  * @number 2
  */
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/package-info.java
index c7496e98d8..de808f684e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/online/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Online Docs
- * 
+ *
  * @number 555
  */
 package org.eclipse.emf.cdo.doc.online;
-
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/ViewProviders.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/ViewProviders.java
index 38b0d02e34..b35cf028fa 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/ViewProviders.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/ViewProviders.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  */
@@ -44,7 +44,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  * scenario themselves.
  * <p>
  * <b>Table of Contents</b> {@toc}
- * 
+ *
  * @author Victor Roldan Betancort
  */
 public class ViewProviders
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/package-info.java
index 6d43cc64e9..c3aab7accd 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/client/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Developing Client Applications
- * 
+ *
  * @number 1
  */
 package org.eclipse.emf.cdo.doc.programmers.client;
-
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/package-info.java
index 3a14e64b48..aece491b98 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Programmer's Guide
- * 
+ *
  * @number 1
  */
 package org.eclipse.emf.cdo.doc.programmers;
-
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/server/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/server/package-info.java
index 81f7d04f8e..07f06ef3a9 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/server/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/server/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Dealing with Servers
- * 
+ *
  * @number 1
  */
 package org.eclipse.emf.cdo.doc.programmers.server;
-
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/MappingStrategies.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/MappingStrategies.java
index aa584cf84f..b1b8d42d2d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/MappingStrategies.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/MappingStrategies.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.doc.reference;
  * DBStore Mapping Strategies
  * <p>
  * {@excel ../../../../../../../Tables.xlsx#MappingStrategies}
- * 
+ *
  * @number 201
  */
 public class MappingStrategies
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/StoreFeatures.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/StoreFeatures.java
index 0e88643a7b..b572d65fca 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/StoreFeatures.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/StoreFeatures.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.doc.reference;
  * Store Feature Matrix
  * <p>
  * {@excel ../../../../../../../Tables.xlsx}
- * 
+ *
  * @number 200
  */
 public class StoreFeatures
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/package-info.java
index 98c7939583..3adea364c9 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/api/package-info.java
@@ -4,14 +4,14 @@
  * 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
  */
 
 /**
  * API Reference
- * 
+ *
  * @number 1
  */
 package org.eclipse.emf.cdo.doc.reference.api;
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/package-info.java
index 41d057efb3..7577942548 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Reference
- * 
+ *
  * @number 444
  */
 package org.eclipse.emf.cdo.doc.reference;
-
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/schema/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/schema/package-info.java
index 12ce075ed9..cedae46d6d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/schema/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/reference/schema/package-info.java
@@ -4,14 +4,14 @@
  * 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
  */
 
 /**
  * Extension Point Reference
- * 
+ *
  * @number 2
  */
 package org.eclipse.emf.cdo.doc.reference.schema;
diff --git a/plugins/org.eclipse.emf.cdo.ecore.retrofit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ecore.retrofit/META-INF/MANIFEST.MF
index 86f7737740..a6c8495b0f 100644
--- a/plugins/org.eclipse.emf.cdo.ecore.retrofit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ecore.retrofit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.ecore.retrofit;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Fragment-Host: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.ecore.retrofit/src/org/eclipse/emf/ecore/impl/MinimalEStoreEObjectImpl.java b/plugins/org.eclipse.emf.cdo.ecore.retrofit/src/org/eclipse/emf/ecore/impl/MinimalEStoreEObjectImpl.java
index 26753a499a..c238b5ba2b 100644
--- a/plugins/org.eclipse.emf.cdo.ecore.retrofit/src/org/eclipse/emf/ecore/impl/MinimalEStoreEObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ecore.retrofit/src/org/eclipse/emf/ecore/impl/MinimalEStoreEObjectImpl.java
@@ -74,7 +74,8 @@ public abstract class MinimalEStoreEObjectImpl extends MinimalEObjectImpl
     return true;
   }
 
-  Object[] eDynamicSettings()
+  @Override
+Object[] eDynamicSettings()
   {
     Object[] settings = eBasicSettings();
     if (settings == null)
@@ -304,12 +305,14 @@ public abstract class MinimalEStoreEObjectImpl extends MinimalEObjectImpl
     super.eBasicSetAdapterArray(adapters);
   }
 
-  protected EObservableAdapterList.Listener[] eBasicAdapterListeners()
+  @Override
+protected EObservableAdapterList.Listener[] eBasicAdapterListeners()
   {
     throw new UnsupportedOperationException();
   }
 
-  protected void eBasicSetAdapterListeners(EObservableAdapterList.Listener[] eAdapterListeners)
+  @Override
+protected void eBasicSetAdapterListeners(EObservableAdapterList.Listener[] eAdapterListeners)
   {
     throw new UnsupportedOperationException();
   }
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;
-
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
index d62604f1ee..a8812c9429 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
@@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
 Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
 Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.100";x-internal:=true,
+Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.200";x-internal:=true,
+ org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.200";x-internal:=true,
  org.eclipse.wb.swt;version="4.2.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
index 31756bf729..ca37812656 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
@@ -109,21 +109,20 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
 
     private static final Random RANDOM = new Random();
 
-    private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0,
-        0, 255, 254, 0, 19, 67, 114, 101, 97, 116, 101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0,
-        67, 0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9, 12, 17, 15, 18, 18, 17,
-        15, 17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30,
-        36, 28, 30, 31, 30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30,
+    private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0, 0,
+        255, 254, 0, 19, 67, 114, 101, 97, 116, 101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0, 67,
+        0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9, 12, 17, 15, 18, 18, 17, 15,
+        17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30, 36,
+        28, 30, 31, 30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30, 30,
         30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0, 20, 3, 1, 34, 0,
-        2, 17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196,
-        0, 34, 16, 0, 2, 2, 0, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178,
-        209, 97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17,
-        0, 2, 2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17,
-        3, 17, 0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205,
-        211, 133, 245, 141, 180, 155, 122, 106, 255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48,
-        121, 197, 244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237, 20, 182, 137, 64, 6, 140,
-        255, 217 };
+        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0, 20, 3, 1, 34, 0, 2,
+        17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196, 0,
+        34, 16, 0, 2, 2, 0, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178, 209,
+        97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17, 0, 2,
+        2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17, 3, 17,
+        0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205, 211,
+        133, 245, 141, 180, 155, 122, 106, 255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48, 121, 197,
+        244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237, 20, 182, 137, 64, 6, 140, 255, 217 };
 
     private SortedMap<String, Channel> channels = new TreeMap<String, Channel>();
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
index e4e5f49902..457af50ccc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
@@ -81,8 +81,8 @@ public class NormalRepositoryView extends AbstractView<IRepository>
   protected void initializeToolBar(IToolBarManager toolbarManager)
   {
     super.initializeToolBar(toolbarManager);
-    toolbarManager.add(new Action("Browser", ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID,
-        "icons/Browser.gif"))
+    toolbarManager.add(new Action("Browser",
+        ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID, "icons/Browser.gif"))
     {
       @Override
       public void run()
@@ -95,7 +95,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
           try
           {
             PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser()
-                .openURL(new URL("http://localhost:" + port));
+            .openURL(new URL("http://localhost:" + port));
           }
           catch (Exception ex)
           {
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index 0a28f852a4..17e9bf352a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -85,7 +85,7 @@ import java.util.Properties;
 /**
  * @author Eike Stepper
  */
-public abstract class NodeType extends SetContainer<Node> implements IElement
+public abstract class NodeType extends SetContainer<Node>implements IElement
 {
   public static final String TYPE_PROPERTY = "Type";
 
@@ -228,8 +228,8 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     String browserPort = node.getSetting(BROWSER_PROPERTY);
     if (browserPort != null && browserPort.length() != 0)
     {
-      CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE.getElement(
-          "org.eclipse.emf.cdo.server.browsers", "default", browserPort);
+      CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE
+          .getElement("org.eclipse.emf.cdo.server.browsers", "default", browserPort);
       node.setObject(CDOServerBrowser.class, browser);
     }
   }
@@ -545,8 +545,8 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     {
       super.start(node);
 
-      final CDOSession session = (CDOSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions",
-          "cdo", "jvm://example?repositoryName=" + REPOSITORY_NAME);
+      final CDOSession session = (CDOSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions", "cdo",
+          "jvm://example?repositoryName=" + REPOSITORY_NAME);
       session.getPackageRegistry().putEPackage(CompanyPackage.eINSTANCE);
 
       node.setObject(CDOSession.class, session);
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
index 62252dd9b9..604c7b51c3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
@@ -32,14 +32,14 @@ import java.util.Map;
 /**
  * Utility class for managing OS resources associated with SWT/JFace controls such as colors, fonts, images,
  * etc.
- * 
+ *
  * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the
  * operating system resources managed by cached objects when those objects and OS resources are no longer
  * needed (e.g. on application shutdown)
- * 
+ *
  * This class may be freely distributed as part of any application or plugin.
  * <p>
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -55,7 +55,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified
    * class.
-   * 
+   *
    * @param clazz
    *            the {@link Class} relative to which to find the image descriptor.
    * @param path
@@ -69,7 +69,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *            the path to the image file.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
@@ -88,7 +88,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
-   * 
+   *
    * @param descriptor
    *            the {@link ImageDescriptor} for the {@link Image}.
    * @return the {@link Image} based on the specified {@link ImageDescriptor}.
@@ -116,7 +116,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated.
    * @param decorator
@@ -130,7 +130,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated.
    * @param decorator
@@ -267,13 +267,13 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *            the plugin {@link Object} containing the image
    * @param name
    *            the path to the image within the plugin
    * @return the {@link Image} stored in the file at the specified path
-   * 
+   *
    * @deprecated Use {@link #getPluginImage(String, String)} instead.
    */
   @Deprecated
@@ -296,7 +296,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *            the symbolic name of the {@link Bundle}.
    * @param path
@@ -360,13 +360,13 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *            the plugin {@link Object} containing the image.
    * @param name
    *            the path to th eimage within the plugin.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @deprecated Use {@link #getPluginImageDescriptor(String, String)} instead.
    */
   @Deprecated
@@ -393,7 +393,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *            the symbolic name of the {@link Bundle}.
    * @param path
@@ -441,7 +441,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link URL} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *            the plugin {@link Object} containing the file path.
    * @param name
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleSWTResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleSWTResourceManager.java
index 0e99b5a2d3..01521d129f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleSWTResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleSWTResourceManager.java
@@ -51,7 +51,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns the system {@link Color} matching the specific ID.
-   * 
+   *
    * @param systemColorID
    *            the ID value for the color
    * @return the system {@link Color} matching the specific ID
@@ -64,7 +64,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns a {@link Color} given its red, green and blue component values.
-   * 
+   *
    * @param r
    *            the red component of the color
    * @param g
@@ -80,7 +80,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns a {@link Color} given its RGB value.
-   * 
+   *
    * @param rgb
    *            the {@link RGB} value of the color
    * @return the {@link Color} matching the RGB value
@@ -121,7 +121,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} encoded by the specified {@link InputStream}.
-   * 
+   *
    * @param stream
    *            the {@link InputStream} encoding the image data
    * @return the {@link Image} encoded by the specified input stream
@@ -146,7 +146,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *            the path to the image file
    * @return the {@link Image} stored in the file at the specified path
@@ -172,7 +172,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *            the {@link Class} relative to which to find the image
    * @param path
@@ -249,7 +249,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated
    * @param decorator
@@ -263,7 +263,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated
    * @param decorator
@@ -373,7 +373,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns a {@link Font} based on its name, height and style.
-   * 
+   *
    * @param name
    *            the name of the font
    * @param height
@@ -390,7 +390,7 @@ public class ExampleSWTResourceManager
   /**
    * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline
    * flags are also supported.
-   * 
+   *
    * @param name
    *            the name of the font
    * @param size
@@ -441,7 +441,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns a bold version of the given {@link Font}.
-   * 
+   *
    * @param baseFont
    *            the {@link Font} for which a bold version is desired
    * @return the bold version of the given {@link Font}
@@ -490,7 +490,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns the system cursor matching the specific ID.
-   * 
+   *
    * @param id
    *            int The ID value for the cursor
    * @return Cursor The system cursor matching the specific ID
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
index d52bdd333e..318fb72d1b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.clone;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index 028fb93a35..8339f17f75 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -181,7 +181,7 @@ public abstract class AbstractOfflineExampleServer
     {
       System.out.println();
       System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
index 49609279c5..2bdc2d4479 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
@@ -36,13 +36,13 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Addressable} object. <!--
  * begin-user-doc -->
- * 
+ *
  * @since 4.0<!-- end-user-doc -->
  * @generated
  */
-public class AddressableItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class AddressableItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -80,12 +80,12 @@ public class AddressableItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Addressable_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
-        CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Addressable_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
+            CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -95,12 +95,14 @@ public class AddressableItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addStreetPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Addressable_street_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature", "_UI_Addressable_type"),
-        CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_Addressable_street_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature",
+                    "_UI_Addressable_type"),
+                CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -110,12 +112,12 @@ public class AddressableItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addCityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Addressable_city_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
-        CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Addressable_city_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
+            CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -147,8 +149,8 @@ public class AddressableItemProvider extends CDOItemProviderAdapter implements I
   public String getText(Object object)
   {
     String label = ((Addressable)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Addressable_type") : getString("_UI_Addressable_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Addressable_type")
+        : getString("_UI_Addressable_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
index e4d46ec074..4989cf6bc3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -38,12 +38,12 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Category} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class CategoryItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class CategoryItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,12 +79,12 @@ public class CategoryItemProvider extends CDOItemProviderAdapter implements IEdi
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Category_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
-        CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Category_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
+            CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -160,8 +160,8 @@ public class CategoryItemProvider extends CDOItemProviderAdapter implements IEdi
   public String getText(Object object)
   {
     String label = ((Category)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Category_type") : getString("_UI_Category_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Category_type")
+        : getString("_UI_Category_type") + " " + label;
   }
 
   /**
@@ -199,11 +199,11 @@ public class CategoryItemProvider extends CDOItemProviderAdapter implements IEdi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES,
-        CompanyFactory.eINSTANCE.createCategory()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS,
-        CompanyFactory.eINSTANCE.createProduct()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS, CompanyFactory.eINSTANCE.createProduct()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyEditPlugin.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyEditPlugin.java
index 6eb9d58941..1b4cbda811 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyEditPlugin.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
index 925d277312..af4e7cb8a6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
@@ -123,8 +123,8 @@ public class CompanyItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Company)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Company_type") : getString("_UI_Company_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Company_type")
+        : getString("_UI_Company_type") + " " + label;
   }
 
   /**
@@ -162,14 +162,14 @@ public class CompanyItemProvider extends AddressableItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES,
-        CompanyFactory.eINSTANCE.createCategory()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS,
-        CompanyFactory.eINSTANCE.createSupplier()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS, CompanyFactory.eINSTANCE.createSupplier()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS,
-        CompanyFactory.eINSTANCE.createCustomer()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS, CompanyFactory.eINSTANCE.createCustomer()));
 
     newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__PURCHASE_ORDERS,
         CompanyFactory.eINSTANCE.createPurchaseOrder()));
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
index ac0615e550..d59b651713 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
@@ -43,11 +43,11 @@ import java.util.List;
  * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable, IChildCreationExtender
+public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -76,7 +76,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -268,7 +268,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.examples.company.Order} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected OrderItemProvider orderItemProvider;
@@ -366,7 +366,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
       {
         return adapter;
       }
@@ -439,30 +439,48 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
   }
 
   /**
-   * This disposes all of the item providers created by this factory. 
+   * This disposes all of the item providers created by this factory.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void dispose()
   {
     if (companyItemProvider != null)
+    {
       companyItemProvider.dispose();
+    }
     if (supplierItemProvider != null)
+    {
       supplierItemProvider.dispose();
+    }
     if (customerItemProvider != null)
+    {
       customerItemProvider.dispose();
+    }
     if (orderItemProvider != null)
+    {
       orderItemProvider.dispose();
+    }
     if (orderDetailItemProvider != null)
+    {
       orderDetailItemProvider.dispose();
+    }
     if (purchaseOrderItemProvider != null)
+    {
       purchaseOrderItemProvider.dispose();
+    }
     if (salesOrderItemProvider != null)
+    {
       salesOrderItemProvider.dispose();
+    }
     if (categoryItemProvider != null)
+    {
       categoryItemProvider.dispose();
+    }
     if (productItemProvider != null)
+    {
       productItemProvider.dispose();
+    }
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
index c3e29974f4..4695296fb3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
@@ -63,11 +63,11 @@ public class CustomerItemProvider extends AddressableItemProvider
    */
   protected void addSalesOrdersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Customer_salesOrders_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
-        CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Customer_salesOrders_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
+            CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
   }
 
   /**
@@ -100,8 +100,8 @@ public class CustomerItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Customer)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Customer_type") : getString("_UI_Customer_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Customer_type")
+        : getString("_UI_Customer_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
index dedcd85aba..fa1c629f1f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -36,12 +36,12 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.OrderDetail} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class OrderDetailItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class OrderDetailItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -78,11 +78,11 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_product_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
-        CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_OrderDetail_product_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
+            CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
@@ -92,12 +92,14 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_price_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
-        CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
+                    "_UI_OrderDetail_type"),
+                CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false,
+                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
index f681a7866e..28f0ea4f91 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -36,12 +36,12 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Order} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class OrderItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class OrderItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
index d652a0847d..453ff4e9ae 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
@@ -36,12 +36,12 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Company} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class ProductItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class ProductItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -81,12 +81,12 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
-        CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+            CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -96,11 +96,11 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
    */
   protected void addOrderDetailsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_orderDetails_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
-        CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_orderDetails_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
+            CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
   }
 
   /**
@@ -110,12 +110,12 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
    */
   protected void addVatPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_vat_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
-        CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_vat_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
+            CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -125,29 +125,29 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
    */
   protected void addDescriptionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_description_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
-        CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_description_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
+            CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
    * This adds a property descriptor for the Price feature.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    */
   protected void addPricePropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_price_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-            null));
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_Product_price_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
+        null));
   }
 
   /**
@@ -190,8 +190,8 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
   public String getText(Object object)
   {
     String label = ((Product)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Product_type") : getString("_UI_Product_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Product_type")
+        : getString("_UI_Product_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
index 4b11f4abb8..cfbea1ef2e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.PurchaseOrder} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class PurchaseOrderItemProvider extends OrderItemProvider
@@ -67,12 +67,14 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
    */
   protected void addDatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_PurchaseOrder_date_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature", "_UI_PurchaseOrder_type"),
-        CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_PurchaseOrder_date_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature",
+                    "_UI_PurchaseOrder_type"),
+                CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -83,13 +85,11 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
   protected void addSupplierPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_PurchaseOrder_supplier_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
-                "_UI_PurchaseOrder_type"), CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null,
-            null, null));
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_PurchaseOrder_supplier_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
+            "_UI_PurchaseOrder_type"),
+            CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
index c53ca1516f..07e704e077 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -26,7 +26,7 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.SalesOrder} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class SalesOrderItemProvider extends OrderItemProvider
@@ -66,12 +66,12 @@ public class SalesOrderItemProvider extends OrderItemProvider
    */
   protected void addIdPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_SalesOrder_id_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
-        CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_SalesOrder_id_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
+            CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -81,11 +81,11 @@ public class SalesOrderItemProvider extends OrderItemProvider
    */
   protected void addCustomerPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_SalesOrder_customer_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
-        CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_SalesOrder_customer_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
+            CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
index d8084856c1..893ca91a0e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -26,7 +26,7 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Supplier} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class SupplierItemProvider extends AddressableItemProvider
@@ -66,11 +66,11 @@ public class SupplierItemProvider extends AddressableItemProvider
    */
   protected void addPurchaseOrdersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Supplier_purchaseOrders_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
-        CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Supplier_purchaseOrders_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
+            CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
   }
 
   /**
@@ -80,12 +80,12 @@ public class SupplierItemProvider extends AddressableItemProvider
    */
   protected void addPreferredPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Supplier_preferred_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
-        CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Supplier_preferred_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
+            CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -118,8 +118,8 @@ public class SupplierItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Supplier)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Supplier_type") : getString("_UI_Supplier_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Supplier_type")
+        : getString("_UI_Supplier_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Addressable.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Addressable.java
index 1048318e7a..8a5d4ca83a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Addressable.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Addressable.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Addressable</b></em>'.
- * 
+ *
  * @since 4.0 <!-- end-user-doc -->
  *
  * <p>
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Category.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Category.java
index 35ddedad09..06306e34dc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Category.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Category.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -49,7 +49,7 @@ public interface Category extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.Category#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Company.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Company.java
index 38645af728..4835cb7436 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Company.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Company.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/CompanyPackage.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/CompanyPackage.java
index 009d578045..13449b436c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/CompanyPackage.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/CompanyPackage.java
@@ -63,7 +63,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.examples.company.impl.AddressableImpl <em>Addressable</em>}' class.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.examples.company.impl.AddressableImpl
    * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getAddressable()
@@ -74,7 +74,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    * @ordered
@@ -84,7 +84,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Street</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    * @ordered
@@ -94,7 +94,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>City</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    * @ordered
@@ -104,7 +104,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The number of structural features of the '<em>Addressable</em>' class.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    * @ordered
@@ -260,7 +260,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -334,7 +334,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.examples.company.impl.OrderImpl <em>Order</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.examples.company.impl.OrderImpl
    * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getOrder()
    * @generated
@@ -385,7 +385,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The number of structural features of the '<em>Order Detail</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -437,7 +437,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The number of structural features of the '<em>Purchase Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -471,7 +471,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The number of structural features of the '<em>Sales Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -522,7 +522,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Order Details</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -547,7 +547,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Price</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    * @ordered
@@ -565,7 +565,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.examples.company.VAT <em>VAT</em>}' enum. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.examples.company.VAT
    * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getVAT()
    * @generated
@@ -575,7 +575,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Addressable <em>Addressable</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for class '<em>Addressable</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Addressable
@@ -586,7 +586,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.examples.company.Addressable#getName <em>Name</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Addressable#getName()
@@ -598,7 +598,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.examples.company.Addressable#getStreet <em>Street</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Street</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Addressable#getStreet()
@@ -610,7 +610,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.examples.company.Addressable#getCity <em>City</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for the attribute '<em>City</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Addressable#getCity()
@@ -622,7 +622,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Supplier <em>Supplier</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Supplier</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Supplier
    * @generated
@@ -633,7 +633,7 @@ public interface CompanyPackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.examples.company.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Purchase Orders</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Supplier#getPurchaseOrders()
    * @see #getSupplier()
@@ -723,7 +723,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for enum '{@link org.eclipse.emf.cdo.examples.company.VAT <em>VAT</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for enum '<em>VAT</em>'.
    * @see org.eclipse.emf.cdo.examples.company.VAT
    * @generated
@@ -733,7 +733,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Category <em>Category</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Category</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Category
    * @generated
@@ -775,7 +775,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Product <em>Product</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Product</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Product
    * @generated
@@ -826,7 +826,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.examples.company.Product#getPrice <em>Price</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Price</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Product#getPrice()
@@ -838,7 +838,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Company <em>Company</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Company</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Company
    * @generated
@@ -871,7 +871,7 @@ public interface CompanyPackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.examples.company.Company#getPurchaseOrders <em>Purchase Orders</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Purchase Orders</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Company#getPurchaseOrders()
    * @see #getCompany()
@@ -904,7 +904,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Customer <em>Customer</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Customer</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Customer
    * @generated
@@ -925,7 +925,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Order <em>Order</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Order</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Order
    * @generated
@@ -996,7 +996,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.examples.company.impl.AddressableImpl <em>Addressable</em>}' class.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.examples.company.impl.AddressableImpl
      * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getAddressable()
@@ -1007,7 +1007,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @generated
      */
@@ -1016,7 +1016,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Street</b></em>' attribute feature.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @generated
      */
@@ -1025,7 +1025,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>City</b></em>' attribute feature.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @generated
      */
@@ -1117,7 +1117,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.examples.company.VAT <em>VAT</em>}' enum. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.examples.company.VAT
      * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getVAT()
      * @generated
@@ -1144,7 +1144,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CATEGORY__CATEGORIES = eINSTANCE.getCategory_Categories();
@@ -1152,7 +1152,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products();
@@ -1201,7 +1201,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Price</b></em>' attribute feature.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @generated
      */
@@ -1219,7 +1219,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__CATEGORIES = eINSTANCE.getCompany_Categories();
@@ -1227,7 +1227,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Suppliers</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__SUPPLIERS = eINSTANCE.getCompany_Suppliers();
@@ -1235,7 +1235,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Purchase Orders</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__PURCHASE_ORDERS = eINSTANCE.getCompany_PurchaseOrders();
@@ -1243,7 +1243,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Customers</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__CUSTOMERS = eINSTANCE.getCompany_Customers();
@@ -1251,7 +1251,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Sales Orders</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders();
@@ -1285,7 +1285,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Order Details</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails();
@@ -1302,7 +1302,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Id</b></em>' attribute feature. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      */
     EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id();
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Customer.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Customer.java
index 865cdc54d3..bc93b20204 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Customer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Customer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Order.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Order.java
index a8e164b9a1..163786d6dd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Order.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Order.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/OrderDetail.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/OrderDetail.java
index ac92b2ba6e..ddf307dabe 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/OrderDetail.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/OrderDetail.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Product.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Product.java
index 85793133ba..6bae3a8fdd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Product.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Product.java
@@ -51,7 +51,7 @@ public interface Product extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.Product#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -99,7 +99,7 @@ public interface Product extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.Product#getVat <em>Vat</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Vat</em>' attribute.
    * @see org.eclipse.emf.cdo.examples.company.VAT
@@ -139,7 +139,7 @@ public interface Product extends EObject
    * <p>
    * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @return the value of the '<em>Price</em>' attribute.
    * @see #setPrice(float)
@@ -152,7 +152,7 @@ public interface Product extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.Product#getPrice <em>Price</em>}' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @param value the new value of the '<em>Price</em>' attribute.
    * @see #getPrice()
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/PurchaseOrder.java
index ceba2add14..00121473bc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/PurchaseOrder.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/PurchaseOrder.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -62,7 +62,7 @@ public interface PurchaseOrder extends Order
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Supplier</em>' reference.
    * @see #setSupplier(Supplier)
    * @see org.eclipse.emf.cdo.examples.company.CompanyPackage#getPurchaseOrder_Supplier()
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/SalesOrder.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/SalesOrder.java
index e62c539704..9e557a40f8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/SalesOrder.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/SalesOrder.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -45,7 +45,7 @@ public interface SalesOrder extends Order
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.SalesOrder#getId <em>Id</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Id</em>' attribute.
    * @see #getId()
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Supplier.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Supplier.java
index 58db832acb..84b687d2d7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Supplier.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Supplier.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -55,7 +55,7 @@ public interface Supplier extends Addressable
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Preferred</em>' attribute.
    * @see #setPreferred(boolean)
    * @see org.eclipse.emf.cdo.examples.company.CompanyPackage#getSupplier_Preferred()
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java
index 4f5cc227e2..fd055ef2f6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java
index 700a32e10b..ef524853cb 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EClass;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Addressable</b></em>'.
- * 
+ *
  * @since 4.0 <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java
index 46bf568a55..a303c61200 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
index ba122f09c8..e042c345f0 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
@@ -170,8 +170,10 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory
   {
     VAT result = VAT.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java
index 94f039a352..81e1727165 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
index c7df4c6048..8616eea583 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
@@ -109,7 +109,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.examples.company.CompanyPackage#eNS_URI
    * @see #init()
@@ -128,7 +128,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link CompanyPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -141,11 +141,14 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
   public static CompanyPackage init()
   {
     if (isInited)
+    {
       return (CompanyPackage)EPackage.Registry.INSTANCE.getEPackage(CompanyPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CompanyPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new CompanyPackageImpl());
+    CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof CompanyPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new CompanyPackageImpl());
 
     isInited = true;
 
@@ -165,7 +168,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -176,7 +179,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -187,7 +190,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -198,7 +201,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -389,7 +392,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -539,7 +542,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -609,7 +614,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -622,11 +629,11 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    companyEClass.getESuperTypes().add(this.getAddressable());
-    supplierEClass.getESuperTypes().add(this.getAddressable());
-    customerEClass.getESuperTypes().add(this.getAddressable());
-    purchaseOrderEClass.getESuperTypes().add(this.getOrder());
-    salesOrderEClass.getESuperTypes().add(this.getOrder());
+    companyEClass.getESuperTypes().add(getAddressable());
+    supplierEClass.getESuperTypes().add(getAddressable());
+    customerEClass.getESuperTypes().add(getAddressable());
+    purchaseOrderEClass.getESuperTypes().add(getOrder());
+    salesOrderEClass.getESuperTypes().add(getOrder());
 
     // Initialize classes and features; add operations and parameters
     initEClass(addressableEClass, Addressable.class, "Addressable", IS_ABSTRACT, !IS_INTERFACE,
@@ -639,45 +646,45 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class,
+    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class,
+    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1,
-        Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
+    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(),
-        "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders",
+        null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null,
-        0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1,
+        Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null,
-        0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1,
+        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Product(), this.getProduct(), this.getProduct_OrderDetails(), "product", null, 0, 1,
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Product(), getProduct(), getProduct_OrderDetails(), "product", null, 0, 1,
         OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
@@ -687,35 +694,35 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier",
-        null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1,
+        PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1,
-        1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1,
+        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Products(), this.getProduct(), null, "products", null, 0, -1, Category.class,
+    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Products(), getProduct(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(productEClass, Product.class, "Product", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProduct_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails",
-        null, 0, -1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEReference(getProduct_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1,
+        Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Vat(), getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getProduct_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product.class,
         IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -744,17 +751,14 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
   protected void createTeneoAnnotations()
   {
     String source = "teneo.jpa";
-    addAnnotation(
-        this,
-        source,
-        new String[] {
-            "value",
-            "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.examples.hibernate.server.CDOExampleUUIDHexGenerator\")})" });
+    addAnnotation(this, source, new String[] { "value",
+        "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.examples.hibernate.server.CDOExampleUUIDHexGenerator\")})" });
     addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" });
     addAnnotation(getCategory_Name(), source,
         new String[] { "value", "@Id @GeneratedValue(generator=\"system-uuid\")" });
     addAnnotation(getProduct_Name(), source, new String[] { "value", "@Id" });
-    addAnnotation(getProduct_Vat(), source, new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
+    addAnnotation(getProduct_Vat(), source,
+        new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
   }
 
 } // CompanyPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java
index 384ec3d270..cbe34ddd51 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java
index cf9e9f86eb..056c608856 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java
index 95c3e7db02..a99e8f02ee 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java
index 23c8d665de..97e189449e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java
@@ -132,7 +132,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -143,7 +143,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java
index 763c1ccb0f..c06a2923e0 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java
index 758c397954..36d0c8f4f4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java
index 75859aa796..dfd8d4ad18 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanyAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanyAdapterFactory.java
index 321232c18b..ef1dc932cc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanyAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanyAdapterFactory.java
@@ -168,7 +168,7 @@ public class CompanyAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.examples.company.Addressable <em>Addressable</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.examples.company.Addressable
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java
index 8ff56e3bc4..3474104d6c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java
@@ -102,7 +102,9 @@ public class CompanySwitch<T>
       Addressable addressable = (Addressable)theEObject;
       T result = caseAddressable(addressable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.COMPANY:
@@ -110,9 +112,13 @@ public class CompanySwitch<T>
       Company company = (Company)theEObject;
       T result = caseCompany(company);
       if (result == null)
+      {
         result = caseAddressable(company);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.SUPPLIER:
@@ -120,9 +126,13 @@ public class CompanySwitch<T>
       Supplier supplier = (Supplier)theEObject;
       T result = caseSupplier(supplier);
       if (result == null)
+      {
         result = caseAddressable(supplier);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.CUSTOMER:
@@ -130,9 +140,13 @@ public class CompanySwitch<T>
       Customer customer = (Customer)theEObject;
       T result = caseCustomer(customer);
       if (result == null)
+      {
         result = caseAddressable(customer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.ORDER:
@@ -140,7 +154,9 @@ public class CompanySwitch<T>
       Order order = (Order)theEObject;
       T result = caseOrder(order);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.ORDER_DETAIL:
@@ -148,7 +164,9 @@ public class CompanySwitch<T>
       OrderDetail orderDetail = (OrderDetail)theEObject;
       T result = caseOrderDetail(orderDetail);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.PURCHASE_ORDER:
@@ -156,9 +174,13 @@ public class CompanySwitch<T>
       PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject;
       T result = casePurchaseOrder(purchaseOrder);
       if (result == null)
+      {
         result = caseOrder(purchaseOrder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.SALES_ORDER:
@@ -166,9 +188,13 @@ public class CompanySwitch<T>
       SalesOrder salesOrder = (SalesOrder)theEObject;
       T result = caseSalesOrder(salesOrder);
       if (result == null)
+      {
         result = caseOrder(salesOrder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.CATEGORY:
@@ -176,7 +202,9 @@ public class CompanySwitch<T>
       Category category = (Category)theEObject;
       T result = caseCategory(category);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.PRODUCT:
@@ -184,7 +212,9 @@ public class CompanySwitch<T>
       Product product = (Product)theEObject;
       T result = caseProduct(product);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -196,7 +226,7 @@ public class CompanySwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Addressable</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch.
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @param object the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Addressable</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CategoryValidator.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CategoryValidator.java
index a5d005b5a1..ad451e9e06 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CategoryValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CategoryValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import org.eclipse.emf.common.util.EList;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface CategoryValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CompanyValidator.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CompanyValidator.java
index 1243863362..d227444c55 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CompanyValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CompanyValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface CompanyValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CustomerValidator.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CustomerValidator.java
index cbad19e5de..75e73a4f31 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CustomerValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CustomerValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.EList;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface CustomerValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderDetailValidator.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderDetailValidator.java
index 48e139bbd8..57c12151c5 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderDetailValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderDetailValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.examples.company.Product;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface OrderDetailValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderValidator.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderValidator.java
index 4dbd691fa2..0683cc8315 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.EList;
  * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
  * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface OrderValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/ProductValidator.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/ProductValidator.java
index 020b36ad33..ca2dddcfc3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/ProductValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/ProductValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/PurchaseOrderValidator.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/PurchaseOrderValidator.java
index 9bfeeef2fb..2eb7ce8561 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/PurchaseOrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/PurchaseOrderValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import java.util.Date;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface PurchaseOrderValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SalesOrderValidator.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SalesOrderValidator.java
index 77ba427284..2ad1b95a3b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SalesOrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SalesOrderValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.examples.company.Customer;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface SalesOrderValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SupplierValidator.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SupplierValidator.java
index a0b0c227d2..66045b583c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SupplierValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SupplierValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.EList;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface SupplierValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF
index a6a8547369..4180739913 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.hibernate.client
-Bundle-Version: 4.1.200.qualifier
+Bundle-Version: 4.1.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -33,4 +33,4 @@ Import-Package: org.hibernate;version="[4.0.0,5.0.0)",
  org.hibernate.type;version="[4.0.0,5.0.0)",
  org.hibernate.usertype;version="[4.0.0,5.0.0)",
  org.apache.commons.logging;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples.hibernate.client;version="4.1.200"
+Export-Package: org.eclipse.emf.cdo.examples.hibernate.client;version="4.1.300"
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/BaseTest.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/BaseTest.java
index 214dc9d9a2..21fc35cff9 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/BaseTest.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/BaseTest.java
@@ -30,7 +30,7 @@ import junit.framework.TestCase;
 /**
  * This class contains code to connect to a CDO server in a standalone manner . So the junit test is not running inside
  * an OSGI container.
- * 
+ *
  * @author Martin Taal
  */
 public class BaseTest extends TestCase
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/GenerateHBMTest.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/GenerateHBMTest.java
index 5fd84a8422..ae79e7c72a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/GenerateHBMTest.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/GenerateHBMTest.java
@@ -39,7 +39,7 @@ import junit.framework.TestCase;
  * <li>org.apache.commons.logging</li>
  * </ul>
  * The first two dependencies normally do not exist on a client side application.
- * 
+ *
  * @author Martin Taal
  */
 public class GenerateHBMTest extends TestCase
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java
index c4d982be1b..e9c05edf48 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/HibernateQueryTest.java
@@ -25,7 +25,9 @@ import org.eclipse.emf.cdo.examples.company.VAT;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.view.CDOQuery;
+
 import org.eclipse.net4j.util.collection.CloseableIterator;
+
 import org.junit.Before;
 
 import java.io.Serializable;
@@ -38,7 +40,7 @@ import java.util.List;
  * The queries are done on a test set which is created automatically. The size
  * of the testdata is controlled by the static final int's in the top of this
  * class.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateQueryTest extends BaseTest
@@ -97,7 +99,7 @@ public class HibernateQueryTest extends BaseTest
     CDOTransaction transaction = session.openTransaction();
 
     {
-      CDOQuery cdoQuery = transaction.createQuery("hql", "from Product"); //$NON-NLS-1$  //$NON-NLS-2$
+      CDOQuery cdoQuery = transaction.createQuery("hql", "from Product"); //$NON-NLS-1$ //$NON-NLS-2$
       final List<Product> products = cdoQuery.getResult(Product.class);
       assertEquals(NUM_OF_PRODUCTS, products.size());
     }
@@ -106,20 +108,20 @@ public class HibernateQueryTest extends BaseTest
     // https://bugs.eclipse.org/bugs/show_bug.cgi?id=309920
     // gets resolved
     // {
-    //      CDOQuery cdoQuery = transaction.createQuery("hql", "from Product where name=:name"); //$NON-NLS-1$  //$NON-NLS-2$
-    //      cdoQuery.setParameter("name", "" + 1); //$NON-NLS-1$  //$NON-NLS-2$
+    // CDOQuery cdoQuery = transaction.createQuery("hql", "from Product where name=:name"); //$NON-NLS-1$ //$NON-NLS-2$
+    // cdoQuery.setParameter("name", "" + 1); //$NON-NLS-1$ //$NON-NLS-2$
     // final List<Product> products = cdoQuery.getResult(Product.class);
     // assertEquals(1, products.size());
     // }
 
     {
-      CDOQuery cdoQuery = transaction.createQuery("hql", "from Customer"); //$NON-NLS-1$  //$NON-NLS-2$
+      CDOQuery cdoQuery = transaction.createQuery("hql", "from Customer"); //$NON-NLS-1$ //$NON-NLS-2$
       final List<Customer> customers = cdoQuery.getResult(Customer.class);
       assertEquals(NUM_OF_CUSTOMERS, customers.size());
     }
 
     {
-      CDOQuery cdoQuery = transaction.createQuery("hql", "from Product where vat=:vat"); //$NON-NLS-1$  //$NON-NLS-2$
+      CDOQuery cdoQuery = transaction.createQuery("hql", "from Product where vat=:vat"); //$NON-NLS-1$ //$NON-NLS-2$
       cdoQuery.setParameter("vat", VAT.VAT15); //$NON-NLS-1$
       final List<Product> products = cdoQuery.getResult(Product.class);
       // MT: re-enable after
@@ -143,7 +145,7 @@ public class HibernateQueryTest extends BaseTest
     CDOTransaction transaction = session.openTransaction();
 
     {
-      CDOQuery cdoQuery = transaction.createQuery("hql", "select count(*) from Product"); //$NON-NLS-1$  //$NON-NLS-2$
+      CDOQuery cdoQuery = transaction.createQuery("hql", "select count(*) from Product"); //$NON-NLS-1$ //$NON-NLS-2$
       final List<Long> counts = cdoQuery.getResult(Long.class);
       assertEquals(counts.size(), 1);
       assertEquals(counts.get(0), new Long(NUM_OF_PRODUCTS));
@@ -170,11 +172,11 @@ public class HibernateQueryTest extends BaseTest
     CDOTransaction transaction = session.openTransaction();
 
     {
-      CDOQuery customerQuery = transaction.createQuery("hql", "from Customer order by name"); //$NON-NLS-1$  //$NON-NLS-2$
+      CDOQuery customerQuery = transaction.createQuery("hql", "from Customer order by name"); //$NON-NLS-1$ //$NON-NLS-2$
       final List<Customer> customers = customerQuery.getResult(Customer.class);
       assertEquals(NUM_OF_CUSTOMERS, customers.size());
 
-      CDOQuery productQuery = transaction.createQuery("hql", "from Product"); //$NON-NLS-1$  //$NON-NLS-2$
+      CDOQuery productQuery = transaction.createQuery("hql", "from Product"); //$NON-NLS-1$ //$NON-NLS-2$
       final List<Product> products = productQuery.getResult(Product.class);
       assertEquals(NUM_OF_PRODUCTS, products.size());
 
@@ -189,10 +191,8 @@ public class HibernateQueryTest extends BaseTest
         for (Product product : products)
         {
           final int productIndex = Integer.parseInt(product.getName());
-          final CDOQuery orderQuery = transaction
-              .createQuery(
-                  "hql", //$NON-NLS-1$
-                  "select so from SalesOrder so, OrderDetail od where so.customer=:customer and od in elements(so.orderDetails) and od.product=:product"); //$NON-NLS-1$
+          final CDOQuery orderQuery = transaction.createQuery("hql", //$NON-NLS-1$
+              "select so from SalesOrder so, OrderDetail od where so.customer=:customer and od in elements(so.orderDetails) and od.product=:product"); //$NON-NLS-1$
           orderQuery.setParameter("customer", customer); //$NON-NLS-1$
           orderQuery.setParameter("product", product); //$NON-NLS-1$
 
@@ -238,7 +238,7 @@ public class HibernateQueryTest extends BaseTest
     CDOTransaction transaction = session.openTransaction();
 
     {
-      CDOQuery odQuery = transaction.createQuery("hql", "from OrderDetail"); //$NON-NLS-1$  //$NON-NLS-2$
+      CDOQuery odQuery = transaction.createQuery("hql", "from OrderDetail"); //$NON-NLS-1$ //$NON-NLS-2$
       final List<OrderDetail> orderDetails = odQuery.getResult(OrderDetail.class);
       for (OrderDetail orderDetail : orderDetails)
       {
@@ -263,7 +263,7 @@ public class HibernateQueryTest extends BaseTest
     CDOTransaction transaction = session.openTransaction();
 
     {
-      CDOQuery odQuery = transaction.createQuery("hql", "from Customer"); //$NON-NLS-1$  //$NON-NLS-2$
+      CDOQuery odQuery = transaction.createQuery("hql", "from Customer"); //$NON-NLS-1$ //$NON-NLS-2$
       final List<Customer> customers = odQuery.getResult(Customer.class);
       for (Customer customer : customers)
       {
@@ -377,7 +377,7 @@ public class HibernateQueryTest extends BaseTest
       // MT: re-enable after
       // https://bugs.eclipse.org/bugs/show_bug.cgi?id=309920
       // gets resolved
-      products.add(createProduct((index++) + i));
+      products.add(createProduct(index++ + i));
     }
 
     resource.getContents().addAll(products);
@@ -391,8 +391,8 @@ public class HibernateQueryTest extends BaseTest
       customer.setStreet("Street " + i); //$NON-NLS-1$
       resource.getContents().add(customer);
 
-      final List<Product> customerProducts = products
-          .subList(productCounter, productCounter + NUM_OF_PRODUCTS_CUSTOMER);
+      final List<Product> customerProducts = products.subList(productCounter,
+          productCounter + NUM_OF_PRODUCTS_CUSTOMER);
       for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
       {
         resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
@@ -410,7 +410,7 @@ public class HibernateQueryTest extends BaseTest
     // https://bugs.eclipse.org/bugs/show_bug.cgi?id=309920
     // gets resolved
     // salesOrder.setId(num);
-    salesOrder.setId((index++ + num));
+    salesOrder.setId(index++ + num);
     createOrderDetail(salesOrder, num, products);
     return salesOrder;
   }
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/META-INF/MANIFEST.MF
index 1720709e52..f371457bf1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.hibernate.server
-Bundle-Version: 4.1.200.qualifier
+Bundle-Version: 4.1.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -20,5 +20,5 @@ Import-Package: org.eclipse.emf.teneo.annotations.mapper;version="[2.0.0,3.0.0)"
  org.hibernate.engine.spi;version="[4.0.0,5.0.0)",
  org.hibernate.id;version="[4.0.0,5.0.0)",
  org.hibernate.persister.entity;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples.hibernate.server;version="4.1.200"
+Export-Package: org.eclipse.emf.cdo.examples.hibernate.server;version="4.1.300"
 Bundle-ClassPath: .
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleEFeatureAnnotator.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleEFeatureAnnotator.java
index 04a0f853fd..ee35a0eac5 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleEFeatureAnnotator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleEFeatureAnnotator.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
 /**
  * An example of providing an extension for Teneo Mapping. See <a
  * href="http://wiki.eclipse.org/Teneo/Hibernate/Extensions">here</a> for more information on Teneo extensions.
- * 
+ *
  * @author Martin Taal
  */
 public class CDOExampleEFeatureAnnotator extends CDOEFeatureAnnotator
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleUUIDHexGenerator.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleUUIDHexGenerator.java
index 1d9bfe0a6b..1729418bcf 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleUUIDHexGenerator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleUUIDHexGenerator.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 /**
  * An example of overriding the standard UUID generator of Hibernate to prevent it overwriting an already existing id in
  * an object.
- * 
+ *
  * @author mtaal
  */
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
index d62604f1ee..a8812c9429 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
@@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
 Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
 Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.100";x-internal:=true,
+Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.200";x-internal:=true,
+ org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.2.200";x-internal:=true,
  org.eclipse.wb.swt;version="4.2.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
index 31756bf729..ca37812656 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
@@ -109,21 +109,20 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
 
     private static final Random RANDOM = new Random();
 
-    private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0,
-        0, 255, 254, 0, 19, 67, 114, 101, 97, 116, 101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0,
-        67, 0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9, 12, 17, 15, 18, 18, 17,
-        15, 17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30,
-        36, 28, 30, 31, 30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30,
+    private static final int[] BACKGROUND = { 255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 1, 0, 72, 0, 72, 0, 0,
+        255, 254, 0, 19, 67, 114, 101, 97, 116, 101, 100, 32, 119, 105, 116, 104, 32, 71, 73, 77, 80, 255, 219, 0, 67,
+        0, 5, 3, 4, 4, 4, 3, 5, 4, 4, 4, 5, 5, 5, 6, 7, 12, 8, 7, 7, 7, 7, 15, 11, 11, 9, 12, 17, 15, 18, 18, 17, 15,
+        17, 17, 19, 22, 28, 23, 19, 20, 26, 21, 17, 17, 24, 33, 24, 26, 29, 29, 31, 31, 31, 19, 23, 34, 36, 34, 30, 36,
+        28, 30, 31, 30, 255, 219, 0, 67, 1, 5, 5, 5, 7, 6, 7, 14, 8, 8, 14, 30, 20, 17, 20, 30, 30, 30, 30, 30, 30, 30,
         30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0, 20, 3, 1, 34, 0,
-        2, 17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196,
-        0, 34, 16, 0, 2, 2, 0, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178,
-        209, 97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17,
-        0, 2, 2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17,
-        3, 17, 0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205,
-        211, 133, 245, 141, 180, 155, 122, 106, 255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48,
-        121, 197, 244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237, 20, 182, 137, 64, 6, 140,
-        255, 217 };
+        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 255, 192, 0, 17, 8, 0, 20, 0, 20, 3, 1, 34, 0, 2,
+        17, 1, 3, 17, 1, 255, 196, 0, 23, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 7, 255, 196, 0,
+        34, 16, 0, 2, 2, 0, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 4, 2, 20, 33, 52, 84, 17, 115, 145, 178, 209,
+        97, 255, 196, 0, 23, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 3, 255, 196, 0, 27, 17, 0, 2,
+        2, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 17, 33, 49, 81, 18, 255, 218, 0, 12, 3, 1, 0, 2, 17, 3, 17,
+        0, 63, 0, 225, 37, 87, 118, 245, 59, 79, 217, 140, 212, 60, 24, 60, 226, 250, 83, 110, 196, 74, 10, 205, 211,
+        133, 245, 141, 180, 155, 122, 106, 255, 0, 78, 77, 187, 88, 4, 164, 237, 96, 204, 5, 89, 168, 120, 48, 121, 197,
+        244, 10, 223, 5, 233, 240, 148, 170, 238, 222, 167, 105, 251, 48, 9, 237, 20, 182, 137, 64, 6, 140, 255, 217 };
 
     private SortedMap<String, Channel> channels = new TreeMap<String, Channel>();
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
index e4e5f49902..457af50ccc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
@@ -81,8 +81,8 @@ public class NormalRepositoryView extends AbstractView<IRepository>
   protected void initializeToolBar(IToolBarManager toolbarManager)
   {
     super.initializeToolBar(toolbarManager);
-    toolbarManager.add(new Action("Browser", ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID,
-        "icons/Browser.gif"))
+    toolbarManager.add(new Action("Browser",
+        ExampleResourceManager.getPluginImageDescriptor(Application.PLUGIN_ID, "icons/Browser.gif"))
     {
       @Override
       public void run()
@@ -95,7 +95,7 @@ public class NormalRepositoryView extends AbstractView<IRepository>
           try
           {
             PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser()
-                .openURL(new URL("http://localhost:" + port));
+            .openURL(new URL("http://localhost:" + port));
           }
           catch (Exception ex)
           {
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index 0a28f852a4..17e9bf352a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -85,7 +85,7 @@ import java.util.Properties;
 /**
  * @author Eike Stepper
  */
-public abstract class NodeType extends SetContainer<Node> implements IElement
+public abstract class NodeType extends SetContainer<Node>implements IElement
 {
   public static final String TYPE_PROPERTY = "Type";
 
@@ -228,8 +228,8 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     String browserPort = node.getSetting(BROWSER_PROPERTY);
     if (browserPort != null && browserPort.length() != 0)
     {
-      CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE.getElement(
-          "org.eclipse.emf.cdo.server.browsers", "default", browserPort);
+      CDOServerBrowser browser = (CDOServerBrowser)IPluginContainer.INSTANCE
+          .getElement("org.eclipse.emf.cdo.server.browsers", "default", browserPort);
       node.setObject(CDOServerBrowser.class, browser);
     }
   }
@@ -545,8 +545,8 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     {
       super.start(node);
 
-      final CDOSession session = (CDOSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions",
-          "cdo", "jvm://example?repositoryName=" + REPOSITORY_NAME);
+      final CDOSession session = (CDOSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions", "cdo",
+          "jvm://example?repositoryName=" + REPOSITORY_NAME);
       session.getPackageRegistry().putEPackage(CompanyPackage.eINSTANCE);
 
       node.setObject(CDOSession.class, session);
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
index 62252dd9b9..604c7b51c3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
@@ -32,14 +32,14 @@ import java.util.Map;
 /**
  * Utility class for managing OS resources associated with SWT/JFace controls such as colors, fonts, images,
  * etc.
- * 
+ *
  * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the
  * operating system resources managed by cached objects when those objects and OS resources are no longer
  * needed (e.g. on application shutdown)
- * 
+ *
  * This class may be freely distributed as part of any application or plugin.
  * <p>
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -55,7 +55,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified
    * class.
-   * 
+   *
    * @param clazz
    *            the {@link Class} relative to which to find the image descriptor.
    * @param path
@@ -69,7 +69,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *            the path to the image file.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
@@ -88,7 +88,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
-   * 
+   *
    * @param descriptor
    *            the {@link ImageDescriptor} for the {@link Image}.
    * @return the {@link Image} based on the specified {@link ImageDescriptor}.
@@ -116,7 +116,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated.
    * @param decorator
@@ -130,7 +130,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated.
    * @param decorator
@@ -267,13 +267,13 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *            the plugin {@link Object} containing the image
    * @param name
    *            the path to the image within the plugin
    * @return the {@link Image} stored in the file at the specified path
-   * 
+   *
    * @deprecated Use {@link #getPluginImage(String, String)} instead.
    */
   @Deprecated
@@ -296,7 +296,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *            the symbolic name of the {@link Bundle}.
    * @param path
@@ -360,13 +360,13 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *            the plugin {@link Object} containing the image.
    * @param name
    *            the path to th eimage within the plugin.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @deprecated Use {@link #getPluginImageDescriptor(String, String)} instead.
    */
   @Deprecated
@@ -393,7 +393,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *            the symbolic name of the {@link Bundle}.
    * @param path
@@ -441,7 +441,7 @@ public class ExampleResourceManager extends ExampleSWTResourceManager
 
   /**
    * Returns an {@link URL} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *            the plugin {@link Object} containing the file path.
    * @param name
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleSWTResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleSWTResourceManager.java
index 0e99b5a2d3..01521d129f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleSWTResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleSWTResourceManager.java
@@ -51,7 +51,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns the system {@link Color} matching the specific ID.
-   * 
+   *
    * @param systemColorID
    *            the ID value for the color
    * @return the system {@link Color} matching the specific ID
@@ -64,7 +64,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns a {@link Color} given its red, green and blue component values.
-   * 
+   *
    * @param r
    *            the red component of the color
    * @param g
@@ -80,7 +80,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns a {@link Color} given its RGB value.
-   * 
+   *
    * @param rgb
    *            the {@link RGB} value of the color
    * @return the {@link Color} matching the RGB value
@@ -121,7 +121,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} encoded by the specified {@link InputStream}.
-   * 
+   *
    * @param stream
    *            the {@link InputStream} encoding the image data
    * @return the {@link Image} encoded by the specified input stream
@@ -146,7 +146,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *            the path to the image file
    * @return the {@link Image} stored in the file at the specified path
@@ -172,7 +172,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *            the {@link Class} relative to which to find the image
    * @param path
@@ -249,7 +249,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated
    * @param decorator
@@ -263,7 +263,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated
    * @param decorator
@@ -373,7 +373,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns a {@link Font} based on its name, height and style.
-   * 
+   *
    * @param name
    *            the name of the font
    * @param height
@@ -390,7 +390,7 @@ public class ExampleSWTResourceManager
   /**
    * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline
    * flags are also supported.
-   * 
+   *
    * @param name
    *            the name of the font
    * @param size
@@ -441,7 +441,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns a bold version of the given {@link Font}.
-   * 
+   *
    * @param baseFont
    *            the {@link Font} for which a bold version is desired
    * @return the bold version of the given {@link Font}
@@ -490,7 +490,7 @@ public class ExampleSWTResourceManager
 
   /**
    * Returns the system cursor matching the specific ID.
-   * 
+   *
    * @param id
    *            int The ID value for the cursor
    * @return Cursor The system cursor matching the specific ID
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
index d52bdd333e..318fb72d1b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.clone;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index 028fb93a35..8339f17f75 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -181,7 +181,7 @@ public abstract class AbstractOfflineExampleServer
     {
       System.out.println();
       System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
index 49609279c5..2bdc2d4479 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
@@ -36,13 +36,13 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Addressable} object. <!--
  * begin-user-doc -->
- * 
+ *
  * @since 4.0<!-- end-user-doc -->
  * @generated
  */
-public class AddressableItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class AddressableItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -80,12 +80,12 @@ public class AddressableItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Addressable_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
-        CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Addressable_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),
+            CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -95,12 +95,14 @@ public class AddressableItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addStreetPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Addressable_street_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature", "_UI_Addressable_type"),
-        CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_Addressable_street_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature",
+                    "_UI_Addressable_type"),
+                CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -110,12 +112,12 @@ public class AddressableItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addCityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Addressable_city_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
-        CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Addressable_city_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),
+            CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -147,8 +149,8 @@ public class AddressableItemProvider extends CDOItemProviderAdapter implements I
   public String getText(Object object)
   {
     String label = ((Addressable)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Addressable_type") : getString("_UI_Addressable_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_Addressable_type")
+        : getString("_UI_Addressable_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
index e4d46ec074..4989cf6bc3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CategoryItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -38,12 +38,12 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Category} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class CategoryItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class CategoryItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,12 +79,12 @@ public class CategoryItemProvider extends CDOItemProviderAdapter implements IEdi
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Category_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
-        CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Category_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
+            CompanyPackage.Literals.CATEGORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -160,8 +160,8 @@ public class CategoryItemProvider extends CDOItemProviderAdapter implements IEdi
   public String getText(Object object)
   {
     String label = ((Category)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Category_type") : getString("_UI_Category_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Category_type")
+        : getString("_UI_Category_type") + " " + label;
   }
 
   /**
@@ -199,11 +199,11 @@ public class CategoryItemProvider extends CDOItemProviderAdapter implements IEdi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES,
-        CompanyFactory.eINSTANCE.createCategory()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.CATEGORY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS,
-        CompanyFactory.eINSTANCE.createProduct()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.CATEGORY__PRODUCTS, CompanyFactory.eINSTANCE.createProduct()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyEditPlugin.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyEditPlugin.java
index 6eb9d58941..1b4cbda811 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyEditPlugin.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
index 925d277312..af4e7cb8a6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
@@ -123,8 +123,8 @@ public class CompanyItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Company)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Company_type") : getString("_UI_Company_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Company_type")
+        : getString("_UI_Company_type") + " " + label;
   }
 
   /**
@@ -162,14 +162,14 @@ public class CompanyItemProvider extends AddressableItemProvider
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES,
-        CompanyFactory.eINSTANCE.createCategory()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.COMPANY__CATEGORIES, CompanyFactory.eINSTANCE.createCategory()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS,
-        CompanyFactory.eINSTANCE.createSupplier()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.COMPANY__SUPPLIERS, CompanyFactory.eINSTANCE.createSupplier()));
 
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS,
-        CompanyFactory.eINSTANCE.createCustomer()));
+    newChildDescriptors.add(
+        createChildParameter(CompanyPackage.Literals.COMPANY__CUSTOMERS, CompanyFactory.eINSTANCE.createCustomer()));
 
     newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.COMPANY__PURCHASE_ORDERS,
         CompanyFactory.eINSTANCE.createPurchaseOrder()));
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
index ac0615e550..d59b651713 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
@@ -43,11 +43,11 @@ import java.util.List;
  * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable, IChildCreationExtender
+public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -76,7 +76,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -268,7 +268,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
   /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.examples.company.Order} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected OrderItemProvider orderItemProvider;
@@ -366,7 +366,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
       {
         return adapter;
       }
@@ -439,30 +439,48 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
   }
 
   /**
-   * This disposes all of the item providers created by this factory. 
+   * This disposes all of the item providers created by this factory.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void dispose()
   {
     if (companyItemProvider != null)
+    {
       companyItemProvider.dispose();
+    }
     if (supplierItemProvider != null)
+    {
       supplierItemProvider.dispose();
+    }
     if (customerItemProvider != null)
+    {
       customerItemProvider.dispose();
+    }
     if (orderItemProvider != null)
+    {
       orderItemProvider.dispose();
+    }
     if (orderDetailItemProvider != null)
+    {
       orderDetailItemProvider.dispose();
+    }
     if (purchaseOrderItemProvider != null)
+    {
       purchaseOrderItemProvider.dispose();
+    }
     if (salesOrderItemProvider != null)
+    {
       salesOrderItemProvider.dispose();
+    }
     if (categoryItemProvider != null)
+    {
       categoryItemProvider.dispose();
+    }
     if (productItemProvider != null)
+    {
       productItemProvider.dispose();
+    }
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
index c3e29974f4..4695296fb3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
@@ -63,11 +63,11 @@ public class CustomerItemProvider extends AddressableItemProvider
    */
   protected void addSalesOrdersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Customer_salesOrders_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
-        CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Customer_salesOrders_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Customer_salesOrders_feature", "_UI_Customer_type"),
+            CompanyPackage.Literals.CUSTOMER__SALES_ORDERS, true, false, true, null, null, null));
   }
 
   /**
@@ -100,8 +100,8 @@ public class CustomerItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Customer)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Customer_type") : getString("_UI_Customer_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Customer_type")
+        : getString("_UI_Customer_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
index dedcd85aba..fa1c629f1f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderDetailItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -36,12 +36,12 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.OrderDetail} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class OrderDetailItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class OrderDetailItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -78,11 +78,11 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_product_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
-        CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_OrderDetail_product_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
+            CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
@@ -92,12 +92,14 @@ public class OrderDetailItemProvider extends CDOItemProviderAdapter implements I
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_price_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
-        CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
+                    "_UI_OrderDetail_type"),
+                CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false,
+                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
index f681a7866e..28f0ea4f91 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -36,12 +36,12 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Order} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class OrderItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class OrderItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
index d652a0847d..453ff4e9ae 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
@@ -36,12 +36,12 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Company} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class ProductItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    IItemColorProvider, IItemFontProvider
+public class ProductItemProvider extends CDOItemProviderAdapter
+    implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+    IItemPropertySource, IItemColorProvider, IItemFontProvider
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -81,12 +81,12 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
-        CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+            CompanyPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -96,11 +96,11 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
    */
   protected void addOrderDetailsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_orderDetails_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
-        CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_orderDetails_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_orderDetails_feature", "_UI_Product_type"),
+            CompanyPackage.Literals.PRODUCT__ORDER_DETAILS, true, false, true, null, null, null));
   }
 
   /**
@@ -110,12 +110,12 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
    */
   protected void addVatPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_vat_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
-        CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_vat_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_vat_feature", "_UI_Product_type"),
+            CompanyPackage.Literals.PRODUCT__VAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -125,29 +125,29 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
    */
   protected void addDescriptionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_description_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
-        CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_description_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_description_feature", "_UI_Product_type"),
+            CompanyPackage.Literals.PRODUCT__DESCRIPTION, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
    * This adds a property descriptor for the Price feature.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    */
   protected void addPricePropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(), getString("_UI_Product_price_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
-            CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-            null));
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_Product_price_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
+        CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
+        null));
   }
 
   /**
@@ -190,8 +190,8 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
   public String getText(Object object)
   {
     String label = ((Product)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Product_type") : getString("_UI_Product_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Product_type")
+        : getString("_UI_Product_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
index 4b11f4abb8..cfbea1ef2e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/PurchaseOrderItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.PurchaseOrder} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class PurchaseOrderItemProvider extends OrderItemProvider
@@ -67,12 +67,14 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
    */
   protected void addDatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_PurchaseOrder_date_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature", "_UI_PurchaseOrder_type"),
-        CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_PurchaseOrder_date_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_date_feature",
+                    "_UI_PurchaseOrder_type"),
+                CompanyPackage.Literals.PURCHASE_ORDER__DATE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -83,13 +85,11 @@ public class PurchaseOrderItemProvider extends OrderItemProvider
   protected void addSupplierPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_PurchaseOrder_supplier_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
-                "_UI_PurchaseOrder_type"), CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null,
-            null, null));
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_PurchaseOrder_supplier_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_PurchaseOrder_supplier_feature",
+            "_UI_PurchaseOrder_type"),
+            CompanyPackage.Literals.PURCHASE_ORDER__SUPPLIER, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
index c53ca1516f..07e704e077 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SalesOrderItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -26,7 +26,7 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.SalesOrder} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class SalesOrderItemProvider extends OrderItemProvider
@@ -66,12 +66,12 @@ public class SalesOrderItemProvider extends OrderItemProvider
    */
   protected void addIdPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_SalesOrder_id_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
-        CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_SalesOrder_id_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_id_feature", "_UI_SalesOrder_type"),
+            CompanyPackage.Literals.SALES_ORDER__ID, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -81,11 +81,11 @@ public class SalesOrderItemProvider extends OrderItemProvider
    */
   protected void addCustomerPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_SalesOrder_customer_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
-        CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_SalesOrder_customer_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_SalesOrder_customer_feature", "_UI_SalesOrder_type"),
+            CompanyPackage.Literals.SALES_ORDER__CUSTOMER, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
index d8084856c1..893ca91a0e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -26,7 +26,7 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Supplier} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class SupplierItemProvider extends AddressableItemProvider
@@ -66,11 +66,11 @@ public class SupplierItemProvider extends AddressableItemProvider
    */
   protected void addPurchaseOrdersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Supplier_purchaseOrders_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
-        CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Supplier_purchaseOrders_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Supplier_purchaseOrders_feature", "_UI_Supplier_type"),
+            CompanyPackage.Literals.SUPPLIER__PURCHASE_ORDERS, true, false, true, null, null, null));
   }
 
   /**
@@ -80,12 +80,12 @@ public class SupplierItemProvider extends AddressableItemProvider
    */
   protected void addPreferredPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Supplier_preferred_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
-        CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Supplier_preferred_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Supplier_preferred_feature", "_UI_Supplier_type"),
+            CompanyPackage.Literals.SUPPLIER__PREFERRED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -118,8 +118,8 @@ public class SupplierItemProvider extends AddressableItemProvider
   public String getText(Object object)
   {
     String label = ((Supplier)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Supplier_type") : getString("_UI_Supplier_type") + " "
-        + label;
+    return label == null || label.length() == 0 ? getString("_UI_Supplier_type")
+        : getString("_UI_Supplier_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Addressable.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Addressable.java
index 1048318e7a..8a5d4ca83a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Addressable.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Addressable.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Addressable</b></em>'.
- * 
+ *
  * @since 4.0 <!-- end-user-doc -->
  *
  * <p>
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Category.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Category.java
index 35ddedad09..06306e34dc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Category.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Category.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -49,7 +49,7 @@ public interface Category extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.Category#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Company.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Company.java
index 38645af728..4835cb7436 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Company.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Company.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/CompanyPackage.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/CompanyPackage.java
index 009d578045..13449b436c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/CompanyPackage.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/CompanyPackage.java
@@ -63,7 +63,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.examples.company.impl.AddressableImpl <em>Addressable</em>}' class.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.examples.company.impl.AddressableImpl
    * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getAddressable()
@@ -74,7 +74,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    * @ordered
@@ -84,7 +84,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Street</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    * @ordered
@@ -94,7 +94,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>City</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    * @ordered
@@ -104,7 +104,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The number of structural features of the '<em>Addressable</em>' class.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    * @ordered
@@ -260,7 +260,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -334,7 +334,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.examples.company.impl.OrderImpl <em>Order</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.examples.company.impl.OrderImpl
    * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getOrder()
    * @generated
@@ -385,7 +385,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The number of structural features of the '<em>Order Detail</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -437,7 +437,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The number of structural features of the '<em>Purchase Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -471,7 +471,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The number of structural features of the '<em>Sales Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -522,7 +522,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Order Details</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -547,7 +547,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The feature id for the '<em><b>Price</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @generated
    * @ordered
@@ -565,7 +565,7 @@ public interface CompanyPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.examples.company.VAT <em>VAT</em>}' enum. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.examples.company.VAT
    * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getVAT()
    * @generated
@@ -575,7 +575,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Addressable <em>Addressable</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for class '<em>Addressable</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Addressable
@@ -586,7 +586,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.examples.company.Addressable#getName <em>Name</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Addressable#getName()
@@ -598,7 +598,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.examples.company.Addressable#getStreet <em>Street</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Street</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Addressable#getStreet()
@@ -610,7 +610,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.examples.company.Addressable#getCity <em>City</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for the attribute '<em>City</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Addressable#getCity()
@@ -622,7 +622,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Supplier <em>Supplier</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Supplier</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Supplier
    * @generated
@@ -633,7 +633,7 @@ public interface CompanyPackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.examples.company.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Purchase Orders</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Supplier#getPurchaseOrders()
    * @see #getSupplier()
@@ -723,7 +723,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for enum '{@link org.eclipse.emf.cdo.examples.company.VAT <em>VAT</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for enum '<em>VAT</em>'.
    * @see org.eclipse.emf.cdo.examples.company.VAT
    * @generated
@@ -733,7 +733,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Category <em>Category</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Category</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Category
    * @generated
@@ -775,7 +775,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Product <em>Product</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Product</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Product
    * @generated
@@ -826,7 +826,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.examples.company.Product#getPrice <em>Price</em>}'.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0<!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Price</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Product#getPrice()
@@ -838,7 +838,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Company <em>Company</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Company</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Company
    * @generated
@@ -871,7 +871,7 @@ public interface CompanyPackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.examples.company.Company#getPurchaseOrders <em>Purchase Orders</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Purchase Orders</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Company#getPurchaseOrders()
    * @see #getCompany()
@@ -904,7 +904,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Customer <em>Customer</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Customer</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Customer
    * @generated
@@ -925,7 +925,7 @@ public interface CompanyPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.examples.company.Order <em>Order</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Order</em>'.
    * @see org.eclipse.emf.cdo.examples.company.Order
    * @generated
@@ -996,7 +996,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.examples.company.impl.AddressableImpl <em>Addressable</em>}' class.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.examples.company.impl.AddressableImpl
      * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getAddressable()
@@ -1007,7 +1007,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @generated
      */
@@ -1016,7 +1016,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Street</b></em>' attribute feature.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @generated
      */
@@ -1025,7 +1025,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>City</b></em>' attribute feature.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @generated
      */
@@ -1117,7 +1117,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.examples.company.VAT <em>VAT</em>}' enum. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.examples.company.VAT
      * @see org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl#getVAT()
      * @generated
@@ -1144,7 +1144,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CATEGORY__CATEGORIES = eINSTANCE.getCategory_Categories();
@@ -1152,7 +1152,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products();
@@ -1201,7 +1201,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Price</b></em>' attribute feature.
      * <!-- begin-user-doc -->
-     * 
+     *
      * @since 4.0<!-- end-user-doc -->
      * @generated
      */
@@ -1219,7 +1219,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__CATEGORIES = eINSTANCE.getCompany_Categories();
@@ -1227,7 +1227,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Suppliers</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__SUPPLIERS = eINSTANCE.getCompany_Suppliers();
@@ -1235,7 +1235,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Purchase Orders</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__PURCHASE_ORDERS = eINSTANCE.getCompany_PurchaseOrders();
@@ -1243,7 +1243,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Customers</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__CUSTOMERS = eINSTANCE.getCompany_Customers();
@@ -1251,7 +1251,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Sales Orders</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders();
@@ -1285,7 +1285,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Order Details</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails();
@@ -1302,7 +1302,7 @@ public interface CompanyPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Id</b></em>' attribute feature. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      */
     EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id();
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Customer.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Customer.java
index 865cdc54d3..bc93b20204 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Customer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Customer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Order.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Order.java
index a8e164b9a1..163786d6dd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Order.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Order.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/OrderDetail.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/OrderDetail.java
index ac92b2ba6e..ddf307dabe 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/OrderDetail.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/OrderDetail.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Product.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Product.java
index 85793133ba..6bae3a8fdd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Product.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Product.java
@@ -51,7 +51,7 @@ public interface Product extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.Product#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -99,7 +99,7 @@ public interface Product extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.Product#getVat <em>Vat</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Vat</em>' attribute.
    * @see org.eclipse.emf.cdo.examples.company.VAT
@@ -139,7 +139,7 @@ public interface Product extends EObject
    * <p>
    * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @return the value of the '<em>Price</em>' attribute.
    * @see #setPrice(float)
@@ -152,7 +152,7 @@ public interface Product extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.Product#getPrice <em>Price</em>}' attribute.
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @param value the new value of the '<em>Price</em>' attribute.
    * @see #getPrice()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/PurchaseOrder.java
index ceba2add14..00121473bc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/PurchaseOrder.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/PurchaseOrder.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -62,7 +62,7 @@ public interface PurchaseOrder extends Order
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Supplier</em>' reference.
    * @see #setSupplier(Supplier)
    * @see org.eclipse.emf.cdo.examples.company.CompanyPackage#getPurchaseOrder_Supplier()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/SalesOrder.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/SalesOrder.java
index e62c539704..9e557a40f8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/SalesOrder.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/SalesOrder.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -45,7 +45,7 @@ public interface SalesOrder extends Order
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.examples.company.SalesOrder#getId <em>Id</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Id</em>' attribute.
    * @see #getId()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Supplier.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Supplier.java
index 58db832acb..84b687d2d7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Supplier.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/Supplier.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -55,7 +55,7 @@ public interface Supplier extends Addressable
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Preferred</em>' attribute.
    * @see #setPreferred(boolean)
    * @see org.eclipse.emf.cdo.examples.company.CompanyPackage#getSupplier_Preferred()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java
index 4f5cc227e2..fd055ef2f6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/VAT.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java
index 700a32e10b..ef524853cb 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/AddressableImpl.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EClass;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Addressable</b></em>'.
- * 
+ *
  * @since 4.0 <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java
index 46bf568a55..a303c61200 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CategoryImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
index ba122f09c8..e042c345f0 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java
@@ -170,8 +170,10 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory
   {
     VAT result = VAT.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java
index 94f039a352..81e1727165 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
index c7df4c6048..8616eea583 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java
@@ -109,7 +109,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.examples.company.CompanyPackage#eNS_URI
    * @see #init()
@@ -128,7 +128,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link CompanyPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -141,11 +141,14 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
   public static CompanyPackage init()
   {
     if (isInited)
+    {
       return (CompanyPackage)EPackage.Registry.INSTANCE.getEPackage(CompanyPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CompanyPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new CompanyPackageImpl());
+    CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof CompanyPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new CompanyPackageImpl());
 
     isInited = true;
 
@@ -165,7 +168,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -176,7 +179,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -187,7 +190,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -198,7 +201,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -389,7 +392,7 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -539,7 +542,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -609,7 +614,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -622,11 +629,11 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    companyEClass.getESuperTypes().add(this.getAddressable());
-    supplierEClass.getESuperTypes().add(this.getAddressable());
-    customerEClass.getESuperTypes().add(this.getAddressable());
-    purchaseOrderEClass.getESuperTypes().add(this.getOrder());
-    salesOrderEClass.getESuperTypes().add(this.getOrder());
+    companyEClass.getESuperTypes().add(getAddressable());
+    supplierEClass.getESuperTypes().add(getAddressable());
+    customerEClass.getESuperTypes().add(getAddressable());
+    purchaseOrderEClass.getESuperTypes().add(getOrder());
+    salesOrderEClass.getESuperTypes().add(getOrder());
 
     // Initialize classes and features; add operations and parameters
     initEClass(addressableEClass, Addressable.class, "Addressable", IS_ABSTRACT, !IS_INTERFACE,
@@ -639,45 +646,45 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class,
+    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class,
+    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1,
-        Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
+    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(),
-        "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders",
+        null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null,
-        0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1,
+        Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null,
-        0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1,
+        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Product(), this.getProduct(), this.getProduct_OrderDetails(), "product", null, 0, 1,
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Product(), getProduct(), getProduct_OrderDetails(), "product", null, 0, 1,
         OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
@@ -687,35 +694,35 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier",
-        null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1,
+        PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1,
-        1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1,
+        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Products(), this.getProduct(), null, "products", null, 0, -1, Category.class,
+    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Products(), getProduct(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(productEClass, Product.class, "Product", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProduct_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails",
-        null, 0, -1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEReference(getProduct_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1,
+        Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct_Vat(), getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getProduct_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product.class,
         IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -744,17 +751,14 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage
   protected void createTeneoAnnotations()
   {
     String source = "teneo.jpa";
-    addAnnotation(
-        this,
-        source,
-        new String[] {
-            "value",
-            "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.examples.hibernate.server.CDOExampleUUIDHexGenerator\")})" });
+    addAnnotation(this, source, new String[] { "value",
+        "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.examples.hibernate.server.CDOExampleUUIDHexGenerator\")})" });
     addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" });
     addAnnotation(getCategory_Name(), source,
         new String[] { "value", "@Id @GeneratedValue(generator=\"system-uuid\")" });
     addAnnotation(getProduct_Name(), source, new String[] { "value", "@Id" });
-    addAnnotation(getProduct_Vat(), source, new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
+    addAnnotation(getProduct_Vat(), source,
+        new String[] { "value", "@Basic(optional=false)\n@Column(nullable=false)" });
   }
 
 } // CompanyPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java
index 384ec3d270..cbe34ddd51 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CustomerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java
index cf9e9f86eb..056c608856 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderDetailImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java
index 95c3e7db02..a99e8f02ee 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/OrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java
index 23c8d665de..97e189449e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/ProductImpl.java
@@ -132,7 +132,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
@@ -143,7 +143,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc -->
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java
index 763c1ccb0f..c06a2923e0 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/PurchaseOrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java
index 758c397954..36d0c8f4f4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SalesOrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java
index 75859aa796..dfd8d4ad18 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/SupplierImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanyAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanyAdapterFactory.java
index 321232c18b..ef1dc932cc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanyAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanyAdapterFactory.java
@@ -168,7 +168,7 @@ public class CompanyAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.examples.company.Addressable <em>Addressable</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.examples.company.Addressable
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java
index 8ff56e3bc4..3474104d6c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java
@@ -102,7 +102,9 @@ public class CompanySwitch<T>
       Addressable addressable = (Addressable)theEObject;
       T result = caseAddressable(addressable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.COMPANY:
@@ -110,9 +112,13 @@ public class CompanySwitch<T>
       Company company = (Company)theEObject;
       T result = caseCompany(company);
       if (result == null)
+      {
         result = caseAddressable(company);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.SUPPLIER:
@@ -120,9 +126,13 @@ public class CompanySwitch<T>
       Supplier supplier = (Supplier)theEObject;
       T result = caseSupplier(supplier);
       if (result == null)
+      {
         result = caseAddressable(supplier);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.CUSTOMER:
@@ -130,9 +140,13 @@ public class CompanySwitch<T>
       Customer customer = (Customer)theEObject;
       T result = caseCustomer(customer);
       if (result == null)
+      {
         result = caseAddressable(customer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.ORDER:
@@ -140,7 +154,9 @@ public class CompanySwitch<T>
       Order order = (Order)theEObject;
       T result = caseOrder(order);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.ORDER_DETAIL:
@@ -148,7 +164,9 @@ public class CompanySwitch<T>
       OrderDetail orderDetail = (OrderDetail)theEObject;
       T result = caseOrderDetail(orderDetail);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.PURCHASE_ORDER:
@@ -156,9 +174,13 @@ public class CompanySwitch<T>
       PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject;
       T result = casePurchaseOrder(purchaseOrder);
       if (result == null)
+      {
         result = caseOrder(purchaseOrder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.SALES_ORDER:
@@ -166,9 +188,13 @@ public class CompanySwitch<T>
       SalesOrder salesOrder = (SalesOrder)theEObject;
       T result = caseSalesOrder(salesOrder);
       if (result == null)
+      {
         result = caseOrder(salesOrder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.CATEGORY:
@@ -176,7 +202,9 @@ public class CompanySwitch<T>
       Category category = (Category)theEObject;
       T result = caseCategory(category);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CompanyPackage.PRODUCT:
@@ -184,7 +212,9 @@ public class CompanySwitch<T>
       Product product = (Product)theEObject;
       T result = caseProduct(product);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -196,7 +226,7 @@ public class CompanySwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Addressable</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch.
-   * 
+   *
    * @since 4.0 <!-- end-user-doc -->
    * @param object the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Addressable</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CategoryValidator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CategoryValidator.java
index a5d005b5a1..ad451e9e06 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CategoryValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CategoryValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import org.eclipse.emf.common.util.EList;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface CategoryValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CompanyValidator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CompanyValidator.java
index 1243863362..d227444c55 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CompanyValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CompanyValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface CompanyValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CustomerValidator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CustomerValidator.java
index cbad19e5de..75e73a4f31 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CustomerValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/CustomerValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.EList;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface CustomerValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderDetailValidator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderDetailValidator.java
index 48e139bbd8..57c12151c5 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderDetailValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderDetailValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.examples.company.Product;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface OrderDetailValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderValidator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderValidator.java
index 4dbd691fa2..0683cc8315 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/OrderValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.EList;
  * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
  * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface OrderValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/ProductValidator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/ProductValidator.java
index 020b36ad33..ca2dddcfc3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/ProductValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/ProductValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/PurchaseOrderValidator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/PurchaseOrderValidator.java
index 9bfeeef2fb..2eb7ce8561 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/PurchaseOrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/PurchaseOrderValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import java.util.Date;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface PurchaseOrderValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SalesOrderValidator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SalesOrderValidator.java
index 77ba427284..2ad1b95a3b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SalesOrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SalesOrderValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.examples.company.Customer;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface SalesOrderValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SupplierValidator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SupplierValidator.java
index a0b0c227d2..66045b583c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SupplierValidator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/validation/SupplierValidator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.EList;
  * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
  * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
  * -Dorg.eclipse.emf.examples.generator.validator=false.
- * 
+ *
  * @since 2.0
  */
 public interface SupplierValidator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF
index 74439987a9..5d724d0948 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.business.edit;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.gastro.business.provider.BusinessEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
index 7233816206..a7c17c79e8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -43,7 +43,7 @@ import java.util.List;
  * @generated
  */
 public class BusinessDayItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -81,12 +81,12 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addDatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_BusinessDay_date_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
-        BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_BusinessDay_date_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
+            BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -96,11 +96,11 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addMenuCardPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_BusinessDay_menuCard_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
-        BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_BusinessDay_menuCard_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
+            BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
   }
 
   /**
@@ -110,12 +110,14 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addClosedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_BusinessDay_closed_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature", "_UI_BusinessDay_type"),
-        BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_BusinessDay_closed_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature",
+                    "_UI_BusinessDay_type"),
+                BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false,
+                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -184,7 +186,7 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -231,11 +233,11 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS,
-        BusinessFactory.eINSTANCE.createOrder()));
+    newChildDescriptors.add(
+        createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS, BusinessFactory.eINSTANCE.createOrder()));
 
-    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS,
-        BusinessFactory.eINSTANCE.createWaiter()));
+    newChildDescriptors.add(
+        createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS, BusinessFactory.eINSTANCE.createWaiter()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java
index 4327d49b3c..91a585b0f2 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
index 3ec079ae6f..f7b4dde36b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,11 +38,11 @@ import java.util.Collection;
  * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable
+public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -63,7 +63,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -85,7 +85,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.business.BusinessDay} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected BusinessDayItemProvider businessDayItemProvider;
@@ -93,7 +93,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This creates an adapter for a {@link org.gastro.business.BusinessDay}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -134,7 +134,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.business.OrderDetail} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected OrderDetailItemProvider orderDetailItemProvider;
@@ -142,7 +142,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This creates an adapter for a {@link org.gastro.business.OrderDetail}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -232,7 +232,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
       {
         return adapter;
       }
@@ -278,20 +278,28 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This disposes all of the item providers created by this factory. 
+   * This disposes all of the item providers created by this factory.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void dispose()
   {
     if (businessDayItemProvider != null)
+    {
       businessDayItemProvider.dispose();
+    }
     if (orderItemProvider != null)
+    {
       orderItemProvider.dispose();
+    }
     if (orderDetailItemProvider != null)
+    {
       orderDetailItemProvider.dispose();
+    }
     if (waiterItemProvider != null)
+    {
       waiterItemProvider.dispose();
+    }
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
index 07ec8ea930..7bb22afff9 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -40,7 +40,7 @@ import java.util.List;
  * @generated
  */
 public class OrderDetailItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,11 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addOfferingPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_offering_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
-        BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_OrderDetail_offering_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
+            BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
   }
 
   /**
@@ -93,12 +93,14 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addQuantityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_quantity_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature", "_UI_OrderDetail_type"),
-        BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_OrderDetail_quantity_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature",
+                    "_UI_OrderDetail_type"),
+                BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false,
+                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -108,12 +110,14 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addStatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_state_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature", "_UI_OrderDetail_type"),
-        BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_OrderDetail_state_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature",
+                    "_UI_OrderDetail_type"),
+                BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -123,12 +127,14 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_price_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
-        BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
+                    "_UI_OrderDetail_type"),
+                BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false,
+                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -164,15 +170,15 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
   public String getText(Object object)
   {
     OrderDetail orderDetail = (OrderDetail)object;
-    return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type") : orderDetail.getOffering().getName()
-        + " " + orderDetail.getQuantity();
+    return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type")
+        : orderDetail.getOffering().getName() + " " + orderDetail.getQuantity();
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
index a54bb59ef4..fc769b052f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -42,7 +42,7 @@ import java.util.List;
  * @generated
  */
 public class OrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,11 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addTablePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Order_table_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
-        BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Order_table_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
+            BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
   }
 
   /**
@@ -93,12 +93,12 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addNumberPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Order_number_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
-        BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Order_number_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
+            BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+            null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
index 4dc932da3a..a4a99c09fa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
  * @generated
  */
 public class WaiterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,11 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addTablesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Waiter_tables_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
-        BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Waiter_tables_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
+            BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
   }
 
   /**
@@ -93,11 +93,11 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addEmployeePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Waiter_employee_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
-        BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Waiter_employee_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
+            BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
   }
 
   /**
@@ -107,12 +107,12 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addFromPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Waiter_from_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
-        BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Waiter_from_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
+            BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -122,12 +122,12 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addUntilPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Waiter_until_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
-        BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Waiter_until_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
+            BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -163,7 +163,7 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF
index acd41fd762..51cbd6f9a9 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.business;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.business;version="4.0.300",
- org.gastro.business.impl;version="4.0.300",
- org.gastro.business.util;version="4.0.300"
+Export-Package: org.gastro.business;version="4.0.400",
+ org.gastro.business.impl;version="4.0.400",
+ org.gastro.business.util;version="4.0.400"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessDay.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessDay.java
index 6da8ed65fe..07cc913f3d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessDay.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessDay.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -60,7 +60,7 @@ public interface BusinessDay extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.BusinessDay#getDate <em>Date</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Date</em>' attribute.
    * @see #getDate()
@@ -87,7 +87,7 @@ public interface BusinessDay extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.BusinessDay#getMenuCard <em>Menu Card</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Menu Card</em>' reference.
    * @see #getMenuCard()
@@ -149,7 +149,7 @@ public interface BusinessDay extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.BusinessDay#isClosed <em>Closed</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Closed</em>' attribute.
    * @see #isClosed()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessFactory.java
index 44227c9eb2..134c3e66b0 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessPackage.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessPackage.java
index 76ca4ff404..94c8dbaca4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessPackage.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/BusinessPackage.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -65,7 +65,7 @@ public interface BusinessPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.business.impl.BusinessDayImpl <em>Day</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.business.impl.BusinessDayImpl
    * @see org.gastro.business.impl.BusinessPackageImpl#getBusinessDay()
    * @generated
@@ -177,7 +177,7 @@ public interface BusinessPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.business.impl.OrderDetailImpl <em>Order Detail</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.business.impl.OrderDetailImpl
    * @see org.gastro.business.impl.BusinessPackageImpl#getOrderDetail()
    * @generated
@@ -227,7 +227,7 @@ public interface BusinessPackage extends EPackage
   /**
    * The number of structural features of the '<em>Order Detail</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -315,7 +315,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.BusinessDay#getDate <em>Date</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Date</em>'.
    * @see org.gastro.business.BusinessDay#getDate()
    * @see #getBusinessDay()
@@ -356,7 +356,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.BusinessDay#isClosed <em>Closed</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Closed</em>'.
    * @see org.gastro.business.BusinessDay#isClosed()
    * @see #getBusinessDay()
@@ -387,7 +387,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.business.Order#getTable <em>Table</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Table</em>'.
    * @see org.gastro.business.Order#getTable()
    * @see #getOrder()
@@ -408,7 +408,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.Order#getNumber <em>Number</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Number</em>'.
    * @see org.gastro.business.Order#getNumber()
    * @see #getOrder()
@@ -419,7 +419,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.business.OrderDetail <em>Order Detail</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Order Detail</em>'.
    * @see org.gastro.business.OrderDetail
    * @generated
@@ -459,7 +459,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.OrderDetail#getState <em>State</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>State</em>'.
    * @see org.gastro.business.OrderDetail#getState()
    * @see #getOrderDetail()
@@ -470,7 +470,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.OrderDetail#getPrice <em>Price</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Price</em>'.
    * @see org.gastro.business.OrderDetail#getPrice()
    * @see #getOrderDetail()
@@ -501,7 +501,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the reference list '{@link org.gastro.business.Waiter#getTables <em>Tables</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Tables</em>'.
    * @see org.gastro.business.Waiter#getTables()
    * @see #getWaiter()
@@ -512,7 +512,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.business.Waiter#getEmployee <em>Employee</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Employee</em>'.
    * @see org.gastro.business.Waiter#getEmployee()
    * @see #getWaiter()
@@ -523,7 +523,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.Waiter#getFrom <em>From</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>From</em>'.
    * @see org.gastro.business.Waiter#getFrom()
    * @see #getWaiter()
@@ -534,7 +534,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.Waiter#getUntil <em>Until</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Until</em>'.
    * @see org.gastro.business.Waiter#getUntil()
    * @see #getWaiter()
@@ -576,7 +576,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.business.impl.BusinessDayImpl <em>Day</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.business.impl.BusinessDayImpl
      * @see org.gastro.business.impl.BusinessPackageImpl#getBusinessDay()
      * @generated
@@ -626,7 +626,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.business.impl.OrderImpl <em>Order</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.business.impl.OrderImpl
      * @see org.gastro.business.impl.BusinessPackageImpl#getOrder()
      * @generated
@@ -652,7 +652,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Order Details</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails();
@@ -717,7 +717,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.business.impl.WaiterImpl <em>Waiter</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.business.impl.WaiterImpl
      * @see org.gastro.business.impl.BusinessPackageImpl#getWaiter()
      * @generated
@@ -767,7 +767,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.business.OrderState <em>Order State</em>}' enum. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.business.OrderState
      * @see org.gastro.business.impl.BusinessPackageImpl#getOrderState()
      * @generated
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/Order.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/Order.java
index 2ae623955f..618a9c1a96 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/Order.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/Order.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderDetail.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderDetail.java
index 585580d634..1c89d8284f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderDetail.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderDetail.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -59,7 +59,7 @@ public interface OrderDetail extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.OrderDetail#getOrder <em>Order</em>}' container reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Order</em>' container reference.
    * @see #getOrder()
@@ -86,7 +86,7 @@ public interface OrderDetail extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.OrderDetail#getOffering <em>Offering</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Offering</em>' reference.
    * @see #getOffering()
@@ -113,7 +113,7 @@ public interface OrderDetail extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.OrderDetail#getQuantity <em>Quantity</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Quantity</em>' attribute.
    * @see #getQuantity()
@@ -141,7 +141,7 @@ public interface OrderDetail extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.OrderDetail#getState <em>State</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>State</em>' attribute.
    * @see org.gastro.business.OrderState
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderState.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderState.java
index 0d0d324e60..0a3cd87ff9 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderState.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/OrderState.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/Waiter.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/Waiter.java
index c0bac1bbb9..27e10fc0d8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/Waiter.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/Waiter.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -105,7 +105,7 @@ public interface Waiter extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.Waiter#getEmployee <em>Employee</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Employee</em>' reference.
    * @see #getEmployee()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java
index 12ce36b444..e3ea70101d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
index 16c66488c8..019192aa11 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -77,13 +77,13 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
     switch (eClass.getClassifierID())
     {
     case BusinessPackage.BUSINESS_DAY:
-      return (EObject)createBusinessDay();
+      return createBusinessDay();
     case BusinessPackage.ORDER:
-      return (EObject)createOrder();
+      return createOrder();
     case BusinessPackage.ORDER_DETAIL:
-      return (EObject)createOrderDetail();
+      return createOrderDetail();
     case BusinessPackage.WAITER:
-      return (EObject)createWaiter();
+      return createWaiter();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -169,8 +169,10 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
   {
     OrderState result = OrderState.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
index 37e17bbc98..093ceaff84 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -72,7 +72,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.gastro.business.BusinessPackage#eNS_URI
    * @see #init()
@@ -91,7 +91,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link BusinessPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -104,11 +104,14 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
   public static BusinessPackage init()
   {
     if (isInited)
+    {
       return (BusinessPackage)EPackage.Registry.INSTANCE.getEPackage(BusinessPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BusinessPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new BusinessPackageImpl());
+    BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof BusinessPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new BusinessPackageImpl());
 
     isInited = true;
 
@@ -369,7 +372,9 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -419,7 +424,9 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -440,52 +447,52 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
     // Initialize classes and features; add operations and parameters
     initEClass(businessDayEClass, BusinessDay.class, "BusinessDay", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1,
         BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Orders(), this.getOrder(), this.getOrder_BusinessDay(), "orders", null, 0, -1,
+    initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1,
         BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Waiters(), this.getWaiter(), this.getWaiter_BusinessDay(), "waiters", null, 1, -1,
+    initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1,
         BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_BusinessDay(), this.getBusinessDay(), this.getBusinessDay_Orders(), "businessDay", null, 1,
-        1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+    initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1,
+        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null,
-        1, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1,
+        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
     initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1,
         OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_State(), this.getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
+    initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
         IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(waiterEClass, Waiter.class, "Waiter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getWaiter_BusinessDay(), this.getBusinessDay(), this.getBusinessDay_Waiters(), "businessDay", null,
-        0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1,
+        Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java
index 452d755b5d..28685dc708 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -143,7 +143,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public float getPrice()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java
index fa15aeb7f8..1416debcbb 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java
index 071434f87a..844e18ea44 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java
index 26299cc6e3..515c948521 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -129,7 +129,7 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.business.BusinessDay <em>Day</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.business.BusinessDay
    * @generated
@@ -143,7 +143,7 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.business.Order <em>Order</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.business.Order
    * @generated
@@ -157,7 +157,7 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.business.OrderDetail <em>Order Detail</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.business.OrderDetail
    * @generated
@@ -171,7 +171,7 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.business.Waiter <em>Waiter</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.business.Waiter
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java
index 98972aa110..1b90010bc4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -29,7 +29,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.business.BusinessPackage
  * @generated
  */
@@ -37,14 +37,14 @@ public class BusinessSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static BusinessPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public BusinessSwitch()
@@ -58,7 +58,7 @@ public class BusinessSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -70,7 +70,7 @@ public class BusinessSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -90,7 +90,7 @@ public class BusinessSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -146,7 +146,7 @@ public class BusinessSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Day</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Day</em>'.
@@ -161,7 +161,7 @@ public class BusinessSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Order</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Order</em>'.
@@ -176,7 +176,7 @@ public class BusinessSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Order Detail</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Order Detail</em>'.
@@ -191,7 +191,7 @@ public class BusinessSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Waiter</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Waiter</em>'.
@@ -207,7 +207,7 @@ public class BusinessSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF
index e1b03189ea..b239ef8ab1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.inventory.edit;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.gastro.inventory.provider.InventoryEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
index 6eed6fd5c5..0114db4dca 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,15 +34,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Department} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class DepartmentItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public DepartmentItemProvider(AdapterFactory adapterFactory)
@@ -52,7 +52,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -89,7 +89,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -103,7 +103,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * This returns Department.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -114,7 +114,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -125,7 +125,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -138,7 +138,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -160,7 +160,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -168,14 +168,14 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES,
-        InventoryFactory.eINSTANCE.createRecipe()));
+    newChildDescriptors.add(
+        createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES, InventoryFactory.eINSTANCE.createRecipe()));
 
     newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__EMPLOYEES,
         InventoryFactory.eINSTANCE.createEmployee()));
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS,
-        InventoryFactory.eINSTANCE.createStock()));
+    newChildDescriptors.add(
+        createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS, InventoryFactory.eINSTANCE.createStock()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
index f93a968ed6..cd9108b7a0 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Employee} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class EmployeeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EmployeeItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,22 +71,22 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Employee_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
-        InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Employee_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
+            InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -97,7 +97,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns Employee.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -108,7 +108,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -119,7 +119,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -132,7 +132,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -152,7 +152,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -163,7 +163,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
index 1c47d3f764..f5382d0bdc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Ingredient} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class IngredientItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public IngredientItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -72,36 +72,38 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This adds a property descriptor for the Product feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Ingredient_product_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
-        InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Ingredient_product_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
+            InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
    * This adds a property descriptor for the Quantity feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addQuantityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Ingredient_quantity_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature", "_UI_Ingredient_type"),
-        InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_Ingredient_quantity_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature",
+                    "_UI_Ingredient_type"),
+                InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false,
+                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -112,7 +114,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns Ingredient.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -123,7 +125,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -134,21 +136,21 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
   public String getText(Object object)
   {
     Ingredient ingredient = (Ingredient)object;
-    return ingredient.getProduct() == null ? getString("_UI_Ingredient_type") : ingredient.getProduct().getName() + " "
-        + ingredient.getQuantity();
+    return ingredient.getProduct() == null ? getString("_UI_Ingredient_type")
+        : ingredient.getProduct().getName() + " " + ingredient.getQuantity();
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -169,7 +171,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -180,7 +182,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryEditPlugin.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryEditPlugin.java
index cf52cf3fe2..2554609a41 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryEditPlugin.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -18,28 +18,28 @@ import org.eclipse.emf.common.util.ResourceLocator;
 
 /**
  * This is the central singleton for the Inventory edit plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public final class InventoryEditPlugin extends EMFPlugin
 {
   /**
    * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static final InventoryEditPlugin INSTANCE = new InventoryEditPlugin();
 
   /**
    * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static Implementation plugin;
 
   /**
    * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryEditPlugin()
@@ -49,7 +49,7 @@ public final class InventoryEditPlugin extends EMFPlugin
 
   /**
    * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the singleton instance.
    * @generated
    */
@@ -61,7 +61,7 @@ public final class InventoryEditPlugin extends EMFPlugin
 
   /**
    * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the singleton instance.
    * @generated
    */
@@ -72,14 +72,14 @@ public final class InventoryEditPlugin extends EMFPlugin
 
   /**
    * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static class Implementation extends EclipsePlugin
   {
     /**
      * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public Implementation()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
index 3b24cd96ec..b99c0871b7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,16 +38,16 @@ import java.util.Collection;
  * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable
+public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -63,14 +63,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
   /**
    * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryItemProviderAdapterFactory()
@@ -85,14 +85,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Stock} instances. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StockItemProvider stockItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Stock}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -109,7 +109,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.StockProduct} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StockProductItemProvider stockProductItemProvider;
@@ -117,7 +117,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This creates an adapter for a {@link org.gastro.inventory.StockProduct}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -134,14 +134,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Recipe} instances. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected RecipeItemProvider recipeItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Recipe}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -158,7 +158,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Ingredient} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IngredientItemProvider ingredientItemProvider;
@@ -166,7 +166,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Ingredient}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -183,14 +183,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.MenuCard} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected MenuCardItemProvider menuCardItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.MenuCard}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -207,7 +207,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Restaurant} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected RestaurantItemProvider restaurantItemProvider;
@@ -215,7 +215,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Restaurant}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -232,7 +232,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Department} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected DepartmentItemProvider departmentItemProvider;
@@ -240,7 +240,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Department}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -257,14 +257,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Offering} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected OfferingItemProvider offeringItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Offering}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -281,14 +281,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Table} instances. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TableItemProvider tableItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Table}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -305,14 +305,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Employee} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected EmployeeItemProvider employeeItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Employee}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -329,14 +329,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Section} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected SectionItemProvider sectionItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Section}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -352,7 +352,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ComposeableAdapterFactory getRootAdapterFactory()
@@ -362,7 +362,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
@@ -372,7 +372,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -384,7 +384,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -395,7 +395,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -404,7 +404,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
       {
         return adapter;
       }
@@ -415,7 +415,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void addListener(INotifyChangedListener notifyChangedListener)
@@ -425,7 +425,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void removeListener(INotifyChangedListener notifyChangedListener)
@@ -436,7 +436,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void fireNotifyChanged(Notification notification)
@@ -451,33 +451,55 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void dispose()
   {
     if (stockItemProvider != null)
+    {
       stockItemProvider.dispose();
+    }
     if (stockProductItemProvider != null)
+    {
       stockProductItemProvider.dispose();
+    }
     if (recipeItemProvider != null)
+    {
       recipeItemProvider.dispose();
+    }
     if (ingredientItemProvider != null)
+    {
       ingredientItemProvider.dispose();
+    }
     if (menuCardItemProvider != null)
+    {
       menuCardItemProvider.dispose();
+    }
     if (restaurantItemProvider != null)
+    {
       restaurantItemProvider.dispose();
+    }
     if (departmentItemProvider != null)
+    {
       departmentItemProvider.dispose();
+    }
     if (offeringItemProvider != null)
+    {
       offeringItemProvider.dispose();
+    }
     if (tableItemProvider != null)
+    {
       tableItemProvider.dispose();
+    }
     if (employeeItemProvider != null)
+    {
       employeeItemProvider.dispose();
+    }
     if (sectionItemProvider != null)
+    {
       sectionItemProvider.dispose();
+    }
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
index 48f32943d1..a92cb3fdf4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,15 +38,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.MenuCard} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class MenuCardItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public MenuCardItemProvider(AdapterFactory adapterFactory)
@@ -56,7 +56,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,17 +73,17 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_MenuCard_title_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
-        InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_MenuCard_title_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
+            InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -91,7 +91,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -107,7 +107,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -121,7 +121,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -132,7 +132,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns MenuCard.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -143,7 +143,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -154,7 +154,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -167,7 +167,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -190,7 +190,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -204,7 +204,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
index 5169a6206e..576d12190d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Offering} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class OfferingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public OfferingItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -74,66 +74,68 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This adds a property descriptor for the Product feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Offering_product_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
-        InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Offering_product_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
+            InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Offering_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
-        InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Offering_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
+            InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addDescriptionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Offering_description_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature", "_UI_Offering_type"),
-        InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_Offering_description_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature",
+                    "_UI_Offering_type"),
+                InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
    * This adds a property descriptor for the Price feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Offering_price_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
-        InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Offering_price_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
+            InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -144,7 +146,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns Offering.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -155,7 +157,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -166,7 +168,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -179,7 +181,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -201,7 +203,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -212,7 +214,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
index 0ed6b643fc..71b0444b44 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Product} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ProductItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ProductItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,22 +71,22 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
-        InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+            InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -97,7 +97,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -108,7 +108,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -121,7 +121,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -141,7 +141,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -152,7 +152,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
index 81c17e36d7..c4a6e304f5 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Recipe} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class RecipeItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public RecipeItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,17 +71,17 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * This adds a property descriptor for the Cost feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addCostPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Recipe_cost_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
-        InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Recipe_cost_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
+            InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -89,7 +89,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -105,7 +105,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -119,7 +119,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * This returns Recipe.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -130,7 +130,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -141,7 +141,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -154,7 +154,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -177,7 +177,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
index 2063cb8f15..eaf325c722 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,15 +38,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Restaurant} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class RestaurantItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public RestaurantItemProvider(AdapterFactory adapterFactory)
@@ -56,7 +56,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -74,31 +74,31 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Restaurant_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
-        InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Restaurant_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
+            InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This adds a property descriptor for the Stations feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addStationsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Restaurant_stations_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
-        InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Restaurant_stations_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
+            InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
   }
 
   /**
@@ -106,7 +106,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -124,7 +124,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -138,7 +138,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -149,7 +149,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns Restaurant.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -160,7 +160,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -171,7 +171,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -184,7 +184,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -209,7 +209,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -223,13 +223,13 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
     newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__MENU_CARDS,
         InventoryFactory.eINSTANCE.createMenuCard()));
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES,
-        InventoryFactory.eINSTANCE.createTable()));
+    newChildDescriptors.add(
+        createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES, InventoryFactory.eINSTANCE.createTable()));
   }
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
index 8f3d5ca278..129eed0f74 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,15 +38,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Section} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class SectionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public SectionItemProvider(AdapterFactory adapterFactory)
@@ -56,7 +56,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -74,32 +74,32 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Section_title_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
-        InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Section_title_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
+            InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This adds a property descriptor for the Text feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addTextPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Section_text_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
-        InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Section_text_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
+            InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -107,7 +107,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -123,7 +123,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -137,7 +137,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -148,7 +148,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns Section.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -159,7 +159,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -170,7 +170,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -183,7 +183,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -207,7 +207,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -221,7 +221,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
index 459f9b770c..ba07e0337e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Station} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class StationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public StationItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,22 +71,22 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This adds a property descriptor for the Station ID feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addStationIDPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Station_stationID_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
-        InventoryPackage.Literals.STATION__STATION_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Station_stationID_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
+            InventoryPackage.Literals.STATION__STATION_ID, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -97,7 +97,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -108,7 +108,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -121,7 +121,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -141,7 +141,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -152,7 +152,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
index e07070c8f3..e4d6aeb08c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,15 +38,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Stock} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class StockItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public StockItemProvider(AdapterFactory adapterFactory)
@@ -56,7 +56,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,17 +73,17 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Stock_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
-        InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Stock_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
+            InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -91,7 +91,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -107,7 +107,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -121,7 +121,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -132,7 +132,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * This returns Stock.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -143,7 +143,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -154,7 +154,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -167,7 +167,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -190,7 +190,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -204,7 +204,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
index d7870ae615..44bab02b6c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,15 +34,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.StockProduct} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class StockProductItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public StockProductItemProvider(AdapterFactory adapterFactory)
@@ -52,7 +52,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,54 +71,56 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
 
   /**
    * This adds a property descriptor for the Cost feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addCostPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_StockProduct_cost_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature", "_UI_StockProduct_type"),
-        InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_StockProduct_cost_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature",
+                    "_UI_StockProduct_type"),
+                InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false,
+                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
    * This adds a property descriptor for the Available feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addAvailablePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_StockProduct_available_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature", "_UI_StockProduct_type"),
-        InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_StockProduct_available_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature",
+                "_UI_StockProduct_type"),
+            InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false,
+            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
    * This adds a property descriptor for the Order Limit feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addOrderLimitPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_StockProduct_orderLimit_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature",
-                "_UI_StockProduct_type"), InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false,
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_StockProduct_orderLimit_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature",
+            "_UI_StockProduct_type"),
+            InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false,
             ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
    * This returns StockProduct.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -129,7 +131,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -140,7 +142,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -153,7 +155,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -175,7 +177,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
index 9aa11b674f..ff6b6643c2 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,15 +34,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Table} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class TableItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public TableItemProvider(AdapterFactory adapterFactory)
@@ -52,7 +52,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -69,22 +69,22 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
 
   /**
    * This adds a property descriptor for the Seats feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addSeatsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Table_seats_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
-        InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Table_seats_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
+            InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This returns Table.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -95,7 +95,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -106,7 +106,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -119,7 +119,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -139,7 +139,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF
index 5938f42e08..3463c7e000 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.inventory;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.inventory;version="4.0.300",
- org.gastro.inventory.impl;version="4.0.300",
- org.gastro.inventory.util;version="4.0.300"
+Export-Package: org.gastro.inventory;version="4.0.400",
+ org.gastro.inventory.impl;version="4.0.400",
+ org.gastro.inventory.util;version="4.0.400"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Department.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Department.java
index a347f500dc..a4c547a532 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Department.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Department.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -26,7 +26,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Department#getStocks <em>Stocks</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getDepartment()
  * @model
  * @generated
@@ -42,7 +42,7 @@ public interface Department extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Recipes</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getDepartment_Recipes()
    * @see org.gastro.inventory.Recipe#getDepartment
@@ -59,7 +59,7 @@ public interface Department extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Restaurant</em>' container reference.
    * @see #setRestaurant(Restaurant)
    * @see org.gastro.inventory.InventoryPackage#getDepartment_Restaurant()
@@ -72,7 +72,7 @@ public interface Department extends Station
   /**
    * Sets the value of the '{@link org.gastro.inventory.Department#getRestaurant <em>Restaurant</em>}' container
    * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Restaurant</em>' container reference.
    * @see #getRestaurant()
@@ -89,7 +89,7 @@ public interface Department extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Employees</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getDepartment_Employees()
    * @see org.gastro.inventory.Employee#getDepartment
@@ -107,7 +107,7 @@ public interface Department extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Stocks</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getDepartment_Stocks()
    * @see org.gastro.inventory.Stock#getDepartment
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Employee.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Employee.java
index 7e80a920ce..78f36531f8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Employee.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Employee.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -24,7 +24,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Employee#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getEmployee()
  * @model
  * @extends CDOObject
@@ -40,7 +40,7 @@ public interface Employee extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Department</em>' container reference.
    * @see #setDepartment(Department)
    * @see org.gastro.inventory.InventoryPackage#getEmployee_Department()
@@ -53,7 +53,7 @@ public interface Employee extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Employee#getDepartment <em>Department</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Department</em>' reference.
    * @see #getDepartment()
@@ -67,7 +67,7 @@ public interface Employee extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getEmployee_Name()
@@ -79,7 +79,7 @@ public interface Employee extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Employee#getName <em>Name</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Ingredient.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Ingredient.java
index 41e4255236..7e57789dd2 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Ingredient.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Ingredient.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -25,7 +25,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Ingredient#getQuantity <em>Quantity</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getIngredient()
  * @model
  * @extends CDOObject
@@ -41,7 +41,7 @@ public interface Ingredient extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Recipe</em>' container reference.
    * @see #setRecipe(Recipe)
    * @see org.gastro.inventory.InventoryPackage#getIngredient_Recipe()
@@ -54,7 +54,7 @@ public interface Ingredient extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Ingredient#getRecipe <em>Recipe</em>}' container reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Recipe</em>' container reference.
    * @see #getRecipe()
@@ -69,7 +69,7 @@ public interface Ingredient extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Product</em>' reference.
    * @see #setProduct(Product)
    * @see org.gastro.inventory.InventoryPackage#getIngredient_Product()
@@ -81,7 +81,7 @@ public interface Ingredient extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Ingredient#getProduct <em>Product</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Product</em>' reference.
    * @see #getProduct()
@@ -96,7 +96,7 @@ public interface Ingredient extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Quantity</em>' attribute.
    * @see #setQuantity(int)
    * @see org.gastro.inventory.InventoryPackage#getIngredient_Quantity()
@@ -108,7 +108,7 @@ public interface Ingredient extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Ingredient#getQuantity <em>Quantity</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Quantity</em>' attribute.
    * @see #getQuantity()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/InventoryFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/InventoryFactory.java
index 37130977d8..ec347db9ef 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/InventoryFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/InventoryFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage
  * @generated
  */
@@ -26,14 +26,14 @@ public interface InventoryFactory extends EFactory
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   InventoryFactory eINSTANCE = org.gastro.inventory.impl.InventoryFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Stock</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Stock</em>'.
    * @generated
    */
@@ -41,7 +41,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Stock Product</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Stock Product</em>'.
    * @generated
    */
@@ -49,7 +49,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Recipe</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Recipe</em>'.
    * @generated
    */
@@ -57,7 +57,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Ingredient</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Ingredient</em>'.
    * @generated
    */
@@ -65,7 +65,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Menu Card</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Menu Card</em>'.
    * @generated
    */
@@ -73,7 +73,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Restaurant</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Restaurant</em>'.
    * @generated
    */
@@ -81,7 +81,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Department</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Department</em>'.
    * @generated
    */
@@ -89,7 +89,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Offering</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Offering</em>'.
    * @generated
    */
@@ -97,7 +97,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Table</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Table</em>'.
    * @generated
    */
@@ -105,7 +105,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Employee</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Employee</em>'.
    * @generated
    */
@@ -113,7 +113,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Section</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Section</em>'.
    * @generated
    */
@@ -121,7 +121,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/InventoryPackage.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/InventoryPackage.java
index 29b4af7e1c..1bb4a562ca 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/InventoryPackage.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/InventoryPackage.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.inventory.InventoryFactory
  * @model kind="package"
  * @generated
@@ -36,28 +36,28 @@ public interface InventoryPackage extends EPackage
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNAME = "inventory";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_URI = "http://www.gastro.org/inventory/1.0";
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_PREFIX = "inventory";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   InventoryPackage eINSTANCE = org.gastro.inventory.impl.InventoryPackageImpl.init();
@@ -65,7 +65,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.StockImpl <em>Stock</em>}' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.StockImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getStock()
    * @generated
@@ -75,7 +75,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Products</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -83,7 +83,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -92,7 +92,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Department</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -100,7 +100,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Stock</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -109,7 +109,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.ProductImpl <em>Product</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.ProductImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getProduct()
    * @generated
@@ -118,7 +118,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -126,7 +126,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Product</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -135,7 +135,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.StockProductImpl <em>Stock Product</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.StockProductImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getStockProduct()
    * @generated
@@ -144,7 +144,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -152,7 +152,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Stock</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -160,7 +160,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Cost</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -168,7 +168,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Available</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -176,7 +176,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Order Limit</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -185,7 +185,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The number of structural features of the '<em>Stock Product</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -194,7 +194,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.RecipeImpl <em>Recipe</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.RecipeImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getRecipe()
    * @generated
@@ -203,7 +203,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -212,7 +212,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Ingredients</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -221,7 +221,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Department</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -229,7 +229,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Cost</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -237,7 +237,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Recipe</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -246,7 +246,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.IngredientImpl <em>Ingredient</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.IngredientImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getIngredient()
    * @generated
@@ -255,7 +255,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Recipe</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -263,7 +263,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -271,7 +271,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Quantity</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -279,7 +279,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Ingredient</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -288,7 +288,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.MenuCardImpl <em>Menu Card</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.MenuCardImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getMenuCard()
    * @generated
@@ -297,7 +297,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -306,7 +306,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Restaurant</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -315,7 +315,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Sections</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -323,7 +323,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Menu Card</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -332,7 +332,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.RestaurantImpl <em>Restaurant</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.RestaurantImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getRestaurant()
    * @generated
@@ -341,7 +341,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -350,7 +350,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Departments</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -359,7 +359,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Menu Cards</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -368,7 +368,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Tables</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -376,7 +376,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Stations</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -384,7 +384,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Restaurant</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -393,7 +393,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.StationImpl <em>Station</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.StationImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getStation()
    * @generated
@@ -402,7 +402,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Station ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -410,7 +410,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Station</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -419,7 +419,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.DepartmentImpl <em>Department</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.DepartmentImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getDepartment()
    * @generated
@@ -428,7 +428,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Station ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -437,7 +437,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Recipes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -446,7 +446,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Restaurant</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -455,7 +455,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Employees</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -464,7 +464,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Stocks</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -472,7 +472,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Department</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -481,7 +481,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.OfferingImpl <em>Offering</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.OfferingImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getOffering()
    * @generated
@@ -490,7 +490,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -498,7 +498,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -506,7 +506,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Description</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -514,7 +514,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -522,7 +522,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Section</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -530,7 +530,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Offering</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -539,7 +539,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.TableImpl <em>Table</em>}' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.TableImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getTable()
    * @generated
@@ -548,7 +548,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Station ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -556,7 +556,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Seats</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -565,7 +565,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Restaurant</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -573,7 +573,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Table</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -582,7 +582,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.EmployeeImpl <em>Employee</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.EmployeeImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getEmployee()
    * @generated
@@ -592,7 +592,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Department</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -600,7 +600,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -608,7 +608,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Employee</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -617,7 +617,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.SectionImpl <em>Section</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.SectionImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getSection()
    * @generated
@@ -627,7 +627,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Menu Card</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -636,7 +636,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Offerings</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -644,7 +644,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -652,7 +652,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Text</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -660,7 +660,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Section</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -669,7 +669,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Stock <em>Stock</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Stock</em>'.
    * @see org.gastro.inventory.Stock
    * @generated
@@ -679,7 +679,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Stock#getProducts
    * <em>Products</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Products</em>'.
    * @see org.gastro.inventory.Stock#getProducts()
    * @see #getStock()
@@ -690,7 +690,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Stock#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Stock#getName()
    * @see #getStock()
@@ -701,7 +701,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Stock#getDepartment
    * <em>Department</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Department</em>'.
    * @see org.gastro.inventory.Stock#getDepartment()
    * @see #getStock()
@@ -712,7 +712,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Product <em>Product</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Product</em>'.
    * @see org.gastro.inventory.Product
    * @generated
@@ -722,7 +722,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Product#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Product#getName()
    * @see #getProduct()
@@ -733,7 +733,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.StockProduct <em>Stock Product</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Stock Product</em>'.
    * @see org.gastro.inventory.StockProduct
    * @generated
@@ -743,7 +743,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.StockProduct#getStock
    * <em>Stock</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Stock</em>'.
    * @see org.gastro.inventory.StockProduct#getStock()
    * @see #getStockProduct()
@@ -754,7 +754,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.StockProduct#getCost <em>Cost</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Cost</em>'.
    * @see org.gastro.inventory.StockProduct#getCost()
    * @see #getStockProduct()
@@ -765,7 +765,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.StockProduct#getAvailable
    * <em>Available</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Available</em>'.
    * @see org.gastro.inventory.StockProduct#getAvailable()
    * @see #getStockProduct()
@@ -776,7 +776,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.StockProduct#getOrderLimit
    * <em>Order Limit</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Order Limit</em>'.
    * @see org.gastro.inventory.StockProduct#getOrderLimit()
    * @see #getStockProduct()
@@ -787,7 +787,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Recipe <em>Recipe</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Recipe</em>'.
    * @see org.gastro.inventory.Recipe
    * @generated
@@ -797,7 +797,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Recipe#getIngredients
    * <em>Ingredients</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Ingredients</em>'.
    * @see org.gastro.inventory.Recipe#getIngredients()
    * @see #getRecipe()
@@ -808,7 +808,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Recipe#getDepartment
    * <em>Department</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Department</em>'.
    * @see org.gastro.inventory.Recipe#getDepartment()
    * @see #getRecipe()
@@ -819,7 +819,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Recipe#getCost <em>Cost</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Cost</em>'.
    * @see org.gastro.inventory.Recipe#getCost()
    * @see #getRecipe()
@@ -830,7 +830,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Ingredient <em>Ingredient</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Ingredient</em>'.
    * @see org.gastro.inventory.Ingredient
    * @generated
@@ -840,7 +840,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Ingredient#getRecipe
    * <em>Recipe</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Recipe</em>'.
    * @see org.gastro.inventory.Ingredient#getRecipe()
    * @see #getIngredient()
@@ -851,7 +851,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.inventory.Ingredient#getProduct <em>Product</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Product</em>'.
    * @see org.gastro.inventory.Ingredient#getProduct()
    * @see #getIngredient()
@@ -862,7 +862,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Ingredient#getQuantity <em>Quantity</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Quantity</em>'.
    * @see org.gastro.inventory.Ingredient#getQuantity()
    * @see #getIngredient()
@@ -873,7 +873,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.MenuCard <em>Menu Card</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Menu Card</em>'.
    * @see org.gastro.inventory.MenuCard
    * @generated
@@ -883,7 +883,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.MenuCard#getTitle <em>Title</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Title</em>'.
    * @see org.gastro.inventory.MenuCard#getTitle()
    * @see #getMenuCard()
@@ -894,7 +894,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.MenuCard#getRestaurant
    * <em>Restaurant</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Restaurant</em>'.
    * @see org.gastro.inventory.MenuCard#getRestaurant()
    * @see #getMenuCard()
@@ -905,7 +905,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.MenuCard#getSections
    * <em>Sections</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Sections</em>'.
    * @see org.gastro.inventory.MenuCard#getSections()
    * @see #getMenuCard()
@@ -916,7 +916,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Restaurant <em>Restaurant</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Restaurant</em>'.
    * @see org.gastro.inventory.Restaurant
    * @generated
@@ -926,7 +926,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Restaurant#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Restaurant#getName()
    * @see #getRestaurant()
@@ -937,7 +937,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Restaurant#getDepartments
    * <em>Departments</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Departments</em>'.
    * @see org.gastro.inventory.Restaurant#getDepartments()
    * @see #getRestaurant()
@@ -948,7 +948,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Restaurant#getMenuCards
    * <em>Menu Cards</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Menu Cards</em>'.
    * @see org.gastro.inventory.Restaurant#getMenuCards()
    * @see #getRestaurant()
@@ -959,7 +959,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Restaurant#getTables
    * <em>Tables</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Tables</em>'.
    * @see org.gastro.inventory.Restaurant#getTables()
    * @see #getRestaurant()
@@ -970,7 +970,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the reference list '{@link org.gastro.inventory.Restaurant#getStations
    * <em>Stations</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Stations</em>'.
    * @see org.gastro.inventory.Restaurant#getStations()
    * @see #getRestaurant()
@@ -981,7 +981,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Department <em>Department</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Department</em>'.
    * @see org.gastro.inventory.Department
    * @generated
@@ -991,7 +991,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Department#getRecipes
    * <em>Recipes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Recipes</em>'.
    * @see org.gastro.inventory.Department#getRecipes()
    * @see #getDepartment()
@@ -1002,7 +1002,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Department#getRestaurant
    * <em>Restaurant</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Restaurant</em>'.
    * @see org.gastro.inventory.Department#getRestaurant()
    * @see #getDepartment()
@@ -1013,7 +1013,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Department#getEmployees
    * <em>Employees</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Employees</em>'.
    * @see org.gastro.inventory.Department#getEmployees()
    * @see #getDepartment()
@@ -1024,7 +1024,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Department#getStocks
    * <em>Stocks</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Stocks</em>'.
    * @see org.gastro.inventory.Department#getStocks()
    * @see #getDepartment()
@@ -1035,7 +1035,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Offering <em>Offering</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Offering</em>'.
    * @see org.gastro.inventory.Offering
    * @generated
@@ -1045,7 +1045,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.inventory.Offering#getProduct <em>Product</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Product</em>'.
    * @see org.gastro.inventory.Offering#getProduct()
    * @see #getOffering()
@@ -1056,7 +1056,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Offering#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Offering#getName()
    * @see #getOffering()
@@ -1067,7 +1067,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Offering#getDescription
    * <em>Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Description</em>'.
    * @see org.gastro.inventory.Offering#getDescription()
    * @see #getOffering()
@@ -1078,7 +1078,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Offering#getPrice <em>Price</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Price</em>'.
    * @see org.gastro.inventory.Offering#getPrice()
    * @see #getOffering()
@@ -1089,7 +1089,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Offering#getSection
    * <em>Section</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Section</em>'.
    * @see org.gastro.inventory.Offering#getSection()
    * @see #getOffering()
@@ -1100,7 +1100,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Table <em>Table</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Table</em>'.
    * @see org.gastro.inventory.Table
    * @generated
@@ -1110,7 +1110,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Table#getSeats <em>Seats</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Seats</em>'.
    * @see org.gastro.inventory.Table#getSeats()
    * @see #getTable()
@@ -1121,7 +1121,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Table#getRestaurant
    * <em>Restaurant</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Restaurant</em>'.
    * @see org.gastro.inventory.Table#getRestaurant()
    * @see #getTable()
@@ -1132,7 +1132,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Employee <em>Employee</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Employee</em>'.
    * @see org.gastro.inventory.Employee
    * @generated
@@ -1142,7 +1142,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Employee#getDepartment
    * <em>Department</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Department</em>'.
    * @see org.gastro.inventory.Employee#getDepartment()
    * @see #getEmployee()
@@ -1153,7 +1153,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Employee#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Employee#getName()
    * @see #getEmployee()
@@ -1164,7 +1164,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Station <em>Station</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Station</em>'.
    * @see org.gastro.inventory.Station
    * @generated
@@ -1174,7 +1174,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Station#getStationID <em>Station ID</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Station ID</em>'.
    * @see org.gastro.inventory.Station#getStationID()
    * @see #getStation()
@@ -1185,7 +1185,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Section <em>Section</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Section</em>'.
    * @see org.gastro.inventory.Section
    * @generated
@@ -1195,7 +1195,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Section#getMenuCard
    * <em>Menu Card</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Menu Card</em>'.
    * @see org.gastro.inventory.Section#getMenuCard()
    * @see #getSection()
@@ -1206,7 +1206,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Section#getOfferings
    * <em>Offerings</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Offerings</em>'.
    * @see org.gastro.inventory.Section#getOfferings()
    * @see #getSection()
@@ -1217,7 +1217,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Section#getTitle <em>Title</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Title</em>'.
    * @see org.gastro.inventory.Section#getTitle()
    * @see #getSection()
@@ -1228,7 +1228,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Section#getText <em>Text</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Text</em>'.
    * @see org.gastro.inventory.Section#getText()
    * @see #getSection()
@@ -1238,7 +1238,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -1253,7 +1253,7 @@ public interface InventoryPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   interface Literals
@@ -1261,7 +1261,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.StockImpl <em>Stock</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.StockImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getStock()
      * @generated
@@ -1271,7 +1271,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference STOCK__PRODUCTS = eINSTANCE.getStock_Products();
@@ -1279,7 +1279,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STOCK__NAME = eINSTANCE.getStock_Name();
@@ -1287,7 +1287,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Department</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference STOCK__DEPARTMENT = eINSTANCE.getStock_Department();
@@ -1295,7 +1295,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.ProductImpl <em>Product</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.ProductImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getProduct()
      * @generated
@@ -1305,7 +1305,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute PRODUCT__NAME = eINSTANCE.getProduct_Name();
@@ -1313,7 +1313,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.StockProductImpl <em>Stock Product</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.StockProductImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getStockProduct()
      * @generated
@@ -1323,7 +1323,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Stock</b></em>' container reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference STOCK_PRODUCT__STOCK = eINSTANCE.getStockProduct_Stock();
@@ -1331,7 +1331,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Cost</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STOCK_PRODUCT__COST = eINSTANCE.getStockProduct_Cost();
@@ -1339,7 +1339,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Available</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STOCK_PRODUCT__AVAILABLE = eINSTANCE.getStockProduct_Available();
@@ -1347,7 +1347,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Order Limit</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STOCK_PRODUCT__ORDER_LIMIT = eINSTANCE.getStockProduct_OrderLimit();
@@ -1355,7 +1355,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.RecipeImpl <em>Recipe</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.RecipeImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getRecipe()
      * @generated
@@ -1365,7 +1365,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Ingredients</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RECIPE__INGREDIENTS = eINSTANCE.getRecipe_Ingredients();
@@ -1373,7 +1373,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Department</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RECIPE__DEPARTMENT = eINSTANCE.getRecipe_Department();
@@ -1381,7 +1381,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Cost</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute RECIPE__COST = eINSTANCE.getRecipe_Cost();
@@ -1389,7 +1389,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.IngredientImpl <em>Ingredient</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.IngredientImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getIngredient()
      * @generated
@@ -1399,7 +1399,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Recipe</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference INGREDIENT__RECIPE = eINSTANCE.getIngredient_Recipe();
@@ -1407,7 +1407,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference INGREDIENT__PRODUCT = eINSTANCE.getIngredient_Product();
@@ -1415,7 +1415,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Quantity</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute INGREDIENT__QUANTITY = eINSTANCE.getIngredient_Quantity();
@@ -1423,7 +1423,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.MenuCardImpl <em>Menu Card</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.MenuCardImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getMenuCard()
      * @generated
@@ -1433,7 +1433,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Title</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute MENU_CARD__TITLE = eINSTANCE.getMenuCard_Title();
@@ -1441,7 +1441,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Restaurant</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference MENU_CARD__RESTAURANT = eINSTANCE.getMenuCard_Restaurant();
@@ -1449,7 +1449,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Sections</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference MENU_CARD__SECTIONS = eINSTANCE.getMenuCard_Sections();
@@ -1457,7 +1457,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.RestaurantImpl <em>Restaurant</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.RestaurantImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getRestaurant()
      * @generated
@@ -1467,7 +1467,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute RESTAURANT__NAME = eINSTANCE.getRestaurant_Name();
@@ -1475,7 +1475,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Departments</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RESTAURANT__DEPARTMENTS = eINSTANCE.getRestaurant_Departments();
@@ -1483,7 +1483,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Menu Cards</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RESTAURANT__MENU_CARDS = eINSTANCE.getRestaurant_MenuCards();
@@ -1491,7 +1491,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Tables</b></em>' containment reference list feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RESTAURANT__TABLES = eINSTANCE.getRestaurant_Tables();
@@ -1499,7 +1499,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Stations</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RESTAURANT__STATIONS = eINSTANCE.getRestaurant_Stations();
@@ -1507,7 +1507,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.DepartmentImpl <em>Department</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.DepartmentImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getDepartment()
      * @generated
@@ -1517,7 +1517,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Recipes</b></em>' containment reference list feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DEPARTMENT__RECIPES = eINSTANCE.getDepartment_Recipes();
@@ -1525,7 +1525,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Restaurant</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DEPARTMENT__RESTAURANT = eINSTANCE.getDepartment_Restaurant();
@@ -1533,7 +1533,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Employees</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DEPARTMENT__EMPLOYEES = eINSTANCE.getDepartment_Employees();
@@ -1541,7 +1541,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Stocks</b></em>' containment reference list feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DEPARTMENT__STOCKS = eINSTANCE.getDepartment_Stocks();
@@ -1549,7 +1549,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.OfferingImpl <em>Offering</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.OfferingImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getOffering()
      * @generated
@@ -1559,7 +1559,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference OFFERING__PRODUCT = eINSTANCE.getOffering_Product();
@@ -1567,7 +1567,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute OFFERING__NAME = eINSTANCE.getOffering_Name();
@@ -1575,7 +1575,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Description</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute OFFERING__DESCRIPTION = eINSTANCE.getOffering_Description();
@@ -1583,7 +1583,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute OFFERING__PRICE = eINSTANCE.getOffering_Price();
@@ -1591,7 +1591,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Section</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference OFFERING__SECTION = eINSTANCE.getOffering_Section();
@@ -1599,7 +1599,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.TableImpl <em>Table</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.TableImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getTable()
      * @generated
@@ -1609,7 +1609,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Seats</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute TABLE__SEATS = eINSTANCE.getTable_Seats();
@@ -1617,7 +1617,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Restaurant</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference TABLE__RESTAURANT = eINSTANCE.getTable_Restaurant();
@@ -1625,7 +1625,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.EmployeeImpl <em>Employee</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.EmployeeImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getEmployee()
      * @generated
@@ -1635,7 +1635,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Department</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference EMPLOYEE__DEPARTMENT = eINSTANCE.getEmployee_Department();
@@ -1643,7 +1643,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute EMPLOYEE__NAME = eINSTANCE.getEmployee_Name();
@@ -1651,7 +1651,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.StationImpl <em>Station</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.StationImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getStation()
      * @generated
@@ -1661,7 +1661,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Station ID</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STATION__STATION_ID = eINSTANCE.getStation_StationID();
@@ -1669,7 +1669,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.SectionImpl <em>Section</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.SectionImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getSection()
      * @generated
@@ -1679,7 +1679,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Menu Card</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference SECTION__MENU_CARD = eINSTANCE.getSection_MenuCard();
@@ -1687,7 +1687,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Offerings</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference SECTION__OFFERINGS = eINSTANCE.getSection_Offerings();
@@ -1695,7 +1695,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Title</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute SECTION__TITLE = eINSTANCE.getSection_Title();
@@ -1703,7 +1703,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Text</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute SECTION__TEXT = eINSTANCE.getSection_Text();
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/MenuCard.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/MenuCard.java
index 3f5d4387cf..55a0523ba6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/MenuCard.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/MenuCard.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.MenuCard#getSections <em>Sections</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getMenuCard()
  * @model
  * @extends CDOObject
@@ -41,7 +41,7 @@ public interface MenuCard extends CDOObject
    * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Title</em>' attribute.
    * @see #setTitle(String)
    * @see org.gastro.inventory.InventoryPackage#getMenuCard_Title()
@@ -53,7 +53,7 @@ public interface MenuCard extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.MenuCard#getTitle <em>Title</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Title</em>' attribute.
    * @see #getTitle()
@@ -69,7 +69,7 @@ public interface MenuCard extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Restaurant</em>' container reference.
    * @see #setRestaurant(Restaurant)
    * @see org.gastro.inventory.InventoryPackage#getMenuCard_Restaurant()
@@ -82,7 +82,7 @@ public interface MenuCard extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.MenuCard#getRestaurant <em>Restaurant</em>}' container
    * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Restaurant</em>' container reference.
    * @see #getRestaurant()
@@ -99,7 +99,7 @@ public interface MenuCard extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Sections</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getMenuCard_Sections()
    * @see org.gastro.inventory.Section#getMenuCard
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Offering.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Offering.java
index 45ad058a8c..5dddb58c93 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Offering.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Offering.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Offering#getSection <em>Section</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getOffering()
  * @model
  * @extends CDOObject
@@ -42,7 +42,7 @@ public interface Offering extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Product</em>' reference.
    * @see #setProduct(Product)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Product()
@@ -54,7 +54,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getProduct <em>Product</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Product</em>' reference.
    * @see #getProduct()
@@ -68,7 +68,7 @@ public interface Offering extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Name()
@@ -80,7 +80,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getName <em>Name</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -95,7 +95,7 @@ public interface Offering extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Description</em>' attribute.
    * @see #setDescription(String)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Description()
@@ -107,7 +107,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getDescription <em>Description</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Description</em>' attribute.
    * @see #getDescription()
@@ -121,7 +121,7 @@ public interface Offering extends CDOObject
    * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Price</em>' attribute.
    * @see #setPrice(float)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Price()
@@ -133,7 +133,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getPrice <em>Price</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Price</em>' attribute.
    * @see #getPrice()
@@ -149,7 +149,7 @@ public interface Offering extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Section</em>' container reference.
    * @see #setSection(Section)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Section()
@@ -162,7 +162,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getSection <em>Section</em>}' container reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Section</em>' container reference.
    * @see #getSection()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Product.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Product.java
index a5c4fac441..b72af9a28b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Product.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Product.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Product#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getProduct()
  * @model abstract="true"
  * @extends CDOObject
@@ -37,7 +37,7 @@ public interface Product extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getProduct_Name()
@@ -49,7 +49,7 @@ public interface Product extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Product#getName <em>Name</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -59,7 +59,7 @@ public interface Product extends CDOObject
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @model kind="operation"
    * @generated
    */
@@ -67,7 +67,7 @@ public interface Product extends CDOObject
 
   /**
    * TODO Should be modeled as EOperation!
-   * 
+   *
    * @ADDED
    */
   public Department getDepartment();
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Recipe.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Recipe.java
index 98fcad5d19..c4ac4b5a5c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Recipe.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Recipe.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Recipe#getCost <em>Cost</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getRecipe()
  * @model
  * @generated
@@ -41,7 +41,7 @@ public interface Recipe extends Product
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Ingredients</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getRecipe_Ingredients()
    * @see org.gastro.inventory.Ingredient#getRecipe
@@ -58,7 +58,7 @@ public interface Recipe extends Product
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Department</em>' container reference.
    * @see #setDepartment(Department)
    * @see org.gastro.inventory.InventoryPackage#getRecipe_Department()
@@ -71,7 +71,7 @@ public interface Recipe extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.Recipe#getDepartment <em>Department</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Department</em>' reference.
    * @see #getDepartment()
@@ -85,7 +85,7 @@ public interface Recipe extends Product
    * If the meaning of the '<em>Cost</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Cost</em>' attribute.
    * @see org.gastro.inventory.InventoryPackage#getRecipe_Cost()
    * @model transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Restaurant.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Restaurant.java
index ec5f1a8b67..bdd3ba8228 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Restaurant.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Restaurant.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -29,7 +29,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Restaurant#getStations <em>Stations</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getRestaurant()
  * @model
  * @extends CDOObject
@@ -43,7 +43,7 @@ public interface Restaurant extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_Name()
@@ -55,7 +55,7 @@ public interface Restaurant extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Restaurant#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -72,7 +72,7 @@ public interface Restaurant extends CDOObject
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Departments</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_Departments()
    * @see org.gastro.inventory.Department#getRestaurant
@@ -90,7 +90,7 @@ public interface Restaurant extends CDOObject
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Menu Cards</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_MenuCards()
    * @see org.gastro.inventory.MenuCard#getRestaurant
@@ -108,7 +108,7 @@ public interface Restaurant extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Tables</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_Tables()
    * @see org.gastro.inventory.Table#getRestaurant
@@ -125,7 +125,7 @@ public interface Restaurant extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Stations</em>' reference list.
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_Stations()
    * @model transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Section.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Section.java
index 8d429fca1b..5ad775ea57 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Section.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Section.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -28,7 +28,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Section#getText <em>Text</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getSection()
  * @model
  * @extends CDOObject
@@ -44,7 +44,7 @@ public interface Section extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Menu Card</em>' container reference.
    * @see #setMenuCard(MenuCard)
    * @see org.gastro.inventory.InventoryPackage#getSection_MenuCard()
@@ -57,7 +57,7 @@ public interface Section extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Section#getMenuCard <em>Menu Card</em>}' container reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Menu Card</em>' container reference.
    * @see #getMenuCard()
@@ -74,7 +74,7 @@ public interface Section extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Offerings</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getSection_Offerings()
    * @see org.gastro.inventory.Offering#getSection
@@ -89,7 +89,7 @@ public interface Section extends CDOObject
    * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Title</em>' attribute.
    * @see #setTitle(String)
    * @see org.gastro.inventory.InventoryPackage#getSection_Title()
@@ -101,7 +101,7 @@ public interface Section extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Section#getTitle <em>Title</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Title</em>' attribute.
    * @see #getTitle()
@@ -115,7 +115,7 @@ public interface Section extends CDOObject
    * If the meaning of the '<em>Text</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Text</em>' attribute.
    * @see #setText(String)
    * @see org.gastro.inventory.InventoryPackage#getSection_Text()
@@ -127,7 +127,7 @@ public interface Section extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Section#getText <em>Text</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Text</em>' attribute.
    * @see #getText()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Station.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Station.java
index f7d4b108f3..c03fcaa4b5 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Station.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Station.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Station#getStationID <em>Station ID</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getStation()
  * @model abstract="true"
  * @extends CDOObject
@@ -38,7 +38,7 @@ public interface Station extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Station ID</em>' attribute.
    * @see #setStationID(String)
    * @see org.gastro.inventory.InventoryPackage#getStation_StationID()
@@ -50,7 +50,7 @@ public interface Station extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Station#getStationID <em>Station ID</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Station ID</em>' attribute.
    * @see #getStationID()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Stock.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Stock.java
index f23dcf94fc..8a776093cd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Stock.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Stock.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Stock#getDepartment <em>Department</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getStock()
  * @model
  * @extends CDOObject
@@ -44,7 +44,7 @@ public interface Stock extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Products</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getStock_Products()
    * @see org.gastro.inventory.StockProduct#getStock
@@ -59,7 +59,7 @@ public interface Stock extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getStock_Name()
@@ -71,7 +71,7 @@ public interface Stock extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Stock#getName <em>Name</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -87,7 +87,7 @@ public interface Stock extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Department</em>' container reference.
    * @see #setDepartment(Department)
    * @see org.gastro.inventory.InventoryPackage#getStock_Department()
@@ -100,7 +100,7 @@ public interface Stock extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Stock#getDepartment <em>Department</em>}' container reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Department</em>' container reference.
    * @see #getDepartment()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java
index c98327c6e1..bae8650e19 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -24,7 +24,7 @@ package org.gastro.inventory;
  * <li>{@link org.gastro.inventory.StockProduct#getOrderLimit <em>Order Limit</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getStockProduct()
  * @model
  * @generated
@@ -39,7 +39,7 @@ public interface StockProduct extends Product
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Stock</em>' container reference.
    * @see #setStock(Stock)
    * @see org.gastro.inventory.InventoryPackage#getStockProduct_Stock()
@@ -52,7 +52,7 @@ public interface StockProduct extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.StockProduct#getStock <em>Stock</em>}' container reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Stock</em>' container reference.
    * @see #getStock()
@@ -66,7 +66,7 @@ public interface StockProduct extends Product
    * If the meaning of the '<em>Cost</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Cost</em>' attribute.
    * @see #setCost(float)
    * @see org.gastro.inventory.InventoryPackage#getStockProduct_Cost()
@@ -78,7 +78,7 @@ public interface StockProduct extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.StockProduct#getCost <em>Cost</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Cost</em>' attribute.
    * @see #getCost()
@@ -93,7 +93,7 @@ public interface StockProduct extends Product
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Available</em>' attribute.
    * @see #setAvailable(int)
    * @see org.gastro.inventory.InventoryPackage#getStockProduct_Available()
@@ -105,7 +105,7 @@ public interface StockProduct extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.StockProduct#getAvailable <em>Available</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Available</em>' attribute.
    * @see #getAvailable()
@@ -120,7 +120,7 @@ public interface StockProduct extends Product
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Order Limit</em>' attribute.
    * @see #setOrderLimit(int)
    * @see org.gastro.inventory.InventoryPackage#getStockProduct_OrderLimit()
@@ -132,7 +132,7 @@ public interface StockProduct extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.StockProduct#getOrderLimit <em>Order Limit</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Order Limit</em>' attribute.
    * @see #getOrderLimit()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Table.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Table.java
index e11402af93..815f0e659d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Table.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/Table.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -22,7 +22,7 @@ package org.gastro.inventory;
  * <li>{@link org.gastro.inventory.Table#getRestaurant <em>Restaurant</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getTable()
  * @model
  * @generated
@@ -35,7 +35,7 @@ public interface Table extends Station
    * If the meaning of the '<em>Seats</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Seats</em>' attribute.
    * @see #setSeats(int)
    * @see org.gastro.inventory.InventoryPackage#getTable_Seats()
@@ -47,7 +47,7 @@ public interface Table extends Station
   /**
    * Sets the value of the '{@link org.gastro.inventory.Table#getSeats <em>Seats</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Seats</em>' attribute.
    * @see #getSeats()
@@ -63,7 +63,7 @@ public interface Table extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Restaurant</em>' container reference.
    * @see #setRestaurant(Restaurant)
    * @see org.gastro.inventory.InventoryPackage#getTable_Restaurant()
@@ -76,7 +76,7 @@ public interface Table extends Station
   /**
    * Sets the value of the '{@link org.gastro.inventory.Table#getRestaurant <em>Restaurant</em>}' container reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Restaurant</em>' container reference.
    * @see #getRestaurant()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java
index 42c5c2d171..6cec90e060 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,14 +34,14 @@ import org.gastro.inventory.Stock;
  * <li>{@link org.gastro.inventory.impl.DepartmentImpl#getStocks <em>Stocks</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class DepartmentImpl extends StationImpl implements Department
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected DepartmentImpl()
@@ -51,7 +51,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -62,7 +62,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -73,7 +73,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Restaurant getRestaurant()
@@ -83,7 +83,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setRestaurant(Restaurant newRestaurant)
@@ -93,7 +93,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -104,7 +104,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java
index 3f91881162..ca0ea277e7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -30,14 +30,14 @@ import org.gastro.inventory.InventoryPackage;
  * <li>{@link org.gastro.inventory.impl.EmployeeImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EmployeeImpl extends CDOObjectImpl implements Employee
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected EmployeeImpl()
@@ -47,7 +47,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -58,7 +58,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -69,7 +69,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Department getDepartment()
@@ -79,7 +79,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setDepartment(Department newDepartment)
@@ -89,7 +89,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -99,7 +99,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java
index e0088398ee..3b91d3e692 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -32,14 +32,14 @@ import org.gastro.inventory.Recipe;
  * <li>{@link org.gastro.inventory.impl.IngredientImpl#getQuantity <em>Quantity</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class IngredientImpl extends CDOObjectImpl implements Ingredient
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IngredientImpl()
@@ -49,7 +49,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -60,7 +60,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Recipe getRecipe()
@@ -81,7 +81,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setRecipe(Recipe newRecipe)
@@ -91,7 +91,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Product getProduct()
@@ -101,7 +101,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setProduct(Product newProduct)
@@ -111,7 +111,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public int getQuantity()
@@ -121,7 +121,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setQuantity(int newQuantity)
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
index 335ea1978e..42f45b3925 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -35,14 +35,14 @@ import org.gastro.inventory.Table;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFactory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static InventoryFactory init()
@@ -65,7 +65,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryFactoryImpl()
@@ -75,7 +75,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -84,27 +84,27 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
     switch (eClass.getClassifierID())
     {
     case InventoryPackage.STOCK:
-      return (EObject)createStock();
+      return createStock();
     case InventoryPackage.STOCK_PRODUCT:
-      return (EObject)createStockProduct();
+      return createStockProduct();
     case InventoryPackage.RECIPE:
-      return (EObject)createRecipe();
+      return createRecipe();
     case InventoryPackage.INGREDIENT:
-      return (EObject)createIngredient();
+      return createIngredient();
     case InventoryPackage.MENU_CARD:
-      return (EObject)createMenuCard();
+      return createMenuCard();
     case InventoryPackage.RESTAURANT:
-      return (EObject)createRestaurant();
+      return createRestaurant();
     case InventoryPackage.DEPARTMENT:
-      return (EObject)createDepartment();
+      return createDepartment();
     case InventoryPackage.OFFERING:
-      return (EObject)createOffering();
+      return createOffering();
     case InventoryPackage.TABLE:
-      return (EObject)createTable();
+      return createTable();
     case InventoryPackage.EMPLOYEE:
-      return (EObject)createEmployee();
+      return createEmployee();
     case InventoryPackage.SECTION:
-      return (EObject)createSection();
+      return createSection();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -112,7 +112,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Stock createStock()
@@ -123,7 +123,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public StockProduct createStockProduct()
@@ -134,7 +134,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Recipe createRecipe()
@@ -145,7 +145,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Ingredient createIngredient()
@@ -156,7 +156,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public MenuCard createMenuCard()
@@ -167,7 +167,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Restaurant createRestaurant()
@@ -178,7 +178,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Department createDepartment()
@@ -189,7 +189,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Offering createOffering()
@@ -200,7 +200,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Table createTable()
@@ -211,7 +211,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Employee createEmployee()
@@ -222,7 +222,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Section createSection()
@@ -233,7 +233,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryPackage getInventoryPackage()
@@ -243,7 +243,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
index 088c795df8..44bceae6c4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -37,98 +37,98 @@ import org.gastro.inventory.Table;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class InventoryPackageImpl extends EPackageImpl implements InventoryPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass stockEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass productEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass stockProductEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass recipeEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass ingredientEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass menuCardEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass restaurantEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass departmentEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass offeringEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass tableEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass employeeEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass stationEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass sectionEClass = null;
@@ -140,7 +140,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.gastro.inventory.InventoryPackage#eNS_URI
    * @see #init()
@@ -153,7 +153,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static boolean isInited = false;
@@ -164,7 +164,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
    * This method is used to initialize {@link InventoryPackage#eINSTANCE} when that field is accessed. Clients should
    * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -173,11 +173,14 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
   public static InventoryPackage init()
   {
     if (isInited)
+    {
       return (InventoryPackage)EPackage.Registry.INSTANCE.getEPackage(InventoryPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InventoryPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new InventoryPackageImpl());
+    InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof InventoryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new InventoryPackageImpl());
 
     isInited = true;
 
@@ -197,7 +200,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getStock()
@@ -207,7 +210,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getStock_Products()
@@ -217,7 +220,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStock_Name()
@@ -227,7 +230,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getStock_Department()
@@ -237,7 +240,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getProduct()
@@ -247,7 +250,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getProduct_Name()
@@ -257,7 +260,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getStockProduct()
@@ -267,7 +270,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getStockProduct_Stock()
@@ -277,7 +280,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStockProduct_Cost()
@@ -287,7 +290,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStockProduct_Available()
@@ -297,7 +300,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStockProduct_OrderLimit()
@@ -307,7 +310,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getRecipe()
@@ -317,7 +320,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRecipe_Ingredients()
@@ -327,7 +330,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRecipe_Department()
@@ -337,7 +340,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getRecipe_Cost()
@@ -347,7 +350,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getIngredient()
@@ -357,7 +360,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getIngredient_Recipe()
@@ -367,7 +370,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getIngredient_Product()
@@ -377,7 +380,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getIngredient_Quantity()
@@ -387,7 +390,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getMenuCard()
@@ -397,7 +400,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getMenuCard_Title()
@@ -407,7 +410,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getMenuCard_Restaurant()
@@ -417,7 +420,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getMenuCard_Sections()
@@ -427,7 +430,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getRestaurant()
@@ -437,7 +440,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getRestaurant_Name()
@@ -447,7 +450,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRestaurant_Departments()
@@ -457,7 +460,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRestaurant_MenuCards()
@@ -467,7 +470,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRestaurant_Tables()
@@ -477,7 +480,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRestaurant_Stations()
@@ -487,7 +490,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getDepartment()
@@ -497,7 +500,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDepartment_Recipes()
@@ -507,7 +510,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDepartment_Restaurant()
@@ -517,7 +520,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDepartment_Employees()
@@ -527,7 +530,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDepartment_Stocks()
@@ -537,7 +540,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getOffering()
@@ -547,7 +550,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getOffering_Product()
@@ -557,7 +560,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getOffering_Name()
@@ -567,7 +570,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getOffering_Description()
@@ -577,7 +580,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getOffering_Price()
@@ -587,7 +590,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getOffering_Section()
@@ -597,7 +600,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getTable()
@@ -607,7 +610,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getTable_Seats()
@@ -617,7 +620,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getTable_Restaurant()
@@ -627,7 +630,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getEmployee()
@@ -637,7 +640,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getEmployee_Department()
@@ -647,7 +650,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getEmployee_Name()
@@ -657,7 +660,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getStation()
@@ -667,7 +670,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStation_StationID()
@@ -677,7 +680,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getSection()
@@ -687,7 +690,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getSection_MenuCard()
@@ -697,7 +700,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getSection_Offerings()
@@ -707,7 +710,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getSection_Title()
@@ -717,7 +720,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getSection_Text()
@@ -727,7 +730,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryFactory getInventoryFactory()
@@ -737,7 +740,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isCreated = false;
@@ -745,13 +748,15 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -824,7 +829,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isInitialized = false;
@@ -832,13 +837,15 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -851,19 +858,19 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    stockProductEClass.getESuperTypes().add(this.getProduct());
-    recipeEClass.getESuperTypes().add(this.getProduct());
-    departmentEClass.getESuperTypes().add(this.getStation());
-    tableEClass.getESuperTypes().add(this.getStation());
+    stockProductEClass.getESuperTypes().add(getProduct());
+    recipeEClass.getESuperTypes().add(getProduct());
+    departmentEClass.getESuperTypes().add(getStation());
+    tableEClass.getESuperTypes().add(getStation());
 
     // Initialize classes and features; add operations and parameters
     initEClass(stockEClass, Stock.class, "Stock", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStock_Products(), this.getStockProduct(), this.getStockProduct_Stock(), "products", null, 0, -1,
+    initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1,
         Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getStock_Department(), this.getDepartment(), this.getDepartment_Stocks(), "department", null, 1, 1,
+    initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1,
         Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -875,9 +882,9 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
     initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStockProduct_Stock(), this.getStock(), this.getStock_Products(), "stock", null, 1, 1,
-        StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
     initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class,
@@ -886,93 +893,93 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(recipeEClass, Recipe.class, "Recipe", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRecipe_Ingredients(), this.getIngredient(), this.getIngredient_Recipe(), "ingredients", null, 0,
-        -1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRecipe_Department(), this.getDepartment(), this.getDepartment_Recipes(), "department", null, 0,
-        1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1,
+        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1,
+        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT,
         IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIngredient_Recipe(), this.getRecipe(), this.getRecipe_Ingredients(), "recipe", null, 1, 1,
-        Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getIngredient_Product(), this.getProduct(), null, "product", null, 1, 1, Ingredient.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+    initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1, Ingredient.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
+    initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(menuCardEClass, MenuCard.class, "MenuCard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Restaurant(), this.getRestaurant(), this.getRestaurant_MenuCards(), "restaurant", null,
-        1, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Sections(), this.getSection(), this.getSection_MenuCard(), "sections", null, 1, -1,
-        MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+    initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1,
+        MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1, MenuCard.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(restaurantEClass, Restaurant.class, "Restaurant", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Departments(), this.getDepartment(), this.getDepartment_Restaurant(), "departments",
-        null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_MenuCards(), this.getMenuCard(), this.getMenuCard_Restaurant(), "menuCards", null, 0,
-        -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Tables(), this.getTable(), this.getTable_Restaurant(), "tables", null, 0, -1,
-        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Stations(), this.getStation(), null, "stations", null, 0, -1, Restaurant.class,
+    initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0, -1,
+        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1,
+        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class,
         IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         IS_DERIVED, IS_ORDERED);
 
     initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDepartment_Recipes(), this.getRecipe(), this.getRecipe_Department(), "recipes", null, 0, -1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Restaurant(), this.getRestaurant(), this.getRestaurant_Departments(), "restaurant",
-        null, 1, 1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Employees(), this.getEmployee(), this.getEmployee_Department(), "employees", null, 0,
-        -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Stocks(), this.getStock(), this.getStock_Department(), "stocks", null, 1, -1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1,
+        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1,
+        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1,
+        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(offeringEClass, Offering.class, "Offering", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOffering_Product(), this.getProduct(), null, "product", null, 1, 1, Offering.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOffering_Section(), this.getSection(), this.getSection_Offerings(), "section", null, 1, 1,
-        Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTable_Restaurant(), this.getRestaurant(), this.getRestaurant_Tables(), "restaurant", null, 1, 1,
+    initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1,
         Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(employeeEClass, Employee.class, "Employee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEmployee_Department(), this.getDepartment(), this.getDepartment_Employees(), "department", null,
-        0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1,
+        Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -981,10 +988,10 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(sectionEClass, Section.class, "Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSection_MenuCard(), this.getMenuCard(), this.getMenuCard_Sections(), "menuCard", null, 1, 1,
-        Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSection_Offerings(), this.getOffering(), this.getOffering_Section(), "offerings", null, 1, -1,
+    initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1,
         Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT,
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java
index bdc71e2078..5137d1001d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -33,14 +33,14 @@ import org.gastro.inventory.Section;
  * <li>{@link org.gastro.inventory.impl.MenuCardImpl#getSections <em>Sections</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected MenuCardImpl()
@@ -50,7 +50,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -61,7 +61,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -72,7 +72,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getTitle()
@@ -82,7 +82,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setTitle(String newTitle)
@@ -92,7 +92,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Restaurant getRestaurant()
@@ -102,7 +102,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setRestaurant(Restaurant newRestaurant)
@@ -112,7 +112,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java
index 54566ec61a..6e221130c7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,14 +34,14 @@ import org.gastro.inventory.Section;
  * <li>{@link org.gastro.inventory.impl.OfferingImpl#getSection <em>Section</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class OfferingImpl extends CDOObjectImpl implements Offering
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected OfferingImpl()
@@ -51,7 +51,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -62,7 +62,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,7 +73,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Product getProduct()
@@ -83,7 +83,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setProduct(Product newProduct)
@@ -93,7 +93,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -103,7 +103,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -113,7 +113,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getDescription()
@@ -123,7 +123,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setDescription(String newDescription)
@@ -133,7 +133,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public float getPrice()
@@ -143,7 +143,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setPrice(float newPrice)
@@ -153,7 +153,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Section getSection()
@@ -163,7 +163,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setSection(Section newSection)
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java
index 3e19efce37..d465aae64b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -28,14 +28,14 @@ import org.gastro.inventory.Product;
  * <li>{@link org.gastro.inventory.impl.ProductImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class ProductImpl extends CDOObjectImpl implements Product
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ProductImpl()
@@ -45,7 +45,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -56,7 +56,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -67,7 +67,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -77,7 +77,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -87,7 +87,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public abstract float getCost();
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java
index 7ebc9e3eb9..e8c2af07b4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -31,14 +31,14 @@ import org.gastro.inventory.Recipe;
  * <li>{@link org.gastro.inventory.impl.RecipeImpl#getCost <em>Cost</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class RecipeImpl extends ProductImpl implements Recipe
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected RecipeImpl()
@@ -48,7 +48,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -59,7 +59,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -70,7 +70,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Department getDepartment()
@@ -80,7 +80,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setDepartment(Department newDepartment)
@@ -90,7 +90,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java
index 215b89ecf7..1f188ff6ba 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,14 +38,14 @@ import org.gastro.inventory.Table;
  * <li>{@link org.gastro.inventory.impl.RestaurantImpl#getStations <em>Stations</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected RestaurantImpl()
@@ -55,7 +55,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -66,7 +66,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -77,7 +77,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -87,7 +87,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -97,7 +97,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -108,7 +108,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -119,7 +119,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -130,7 +130,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public EList<Station> getStations()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java
index 12ef48c8fe..6340fd4dfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,14 +34,14 @@ import org.gastro.inventory.Section;
  * <li>{@link org.gastro.inventory.impl.SectionImpl#getText <em>Text</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class SectionImpl extends CDOObjectImpl implements Section
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected SectionImpl()
@@ -51,7 +51,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -62,7 +62,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,7 +73,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public MenuCard getMenuCard()
@@ -83,7 +83,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setMenuCard(MenuCard newMenuCard)
@@ -93,7 +93,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -104,7 +104,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getTitle()
@@ -114,7 +114,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setTitle(String newTitle)
@@ -124,7 +124,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getText()
@@ -134,7 +134,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setText(String newText)
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java
index 6182a98b50..bcf2eb9c24 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -28,14 +28,14 @@ import org.gastro.inventory.Station;
  * <li>{@link org.gastro.inventory.impl.StationImpl#getStationID <em>Station ID</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class StationImpl extends CDOObjectImpl implements Station
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StationImpl()
@@ -45,7 +45,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -56,7 +56,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -67,7 +67,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getStationID()
@@ -77,7 +77,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setStationID(String newStationID)
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java
index 63dd49ee7c..c4ee294fab 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -33,14 +33,14 @@ import org.gastro.inventory.StockProduct;
  * <li>{@link org.gastro.inventory.impl.StockImpl#getDepartment <em>Department</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StockImpl extends CDOObjectImpl implements Stock
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StockImpl()
@@ -50,7 +50,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -61,7 +61,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -72,7 +72,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -83,7 +83,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -93,7 +93,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -103,7 +103,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Department getDepartment()
@@ -113,7 +113,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setDepartment(Department newDepartment)
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java
index 3fa605f67d..9c12fdc6b0 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -31,14 +31,14 @@ import org.gastro.inventory.StockProduct;
  * <li>{@link org.gastro.inventory.impl.StockProductImpl#getOrderLimit <em>Order Limit</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StockProductImpl extends ProductImpl implements StockProduct
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StockProductImpl()
@@ -48,7 +48,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -59,7 +59,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Stock getStock()
@@ -69,7 +69,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setStock(Stock newStock)
@@ -79,7 +79,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -90,7 +90,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setCost(float newCost)
@@ -100,7 +100,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public int getAvailable()
@@ -110,7 +110,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setAvailable(int newAvailable)
@@ -120,7 +120,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public int getOrderLimit()
@@ -130,7 +130,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setOrderLimit(int newOrderLimit)
@@ -140,7 +140,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * TODO Should be modeled as derived EReference!
-   * 
+   *
    * @ADDED
    */
   public Department getDepartment()
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java
index c24b954c93..3e0ac50a75 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -28,14 +28,14 @@ import org.gastro.inventory.Table;
  * <li>{@link org.gastro.inventory.impl.TableImpl#getRestaurant <em>Restaurant</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TableImpl extends StationImpl implements Table
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TableImpl()
@@ -45,7 +45,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -56,7 +56,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public int getSeats()
@@ -66,7 +66,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setSeats(int newSeats)
@@ -76,7 +76,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Restaurant getRestaurant()
@@ -86,7 +86,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setRestaurant(Restaurant newRestaurant)
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/util/InventoryAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/util/InventoryAdapterFactory.java
index 585f4c7e0d..d0e8851a1a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/util/InventoryAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/util/InventoryAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,7 +36,7 @@ import org.gastro.inventory.Table;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage
  * @generated
  */
@@ -44,14 +44,14 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static InventoryPackage modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryAdapterFactory()
@@ -66,7 +66,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
+   *
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -86,7 +86,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected InventorySwitch<Adapter> modelSwitch = new InventorySwitch<Adapter>()
@@ -178,7 +178,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -194,7 +194,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Stock <em>Stock</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Stock
    * @generated
@@ -208,7 +208,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Product <em>Product</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Product
    * @generated
@@ -222,7 +222,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.StockProduct <em>Stock Product</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.StockProduct
    * @generated
@@ -236,7 +236,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Recipe <em>Recipe</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Recipe
    * @generated
@@ -250,7 +250,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Ingredient <em>Ingredient</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Ingredient
    * @generated
@@ -264,7 +264,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.MenuCard <em>Menu Card</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.MenuCard
    * @generated
@@ -278,7 +278,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Restaurant <em>Restaurant</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Restaurant
    * @generated
@@ -292,7 +292,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Department <em>Department</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Department
    * @generated
@@ -306,7 +306,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Offering <em>Offering</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Offering
    * @generated
@@ -320,7 +320,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Table <em>Table</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Table
    * @generated
@@ -334,7 +334,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Employee <em>Employee</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Employee
    * @generated
@@ -348,7 +348,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Station <em>Station</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Station
    * @generated
@@ -362,7 +362,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Section <em>Section</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Section
    * @generated
@@ -375,7 +375,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java
index 44055ec9f8..3da3e1a832 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,7 +38,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage
  * @generated
  */
@@ -46,14 +46,14 @@ public class InventorySwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static InventoryPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventorySwitch()
@@ -67,7 +67,7 @@ public class InventorySwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -79,7 +79,7 @@ public class InventorySwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -99,7 +99,7 @@ public class InventorySwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -261,7 +261,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Stock</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Stock</em>'.
@@ -276,7 +276,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Product</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Product</em>'.
@@ -291,7 +291,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Stock Product</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Stock Product</em>'.
@@ -306,7 +306,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Recipe</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Recipe</em>'.
@@ -321,7 +321,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Ingredient</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Ingredient</em>'.
@@ -336,7 +336,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Menu Card</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Menu Card</em>'.
@@ -351,7 +351,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Restaurant</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Restaurant</em>'.
@@ -366,7 +366,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Department</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Department</em>'.
@@ -381,7 +381,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Offering</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Offering</em>'.
@@ -396,7 +396,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Table</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Table</em>'.
@@ -411,7 +411,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Employee</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Employee</em>'.
@@ -426,7 +426,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Station</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Station</em>'.
@@ -441,7 +441,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Section</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Section</em>'.
@@ -457,7 +457,7 @@ public class InventorySwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
index 1fc0cc4518..205b6faf64 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Electronic Restaurant Example RCP Department
 Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Activator: org.gastro.rcp.internal.department.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.department;version="4.0.300";x-internal:=true
+ org.gastro.rcp.internal.department;version="4.0.400";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
index 0108e7a07e..7741200880 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * <p>
  * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
  * All Rights Reserved
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -39,11 +39,11 @@ public class ResourceManager extends SWTResourceManager
   // Image
   //
   // //////////////////////////////////////////////////////////////////////////
-  private static Map/* <ImageDescriptor,Image> */m_descriptorImageMap = new HashMap();
+  private static Map/* <ImageDescriptor,Image> */ m_descriptorImageMap = new HashMap();
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *          the {@link Class} relative to which to find the image descriptor.
    * @param path
@@ -57,7 +57,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *          the path to the image file.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
@@ -76,7 +76,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
-   * 
+   *
    * @param descriptor
    *          the {@link ImageDescriptor} for the {@link Image}.
    * @return the {@link Image} based on the specified {@link ImageDescriptor}.
@@ -101,11 +101,11 @@ public class ResourceManager extends SWTResourceManager
   /**
    * Maps images to decorated images.
    */
-  private static Map[]/* <Image,Map<Image,Image>> */m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+  private static Map[]/* <Image,Map<Image,Image>> */ m_decoratedImageMap = new Map[LAST_CORNER_KEY];
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated.
    * @param decorator
@@ -119,7 +119,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated.
    * @param decorator
@@ -251,7 +251,7 @@ public class ResourceManager extends SWTResourceManager
   /**
    * Maps URL to images.
    */
-  private static Map/* <URL,Image> */m_URLImageMap = new HashMap();
+  private static Map/* <URL,Image> */ m_URLImageMap = new HashMap();
 
   /**
    * Provider for plugin resources, used by WindowBuilder at design time.
@@ -268,7 +268,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the image
    * @param name
@@ -297,7 +297,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *          the symbolic name of the {@link Bundle}.
    * @param path
@@ -366,7 +366,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the image.
    * @param name
@@ -399,7 +399,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *          the symbolic name of the {@link Bundle}.
    * @param path
@@ -450,7 +450,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link URL} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the file path.
    * @param name
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java
index a7451b5226..93af75d608 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java
@@ -31,7 +31,7 @@ import java.util.Map;
  * <p>
  * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
  * All Rights Reserved
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -43,11 +43,11 @@ public class SWTResourceManager
   // Color
   //
   // //////////////////////////////////////////////////////////////////////////
-  private static Map/* <RGB,Color> */m_colorMap = new HashMap();
+  private static Map/* <RGB,Color> */ m_colorMap = new HashMap();
 
   /**
    * Returns the system {@link Color} matching the specific ID.
-   * 
+   *
    * @param systemColorID
    *          the ID value for the color
    * @return the system {@link Color} matching the specific ID
@@ -60,7 +60,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its red, green and blue component values.
-   * 
+   *
    * @param r
    *          the red component of the color
    * @param g
@@ -76,7 +76,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its RGB value.
-   * 
+   *
    * @param rgb
    *          the {@link RGB} value of the color
    * @return the {@link Color} matching the RGB value
@@ -115,11 +115,11 @@ public class SWTResourceManager
   /**
    * Maps image paths to images.
    */
-  private static Map/* <String,Image> */m_imageMap = new HashMap();
+  private static Map/* <String,Image> */ m_imageMap = new HashMap();
 
   /**
    * Returns an {@link Image} encoded by the specified {@link InputStream}.
-   * 
+   *
    * @param stream
    *          the {@link InputStream} encoding the image data
    * @return the {@link Image} encoded by the specified input stream
@@ -145,7 +145,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *          the path to the image file
    * @return the {@link Image} stored in the file at the specified path
@@ -172,7 +172,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *          the {@link Class} relative to which to find the image
    * @param path
@@ -245,11 +245,11 @@ public class SWTResourceManager
   /**
    * Maps images to decorated images.
    */
-  private static Map[]/* <Image,Map<Image,Image>> */m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+  private static Map[]/* <Image,Map<Image,Image>> */ m_decoratedImageMap = new Map[LAST_CORNER_KEY];
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated
    * @param decorator
@@ -263,7 +263,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated
    * @param decorator
@@ -374,16 +374,16 @@ public class SWTResourceManager
   /**
    * Maps font names to fonts.
    */
-  private static Map/* <String,Font> */m_fontMap = new HashMap();
+  private static Map/* <String,Font> */ m_fontMap = new HashMap();
 
   /**
    * Maps fonts to their bold versions.
    */
-  private static Map/* <Font,Font> */m_fontToBoldFontMap = new HashMap();
+  private static Map/* <Font,Font> */ m_fontToBoldFontMap = new HashMap();
 
   /**
    * Returns a {@link Font} based on its name, height and style.
-   * 
+   *
    * @param name
    *          the name of the font
    * @param height
@@ -400,7 +400,7 @@ public class SWTResourceManager
   /**
    * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline flags are also
    * supported.
-   * 
+   *
    * @param name
    *          the name of the font
    * @param size
@@ -454,7 +454,7 @@ public class SWTResourceManager
 
   /**
    * Returns a bold version of the given {@link Font}.
-   * 
+   *
    * @param baseFont
    *          the {@link Font} for which a bold version is desired
    * @return the bold version of the given {@link Font}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
index 0eb211f3f7..30ae9d55ab 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 
 /**
  * The activator class controls the plug-in life cycle
- * 
+ *
  * @author Eike Stepper
  */
 public class Activator extends AbstractUIPlugin
@@ -65,7 +65,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns the shared instance
-   * 
+   *
    * @return the shared instance
    */
   public static Activator getDefault()
@@ -75,7 +75,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns an image descriptor for the image file at the given plug-in relative path
-   * 
+   *
    * @param path
    *          the path
    * @return the image descriptor
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
index 3458421efb..2e7bdb9191 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
@@ -130,8 +130,8 @@ public class OrdersView extends ViewPart
             {
               public Object execute(OrderDetail orderDetail)
               {
-                orderDetail.setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED
-                    : OrderState.ORDERED);
+                orderDetail
+                    .setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED : OrderState.ORDERED);
                 return null;
               }
             });
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF
index 71b17b4b01..704ff8844c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Electronic Restaurant Example RCP Table
 Bundle-SymbolicName: org.gastro.rcp.table; singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Activator: org.gastro.rcp.internal.table.Activator
 Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.table;version="4.0.300";x-internal:=true
+ org.gastro.rcp.internal.table;version="4.0.400";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
index 5c23fb04fd..72ed9ff70a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * <p>
  * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
  * All Rights Reserved
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -39,11 +39,11 @@ public class ResourceManager extends SWTResourceManager
   // Image
   //
   // //////////////////////////////////////////////////////////////////////////
-  private static Map/* <ImageDescriptor,Image> */m_descriptorImageMap = new HashMap();
+  private static Map/* <ImageDescriptor,Image> */ m_descriptorImageMap = new HashMap();
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *          the {@link Class} relative to which to find the image descriptor.
    * @param path
@@ -57,7 +57,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *          the path to the image file.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
@@ -76,7 +76,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
-   * 
+   *
    * @param descriptor
    *          the {@link ImageDescriptor} for the {@link Image}.
    * @return the {@link Image} based on the specified {@link ImageDescriptor}.
@@ -101,11 +101,11 @@ public class ResourceManager extends SWTResourceManager
   /**
    * Maps images to decorated images.
    */
-  private static Map[]/* <Image,Map<Image,Image>> */m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+  private static Map[]/* <Image,Map<Image,Image>> */ m_decoratedImageMap = new Map[LAST_CORNER_KEY];
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated.
    * @param decorator
@@ -119,7 +119,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated.
    * @param decorator
@@ -251,7 +251,7 @@ public class ResourceManager extends SWTResourceManager
   /**
    * Maps URL to images.
    */
-  private static Map/* <URL,Image> */m_URLImageMap = new HashMap();
+  private static Map/* <URL,Image> */ m_URLImageMap = new HashMap();
 
   /**
    * Provider for plugin resources, used by WindowBuilder at design time.
@@ -268,7 +268,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the image
    * @param name
@@ -297,7 +297,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *          the symbolic name of the {@link Bundle}.
    * @param path
@@ -366,7 +366,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the image.
    * @param name
@@ -399,7 +399,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *          the symbolic name of the {@link Bundle}.
    * @param path
@@ -450,7 +450,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link URL} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the file path.
    * @param name
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java
index d00071980f..243b287d9e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java
@@ -31,7 +31,7 @@ import java.util.Map;
  * <p>
  * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
  * All Rights Reserved
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -43,11 +43,11 @@ public class SWTResourceManager
   // Color
   //
   // //////////////////////////////////////////////////////////////////////////
-  private static Map/* <RGB,Color> */m_colorMap = new HashMap();
+  private static Map/* <RGB,Color> */ m_colorMap = new HashMap();
 
   /**
    * Returns the system {@link Color} matching the specific ID.
-   * 
+   *
    * @param systemColorID
    *          the ID value for the color
    * @return the system {@link Color} matching the specific ID
@@ -60,7 +60,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its red, green and blue component values.
-   * 
+   *
    * @param r
    *          the red component of the color
    * @param g
@@ -76,7 +76,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its RGB value.
-   * 
+   *
    * @param rgb
    *          the {@link RGB} value of the color
    * @return the {@link Color} matching the RGB value
@@ -115,11 +115,11 @@ public class SWTResourceManager
   /**
    * Maps image paths to images.
    */
-  private static Map/* <String,Image> */m_imageMap = new HashMap();
+  private static Map/* <String,Image> */ m_imageMap = new HashMap();
 
   /**
    * Returns an {@link Image} encoded by the specified {@link InputStream}.
-   * 
+   *
    * @param stream
    *          the {@link InputStream} encoding the image data
    * @return the {@link Image} encoded by the specified input stream
@@ -145,7 +145,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *          the path to the image file
    * @return the {@link Image} stored in the file at the specified path
@@ -172,7 +172,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *          the {@link Class} relative to which to find the image
    * @param path
@@ -245,11 +245,11 @@ public class SWTResourceManager
   /**
    * Maps images to decorated images.
    */
-  private static Map[]/* <Image,Map<Image,Image>> */m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+  private static Map[]/* <Image,Map<Image,Image>> */ m_decoratedImageMap = new Map[LAST_CORNER_KEY];
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated
    * @param decorator
@@ -263,7 +263,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated
    * @param decorator
@@ -375,16 +375,16 @@ public class SWTResourceManager
   /**
    * Maps font names to fonts.
    */
-  private static Map/* <String,Font> */m_fontMap = new HashMap();
+  private static Map/* <String,Font> */ m_fontMap = new HashMap();
 
   /**
    * Maps fonts to their bold versions.
    */
-  private static Map/* <Font,Font> */m_fontToBoldFontMap = new HashMap();
+  private static Map/* <Font,Font> */ m_fontToBoldFontMap = new HashMap();
 
   /**
    * Returns a {@link Font} based on its name, height and style.
-   * 
+   *
    * @param name
    *          the name of the font
    * @param height
@@ -401,7 +401,7 @@ public class SWTResourceManager
   /**
    * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline flags are also
    * supported.
-   * 
+   *
    * @param name
    *          the name of the font
    * @param size
@@ -455,7 +455,7 @@ public class SWTResourceManager
 
   /**
    * Returns a bold version of the given {@link Font}.
-   * 
+   *
    * @param baseFont
    *          the {@link Font} for which a bold version is desired
    * @return the bold version of the given {@link Font}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
index bd3646fb60..bfe6e07a26 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 
 /**
  * The activator class controls the plug-in life cycle
- * 
+ *
  * @author Eike Stepper
  */
 public class Activator extends AbstractUIPlugin
@@ -65,7 +65,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns the shared instance
-   * 
+   *
    * @return the shared instance
    */
   public static Activator getDefault()
@@ -75,7 +75,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns an image descriptor for the image file at the given plug-in relative path
-   * 
+   *
    * @param path
    *          the path
    * @return the image descriptor
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
index f54ffa1889..713ef91c70 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
@@ -24,7 +24,7 @@ import java.util.Properties;
 
 /**
  * The activator class controls the plug-in life cycle
- * 
+ *
  * @author Eike Stepper
  */
 public class Activator extends AbstractUIPlugin
@@ -83,7 +83,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns the shared instance
-   * 
+   *
    * @return the shared instance
    */
   public static Activator getDefault()
@@ -93,7 +93,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns an image descriptor for the image file at the given plug-in relative path
-   * 
+   *
    * @param path
    *          the path
    * @return the image descriptor
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java
index 83b99bfc33..2ecfb5226e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java
@@ -21,7 +21,7 @@ import org.eclipse.ui.PlatformUI;
 
 /**
  * This class controls all aspects of the application's execution
- * 
+ *
  * @author Eike Stepper
  */
 public class Application implements IApplication
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/ApplicationActionBarAdvisor.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/ApplicationActionBarAdvisor.java
index e21132d87d..92ad24c914 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/ApplicationActionBarAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/ApplicationActionBarAdvisor.java
@@ -22,7 +22,7 @@ import org.eclipse.ui.application.IActionBarConfigurer;
 /**
  * An action bar advisor is responsible for creating, adding, and disposing of the actions added to a workbench window.
  * Each window will be populated with new actions.
- * 
+ *
  * @author Eike Stepper
  */
 public class ApplicationActionBarAdvisor extends ActionBarAdvisor
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/src/org/gastro/server/internal/web/GastroServlet.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/src/org/gastro/server/internal/web/GastroServlet.java
index d971906bde..cd5ba77e44 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/src/org/gastro/server/internal/web/GastroServlet.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/src/org/gastro/server/internal/web/GastroServlet.java
@@ -33,8 +33,6 @@ import org.gastro.business.BusinessDay;
 import org.gastro.inventory.MenuCard;
 import org.gastro.server.GastroServer;
 
-import templates.MenuCardTemplate;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -48,6 +46,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
 
+import templates.MenuCardTemplate;
+
 /**
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/src/org/gastro/server/internal/web/OM.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/src/org/gastro/server/internal/web/OM.java
index 61c575e790..7f09310cbe 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/src/org/gastro/server/internal/web/OM.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/src/org/gastro/server/internal/web/OM.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -21,7 +21,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF
index cb6b8c2533..47c23721fc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Electronic Restaurant Example Server
 Bundle-SymbolicName: org.gastro.server;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
@@ -17,6 +17,6 @@ Import-Package: org.h2;version="[1.0.0,2.0.0)",
  org.h2.tools;version="[1.0.0,2.0.0)",
  org.h2.util;version="[1.0.0,2.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.gastro.internal.server;version="4.0.300";x-internal:=true,
- org.gastro.server;version="4.0.300"
+Export-Package: org.gastro.internal.server;version="4.0.400";x-internal:=true,
+ org.gastro.server;version="4.0.400"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/src/org/gastro/server/GastroServer.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/src/org/gastro/server/GastroServer.java
index bd13707309..d76e3cd619 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/src/org/gastro/server/GastroServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/src/org/gastro/server/GastroServer.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
index b2457bf445..739e7a4fb1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.server; singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)"
 Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples.internal.server;version="4.0.300";x-internal:=true,
- org.eclipse.emf.cdo.examples.server;version="4.0.300"
+Export-Package: org.eclipse.emf.cdo.examples.internal.server;version="4.0.400";x-internal:=true,
+ org.eclipse.emf.cdo.examples.server;version="4.0.400"
 Bundle-Activator: org.eclipse.emf.cdo.examples.internal.server.OM$Activator
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/internal/server/OM.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/internal/server/OM.java
index 57cb8ca841..02e06216ae 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/internal/server/OM.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/internal/server/OM.java
@@ -20,7 +20,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
index 13f3e7ac15..b372da0479 100644
--- a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.emf.cdo.internal.examples.bundle.OM$Activator
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
 Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples;version="4.0.300";x-internal:=true,
- org.eclipse.emf.cdo.examples.server;version="4.0.300";x-internal:=true,
- org.eclipse.emf.cdo.examples.server.offline;version="4.0.300";x-internal:=true,
- org.eclipse.emf.cdo.internal.examples.bundle;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.examples;version="4.0.400";x-internal:=true,
+ org.eclipse.emf.cdo.examples.server;version="4.0.400";x-internal:=true,
+ org.eclipse.emf.cdo.examples.server.offline;version="4.0.400";x-internal:=true,
+ org.eclipse.emf.cdo.internal.examples.bundle;version="4.0.400";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/Webinar20090129.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/Webinar20090129.java
index 6408a3a298..678f8bd467 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/Webinar20090129.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/Webinar20090129.java
@@ -34,7 +34,7 @@ public class Webinar20090129
   {
     ResourceSet rs = new ResourceSetImpl();
     rs.getResourceFactoryRegistry().getExtensionToFactoryMap() //
-        .put("xml", new XMLResourceFactoryImpl()); //$NON-NLS-1$
+    .put("xml", new XMLResourceFactoryImpl()); //$NON-NLS-1$
     rs.getPackageRegistry().put(MODEL.getNsURI(), MODEL);
 
     URI uri = URI.createFileURI("C:/business/company.xml"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
index 093062a526..1da6f0564b 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
@@ -191,7 +191,7 @@ public abstract class FailoverExample
     {
       System.out.println();
       System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index 028fb93a35..8339f17f75 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -181,7 +181,7 @@ public abstract class AbstractOfflineExampleServer
     {
       System.out.println();
       System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
index ca5744b8cd..b673693199 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
@@ -177,8 +177,8 @@ public class OfflineExampleClient
 
     System.out.println("Client starting...");
     IManagedContainer container = OfflineExampleUtil.createContainer();
-    IConnector connector = Net4jUtil.getConnector(container, AbstractOfflineExampleServer.TRANSPORT_TYPE, "localhost:"
-        + PORT);
+    IConnector connector = Net4jUtil.getConnector(container, AbstractOfflineExampleServer.TRANSPORT_TYPE,
+        "localhost:" + PORT);
 
     CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
     configuration.setConnector(connector);
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleMaster.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleMaster.java
index 32f18c0bd8..6f6ea7b976 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleMaster.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleMaster.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/internal/examples/bundle/OM.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/internal/examples/bundle/OM.java
index 4ec9e5b33a..4b3eaec7b8 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/internal/examples/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/internal/examples/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentModifier.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentModifier.java
index 7c6ace44c0..45465b4d3e 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentModifier.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentModifier.java
@@ -154,8 +154,8 @@ public interface CDOCheckoutContentModifier
           String type = key.getType();
           if (deltaKind == IContainerDelta.Kind.ADDED)
           {
-            CDOCheckoutContentModifier modifier = (CDOCheckoutContentModifier)IPluginContainer.INSTANCE.getElement(
-                Factory.PRODUCT_GROUP, type, null);
+            CDOCheckoutContentModifier modifier = (CDOCheckoutContentModifier)IPluginContainer.INSTANCE
+                .getElement(Factory.PRODUCT_GROUP, type, null);
 
             synchronized (modifiers)
             {
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java
index cc2f80ab8b..640a049d37 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java
@@ -109,8 +109,8 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
 
   private static final Set<Object> LOADING_OBJECTS = new HashSet<Object>();
 
-  private static final Method GET_CHILDREN_FEATURES_METHOD = getMethod(ItemProviderAdapter.class,
-      "getChildrenFeatures", Object.class);
+  private static final Method GET_CHILDREN_FEATURES_METHOD = getMethod(ItemProviderAdapter.class, "getChildrenFeatures",
+      Object.class);
 
   private static final Method FIND_ITEM_METHOD = getMethod(StructuredViewer.class, "findItem", Object.class);
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutLabelProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutLabelProvider.java
index ac288ac8db..3782e23010 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutLabelProvider.java
@@ -34,8 +34,8 @@ import org.eclipse.ui.navigator.ICommonLabelProvider;
 /**
  * @author Eike Stepper
  */
-public class CDOCheckoutLabelProvider extends LabelProvider implements ICommonLabelProvider, IColorProvider,
-    IStyledLabelProvider
+public class CDOCheckoutLabelProvider extends LabelProvider
+    implements ICommonLabelProvider, IColorProvider, IStyledLabelProvider
 {
   private static final IEditorRegistry EDITOR_REGISTRY = PlatformUI.getWorkbench().getEditorRegistry();
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutState.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutState.java
index 0ad3775a32..b3862648e5 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutState.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutState.java
@@ -212,8 +212,8 @@ public final class CDOCheckoutState
   /**
    * @author Eike Stepper
    */
-  public static final class LabelProvider extends AdapterFactoryLabelProvider implements IColorProvider,
-      IStyledLabelProvider
+  public static final class LabelProvider extends AdapterFactoryLabelProvider
+      implements IColorProvider, IStyledLabelProvider
   {
     private final ResourceManager resourceManager;
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java
index 052d6d3efa..0a01fee3e7 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/ShowInActionProvider.java
@@ -106,7 +106,8 @@ public class ShowInActionProvider extends AbstractActionProvider<Object>
     return fillMenu(page, viewer, subMenu, selectedElement);
   }
 
-  public static boolean fillMenu(IWorkbenchPage page, StructuredViewer viewer, IMenuManager menu, Object selectedElement)
+  public static boolean fillMenu(IWorkbenchPage page, StructuredViewer viewer, IMenuManager menu,
+      Object selectedElement)
   {
     boolean filled = false;
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutWizard.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutWizard.java
index b635832627..918becb4ef 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutWizard.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutWizard.java
@@ -211,8 +211,8 @@ public class CheckoutWizard extends Wizard implements IImportWizard, IPageChange
       {
         IWorkbench workbench = PlatformUI.getWorkbench();
 
-        IViewDescriptor viewDescriptor = workbench.getViewRegistry().find(
-            CDOCheckoutContentProvider.PROJECT_EXPLORER_ID);
+        IViewDescriptor viewDescriptor = workbench.getViewRegistry()
+            .find(CDOCheckoutContentProvider.PROJECT_EXPLORER_ID);
         if (viewDescriptor != null)
         {
           IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/NewWizard.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/NewWizard.java
index bcf6c88c88..54dfcee61e 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/NewWizard.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/NewWizard.java
@@ -139,8 +139,8 @@ public abstract class NewWizard extends Wizard implements INewWizard
           {
             public void run()
             {
-              ErrorDialog.openError(getShell(), "Error", "An error occured while creating the " + title.toLowerCase()
-                  + ".", status);
+              ErrorDialog.openError(getShell(), "Error",
+                  "An error occured while creating the " + title.toLowerCase() + ".", status);
             }
           });
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceRevertHandler.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceRevertHandler.java
index 1702bb6e3c..b2ee74617e 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceRevertHandler.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceRevertHandler.java
@@ -96,9 +96,9 @@ public class WorkspaceRevertHandler extends AbstractBaseHandler<OfflineCDOChecko
         String plural = size == 1 ? "" : "s";
         String message = size == 1 ? "is 1" : "are " + size;
 
-        if (!MessageDialog.openQuestion(shell, "Uncommitted Transaction" + plural, "There " + message
-            + " uncommitted transaction" + plural + ".\n\n" + "Are you sure you want to rollback the transaction"
-            + plural + ", too?"))
+        if (!MessageDialog.openQuestion(shell, "Uncommitted Transaction" + plural,
+            "There " + message + " uncommitted transaction" + plural + ".\n\n"
+                + "Are you sure you want to rollback the transaction" + plural + ", too?"))
         {
           cancel();
           return;
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoryItemProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoryItemProvider.java
index 24ea07cedb..92d6ae0d52 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoryItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/CDORepositoryItemProvider.java
@@ -45,7 +45,7 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * @author Eike Stepper
  */
-public class CDORepositoryItemProvider extends ContainerItemProvider<IContainer<Object>> implements ITableLabelProvider
+public class CDORepositoryItemProvider extends ContainerItemProvider<IContainer<Object>>implements ITableLabelProvider
 {
   public static final Image REPOSITORY_IMAGE = SharedIcons.getImage(SharedIcons.OBJ_REPO);
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryTypePage.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryTypePage.java
index 6749225843..0cf151aad4 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryTypePage.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/repositories/wizards/RepositoryTypePage.java
@@ -53,7 +53,8 @@ public class RepositoryTypePage extends WizardPage
     NewRepositoryWizard wizard = getWizard();
 
     RepositoryRemotePage remotePage = wizard.getRemotePage();
-    addChoice(composite, "Connect to an existing remote repository.", "icons/wiz/new_repo_remote.gif", remotePage, true);
+    addChoice(composite, "Connect to an existing remote repository.", "icons/wiz/new_repo_remote.gif", remotePage,
+        true);
 
     RepositoryClonePage clonePage = wizard.getClonePage();
     addChoice(composite, "Clone an existing remote repository.", "icons/wiz/new_repo_clone.gif", clonePage, false);
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java
index ab73a7679d..cf5a6cb53e 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java
@@ -30,7 +30,7 @@ import org.eclipse.net4j.util.security.IPasswordCredentialsProvider2;
  * @since 4.4
  */
 public interface CDORepository extends CDOExplorerElement, IContainer<CDOBranch>, IPasswordCredentialsProvider2,
-    CDOSessionProvider, CDOViewOpener, CDOTransactionOpener
+CDOSessionProvider, CDOViewOpener, CDOTransactionOpener
 {
   public static final String TYPE_REMOTE = "remote";
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java
index ef1d1a8db2..ec2b8bcf9e 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java
@@ -32,8 +32,8 @@ import java.util.Properties;
 /**
  * @author Eike Stepper
  */
-public abstract class AbstractManager<T extends CDOExplorerElement> extends SetContainer<T> implements
-    CDOExplorerManager<T>
+public abstract class AbstractManager<T extends CDOExplorerElement> extends SetContainer<T>
+    implements CDOExplorerManager<T>
 {
   private final File folder;
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
index 7e19653d37..dcf84a489d 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * @author Eike Stepper
  */
-public class CDOCheckoutManagerImpl extends AbstractManager<CDOCheckout> implements CDOCheckoutManager
+public class CDOCheckoutManagerImpl extends AbstractManager<CDOCheckout>implements CDOCheckoutManager
 {
   private static final String PROPERTIES_FILE = "checkout.properties";
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java
index 2bdee9fcae..35bc738164 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java
@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * @author Eike Stepper
  */
-public class CDORepositoryManagerImpl extends AbstractManager<CDORepository> implements CDORepositoryManager
+public class CDORepositoryManagerImpl extends AbstractManager<CDORepository>implements CDORepositoryManager
 {
   public static final String SECURE_STORE_PATH = "/CDO/repositories";
 
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java
index 22b346c717..fa7d0bf067 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java
@@ -126,8 +126,8 @@ public class LocalCDORepository extends CDORepositoryImpl
     JdbcDataSource dataSource = new JdbcDataSource();
     dataSource.setURL("jdbc:h2:" + folder);
 
-    IMappingStrategy mappingStrategy = CDODBUtil.createHorizontalMappingStrategy(getVersioningMode()
-        .isSupportingAudits(), getVersioningMode().isSupportingBranches(), false);
+    IMappingStrategy mappingStrategy = CDODBUtil.createHorizontalMappingStrategy(
+        getVersioningMode().isSupportingAudits(), getVersioningMode().isSupportingBranches(), false);
     mappingStrategy.setProperties(getMappingStrategyProperties());
 
     IDBAdapter dbAdapter = DBUtil.getDBAdapter("h2");
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.expressions.edit/META-INF/MANIFEST.MF
index 1ee1d68256..191ff20fbb 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.expressions.edit;singleton:=true
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.expressions.provider.ExpressionsEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/AccessItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/AccessItemProvider.java
index a88a0718fb..ce2ffabb0a 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/AccessItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/AccessItemProvider.java
@@ -43,8 +43,8 @@ import java.util.List;
  * @generated
  */
 public class AccessItemProvider extends ItemProviderAdapter 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.
@@ -177,17 +177,17 @@ public class AccessItemProvider extends ItemProviderAdapter implements IEditingD
     newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
         ExpressionsFactory.eINSTANCE.createBooleanValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createByteValue()));
+    newChildDescriptors.add(
+        createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createByteValue()));
 
     newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
         ExpressionsFactory.eINSTANCE.createShortValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createIntValue()));
+    newChildDescriptors.add(
+        createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createIntValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createLongValue()));
+    newChildDescriptors.add(
+        createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createLongValue()));
 
     newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
         ExpressionsFactory.eINSTANCE.createFloatValue()));
@@ -195,8 +195,8 @@ public class AccessItemProvider extends ItemProviderAdapter implements IEditingD
     newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
         ExpressionsFactory.eINSTANCE.createDoubleValue()));
 
-    newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
-        ExpressionsFactory.eINSTANCE.createCharValue()));
+    newChildDescriptors.add(
+        createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME, ExpressionsFactory.eINSTANCE.createCharValue()));
 
     newChildDescriptors.add(createChildParameter(ExpressionsPackage.Literals.ACCESS__NAME,
         ExpressionsFactory.eINSTANCE.createStringValue()));
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/BooleanValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/BooleanValueItemProvider.java
index 84cbf43dc8..e7368d050a 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/BooleanValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/BooleanValueItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class BooleanValueItemProvider extends ValueItemProvider 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,13 @@ public class BooleanValueItemProvider extends ValueItemProvider implements IEdit
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_BooleanValue_literal_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_BooleanValue_literal_feature", "_UI_BooleanValue_type"),
-        ExpressionsPackage.Literals.BOOLEAN_VALUE__LITERAL, true, false, false,
-        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_BooleanValue_literal_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_BooleanValue_literal_feature",
+                "_UI_BooleanValue_type"),
+            ExpressionsPackage.Literals.BOOLEAN_VALUE__LITERAL, true, false, false,
+            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ByteValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ByteValueItemProvider.java
index be01663e4f..716f8d2c30 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ByteValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ByteValueItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class ByteValueItemProvider extends ValueItemProvider 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,12 @@ public class ByteValueItemProvider extends ValueItemProvider implements IEditing
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_ByteValue_literal_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_ByteValue_literal_feature", "_UI_ByteValue_type"),
-        ExpressionsPackage.Literals.BYTE_VALUE__LITERAL, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_ByteValue_literal_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_ByteValue_literal_feature", "_UI_ByteValue_type"),
+            ExpressionsPackage.Literals.BYTE_VALUE__LITERAL, true, false, false,
+            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/CharValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/CharValueItemProvider.java
index 9377185814..32cabafc1a 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/CharValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/CharValueItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class CharValueItemProvider extends ValueItemProvider 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,12 @@ public class CharValueItemProvider extends ValueItemProvider implements IEditing
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_CharValue_literal_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_CharValue_literal_feature", "_UI_CharValue_type"),
-        ExpressionsPackage.Literals.CHAR_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_CharValue_literal_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_CharValue_literal_feature", "_UI_CharValue_type"),
+            ExpressionsPackage.Literals.CHAR_VALUE__LITERAL, true, false, false,
+            ItemPropertyDescriptor.TEXT_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContainedObjectItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContainedObjectItemProvider.java
index c68faf1663..592e2a0141 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContainedObjectItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContainedObjectItemProvider.java
@@ -43,8 +43,8 @@ import java.util.List;
  * @generated
  */
 public class ContainedObjectItemProvider extends ItemProviderAdapter 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.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.java
index c05bce6b5b..8d4f238e21 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ContextAccessItemProvider.java
@@ -34,8 +34,8 @@ import java.util.List;
  * @generated
  */
 public class ContextAccessItemProvider extends AccessItemProvider 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.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/DoubleValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/DoubleValueItemProvider.java
index 7d5f8ca6d2..c8007978e5 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/DoubleValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/DoubleValueItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class DoubleValueItemProvider extends ValueItemProvider 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,14 @@ public class DoubleValueItemProvider extends ValueItemProvider implements IEditi
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_DoubleValue_literal_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_DoubleValue_literal_feature", "_UI_DoubleValue_type"),
-        ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_DoubleValue_literal_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_DoubleValue_literal_feature",
+                    "_UI_DoubleValue_type"),
+                ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL, true, false, false,
+                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java
index e17fabec4f..ba5c2ed660 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ExpressionsItemProviderAdapterFactory.java
@@ -50,8 +50,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ExpressionsItemProviderAdapterFactory extends ExpressionsAdapterFactory implements
-    ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
+public class ExpressionsItemProviderAdapterFactory extends ExpressionsAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -690,7 +690,7 @@ public class ExpressionsItemProviderAdapterFactory extends ExpressionsAdapterFac
   }
 
   /**
-   * This disposes all of the item providers created by this factory. 
+   * This disposes all of the item providers created by this factory.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FloatValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FloatValueItemProvider.java
index c8d0b17529..660bc1eabb 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FloatValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FloatValueItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class FloatValueItemProvider extends ValueItemProvider 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,14 @@ public class FloatValueItemProvider extends ValueItemProvider implements IEditin
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_FloatValue_literal_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_FloatValue_literal_feature", "_UI_FloatValue_type"),
-        ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_FloatValue_literal_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_FloatValue_literal_feature",
+                    "_UI_FloatValue_type"),
+                ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL, true, false, false,
+                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java
index a8829750b3..d1627fc3cb 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/FunctionInvocationItemProvider.java
@@ -36,8 +36,8 @@ import java.util.List;
  * @generated
  */
 public class FunctionInvocationItemProvider extends InvocationItemProvider 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.
@@ -146,8 +146,8 @@ public class FunctionInvocationItemProvider extends InvocationItemProvider imple
 
     if (qualify)
     {
-      return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature),
-          getTypeText(owner) });
+      return getString("_UI_CreateChild_text2",
+          new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
     }
     return super.getCreateChildText(owner, feature, child, selection);
   }
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/IntValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/IntValueItemProvider.java
index e5d6c28f17..7217a2ce82 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/IntValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/IntValueItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class IntValueItemProvider extends ValueItemProvider 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,12 @@ public class IntValueItemProvider extends ValueItemProvider implements IEditingD
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_IntValue_literal_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_IntValue_literal_feature", "_UI_IntValue_type"),
-        ExpressionsPackage.Literals.INT_VALUE__LITERAL, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_IntValue_literal_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_IntValue_literal_feature", "_UI_IntValue_type"),
+            ExpressionsPackage.Literals.INT_VALUE__LITERAL, true, false, false,
+            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/InvocationItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/InvocationItemProvider.java
index 5d816a10a4..09e80ef8ad 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/InvocationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/InvocationItemProvider.java
@@ -43,8 +43,8 @@ import java.util.List;
  * @generated
  */
 public class InvocationItemProvider extends ItemProviderAdapter 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.
@@ -302,8 +302,8 @@ public class InvocationItemProvider extends ItemProviderAdapter implements IEdit
 
     if (qualify)
     {
-      return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature),
-          getTypeText(owner) });
+      return getString("_UI_CreateChild_text2",
+          new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
     }
     return super.getCreateChildText(owner, feature, child, selection);
   }
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedExpressionItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedExpressionItemProvider.java
index 461fcedd43..33a8b7b78f 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedExpressionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedExpressionItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class LinkedExpressionItemProvider extends ItemProviderAdapter 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,13 +80,12 @@ public class LinkedExpressionItemProvider extends ItemProviderAdapter implements
    */
   protected void addExpressionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_LinkedExpression_expression_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_LinkedExpression_expression_feature",
-            "_UI_LinkedExpression_type"), ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, true, false, true,
-        null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_LinkedExpression_expression_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_LinkedExpression_expression_feature",
+                "_UI_LinkedExpression_type"),
+            ExpressionsPackage.Literals.LINKED_EXPRESSION__EXPRESSION, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedObjectItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedObjectItemProvider.java
index f9413685eb..1f3e82e6cf 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedObjectItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LinkedObjectItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class LinkedObjectItemProvider extends ItemProviderAdapter 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,11 +80,11 @@ public class LinkedObjectItemProvider extends ItemProviderAdapter implements IEd
    */
   protected void addObjectPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_LinkedObject_object_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_LinkedObject_object_feature", "_UI_LinkedObject_type"),
-        ExpressionsPackage.Literals.LINKED_OBJECT__OBJECT, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_LinkedObject_object_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_LinkedObject_object_feature", "_UI_LinkedObject_type"),
+            ExpressionsPackage.Literals.LINKED_OBJECT__OBJECT, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ListConstructionItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ListConstructionItemProvider.java
index e0b28f441c..f857e055c9 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ListConstructionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ListConstructionItemProvider.java
@@ -43,8 +43,8 @@ import java.util.List;
  * @generated
  */
 public class ListConstructionItemProvider extends ItemProviderAdapter 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.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LongValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LongValueItemProvider.java
index db6799ef35..8476cf8946 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LongValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/LongValueItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class LongValueItemProvider extends ValueItemProvider 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,12 @@ public class LongValueItemProvider extends ValueItemProvider implements IEditing
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_LongValue_literal_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_LongValue_literal_feature", "_UI_LongValue_type"),
-        ExpressionsPackage.Literals.LONG_VALUE__LITERAL, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_LongValue_literal_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_LongValue_literal_feature", "_UI_LongValue_type"),
+            ExpressionsPackage.Literals.LONG_VALUE__LITERAL, true, false, false,
+            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberAccessItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberAccessItemProvider.java
index 68d85b467c..453c8ab9de 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberAccessItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberAccessItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class MemberAccessItemProvider extends AccessItemProvider 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.
@@ -244,8 +244,8 @@ public class MemberAccessItemProvider extends AccessItemProvider implements IEdi
 
     if (qualify)
     {
-      return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature),
-          getTypeText(owner) });
+      return getString("_UI_CreateChild_text2",
+          new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
     }
     return super.getCreateChildText(owner, feature, child, selection);
   }
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberInvocationItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberInvocationItemProvider.java
index 67f8d9fc0f..ead656db6a 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberInvocationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/MemberInvocationItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class MemberInvocationItemProvider extends InvocationItemProvider 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.
@@ -245,8 +245,8 @@ public class MemberInvocationItemProvider extends InvocationItemProvider impleme
 
     if (qualify)
     {
-      return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature),
-          getTypeText(owner) });
+      return getString("_UI_CreateChild_text2",
+          new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
     }
     return super.getCreateChildText(owner, feature, child, selection);
   }
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ShortValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ShortValueItemProvider.java
index aee91f4196..d24727e4de 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ShortValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ShortValueItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class ShortValueItemProvider extends ValueItemProvider 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,14 @@ public class ShortValueItemProvider extends ValueItemProvider implements IEditin
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_ShortValue_literal_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_ShortValue_literal_feature", "_UI_ShortValue_type"),
-        ExpressionsPackage.Literals.SHORT_VALUE__LITERAL, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_ShortValue_literal_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_ShortValue_literal_feature",
+                    "_UI_ShortValue_type"),
+                ExpressionsPackage.Literals.SHORT_VALUE__LITERAL, true, false, false,
+                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StaticAccessItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StaticAccessItemProvider.java
index 0536b3feac..cbb2a2eedf 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StaticAccessItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StaticAccessItemProvider.java
@@ -34,8 +34,8 @@ import java.util.List;
  * @generated
  */
 public class StaticAccessItemProvider extends AccessItemProvider 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.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StringValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StringValueItemProvider.java
index acba052e83..d5d97d0f14 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StringValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/StringValueItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class StringValueItemProvider extends ValueItemProvider 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,14 @@ public class StringValueItemProvider extends ValueItemProvider implements IEditi
    */
   protected void addLiteralPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_StringValue_literal_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_StringValue_literal_feature", "_UI_StringValue_type"),
-        ExpressionsPackage.Literals.STRING_VALUE__LITERAL, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_StringValue_literal_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_StringValue_literal_feature",
+                    "_UI_StringValue_type"),
+                ExpressionsPackage.Literals.STRING_VALUE__LITERAL, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -121,8 +123,8 @@ public class StringValueItemProvider extends ValueItemProvider implements IEditi
   public String getText(Object object)
   {
     String label = ((StringValue)object).getLiteral();
-    return label == null || label.length() == 0 ? getString("_UI_StringValue_type") : getString("_UI_StringValue_type")
-        + " " + label;
+    return label == null || label.length() == 0 ? getString("_UI_StringValue_type")
+        : getString("_UI_StringValue_type") + " " + label;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ValueItemProvider.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ValueItemProvider.java
index b4bd2de3e1..ae9773628a 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ValueItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/ValueItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  * @generated
  */
 public class ValueItemProvider extends ItemProviderAdapter 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.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/package-info.java b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/package-info.java
index 338a058053..be8c722b1b 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.edit/src/org/eclipse/emf/cdo/expressions/provider/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2013 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) 2013 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.expressions.provider;
-
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsActionBarContributor.java b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsActionBarContributor.java
index 740887f84e..b7c5b956cf 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsActionBarContributor.java
@@ -49,8 +49,8 @@ import java.util.Collection;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ExpressionsActionBarContributor extends EditingDomainActionBarContributor implements
-    ISelectionChangedListener
+public class ExpressionsActionBarContributor extends EditingDomainActionBarContributor
+    implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor.
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
index 785659ebde..ec1be54d7e 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java
@@ -126,8 +126,8 @@ import java.util.Map;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker
+public class ExpressionsEditor extends MultiPageEditorPart
+    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model.
@@ -420,11 +420,11 @@ public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDo
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED
-                  && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED
+                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet.getResource(
-                    URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet
+                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -591,8 +591,8 @@ public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDo
   {
     if (updateProblemIndication)
     {
-      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.expressions.editor", 0,
-          null, new Object[] { editingDomain.getResourceSet() });
+      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.expressions.editor", 0, null,
+          new Object[] { editingDomain.getResourceSet() });
       for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
       {
         if (childDiagnostic.getSeverity() != Diagnostic.OK)
@@ -987,8 +987,8 @@ public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDo
     }
     else if (exception != null)
     {
-      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.expressions.editor", 0, getString(
-          "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
+      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.expressions.editor", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
     }
     else
     {
@@ -1020,8 +1020,8 @@ public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDo
       setCurrentViewer(selectionViewer);
 
       selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-      selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory,
-          selectionViewer));
+      selectionViewer
+          .setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, selectionViewer));
       selectionViewer.setInput(editingDomain.getResourceSet());
       selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
 
@@ -1179,8 +1179,8 @@ public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDo
           // Set up the tree viewer.
           //
           contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-          contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory,
-              contentOutlineViewer));
+          contentOutlineViewer.setLabelProvider(
+              new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, contentOutlineViewer));
           contentOutlineViewer.setInput(editingDomain.getResourceSet());
 
           // Make sure our popups work.
@@ -1191,8 +1191,8 @@ public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDo
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources()
-                .get(0)), true);
+            contentOutlineViewer
+                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
@@ -1446,9 +1446,9 @@ public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDo
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
-        .getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-    doSave(progressMonitor);
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
+        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+        doSave(progressMonitor);
   }
 
   /**
@@ -1551,8 +1551,8 @@ public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDo
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
-        : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsModelWizard.java b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsModelWizard.java
index cf0925a8ce..a4916c2594 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsModelWizard.java
@@ -82,9 +82,8 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
    * <!-- end-user-doc -->
    * @generated
    */
-  public static final List<String> FILE_EXTENSIONS = Collections
-      .unmodifiableList(Arrays.asList(ExpressionsEditorPlugin.INSTANCE.getString(
-          "_UI_ExpressionsEditorFilenameExtensions").split("\\s*,\\s*")));
+  public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(
+      ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditorFilenameExtensions").split("\\s*,\\s*")));
 
   /**
    * A formatted list of supported file extensions, suitable for display.
@@ -92,8 +91,8 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
    * <!-- end-user-doc -->
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = ExpressionsEditorPlugin.INSTANCE.getString(
-      "_UI_ExpressionsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+  public static final String FORMATTED_FILE_EXTENSIONS = ExpressionsEditorPlugin.INSTANCE
+      .getString("_UI_ExpressionsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
 
   /**
    * This caches an instance of the model package.
@@ -162,8 +161,8 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(ExpressionsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ExpressionsEditorPlugin.INSTANCE
-        .getImage("full/wizban/NewExpressions")));
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
+        .getImageDescriptor(ExpressionsEditorPlugin.INSTANCE.getImage("full/wizban/NewExpressions")));
   }
 
   /**
@@ -607,10 +606,11 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
     //
     newFileCreationPage = new ExpressionsModelWizardNewFileCreationPage("Whatever", selection);
     newFileCreationPage.setTitle(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsModelWizard_label"));
-    newFileCreationPage.setDescription(ExpressionsEditorPlugin.INSTANCE
-        .getString("_UI_ExpressionsModelWizard_description"));
-    newFileCreationPage.setFileName(ExpressionsEditorPlugin.INSTANCE
-        .getString("_UI_ExpressionsEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+    newFileCreationPage
+        .setDescription(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsModelWizard_description"));
+    newFileCreationPage
+        .setFileName(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsEditorFilenameDefaultBase") + "."
+            + FILE_EXTENSIONS.get(0));
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -654,8 +654,8 @@ public class ExpressionsModelWizard extends Wizard implements INewWizard
     }
     initialObjectCreationPage = new ExpressionsModelWizardInitialObjectCreationPage("Whatever2");
     initialObjectCreationPage.setTitle(ExpressionsEditorPlugin.INSTANCE.getString("_UI_ExpressionsModelWizard_label"));
-    initialObjectCreationPage.setDescription(ExpressionsEditorPlugin.INSTANCE
-        .getString("_UI_Wizard_initial_object_description"));
+    initialObjectCreationPage
+        .setDescription(ExpressionsEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF
index de78b1b764..9374bfdf2b 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.expressions/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.expressions;singleton:=true
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.expressions;version="4.3.0",
- org.eclipse.emf.cdo.expressions.impl;version="4.3.0",
- org.eclipse.emf.cdo.expressions.util;version="4.3.0"
+Export-Package: org.eclipse.emf.cdo.expressions;version="4.3.100",
+ org.eclipse.emf.cdo.expressions.impl;version="4.3.100",
+ org.eclipse.emf.cdo.expressions.util;version="4.3.100"
 Require-Bundle: org.eclipse.emf.cdo;visibility:=reexport;bundle-version="[4.1.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java
index 5067955a33..4b347c4524 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/DoubleValueImpl.java
@@ -80,7 +80,8 @@ public class DoubleValueImpl extends ValueImpl implements DoubleValue
    */
   public void setLiteral(double newLiteral)
   {
-    eDynamicSet(ExpressionsPackage.DOUBLE_VALUE__LITERAL, ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL, newLiteral);
+    eDynamicSet(ExpressionsPackage.DOUBLE_VALUE__LITERAL, ExpressionsPackage.Literals.DOUBLE_VALUE__LITERAL,
+        newLiteral);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
index 709bc96296..bb6ffbb717 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/EvaluationContextImpl.java
@@ -22,7 +22,7 @@ import java.util.Map;
  *
  * @author Eike Stepper
  */
-public class EvaluationContextImpl extends HashMap<String, Object> implements EvaluationContext
+public class EvaluationContextImpl extends HashMap<String, Object>implements EvaluationContext
 {
   private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
index 679af06609..bcc9b41098 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ExpressionsPackageImpl.java
@@ -243,7 +243,7 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link ExpressionsPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -261,8 +261,9 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
     }
 
     // Obtain or create and register package
-    ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new ExpressionsPackageImpl());
+    ExpressionsPackageImpl theExpressionsPackage = (ExpressionsPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof ExpressionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new ExpressionsPackageImpl());
 
     isInited = true;
 
@@ -872,7 +873,8 @@ public class ExpressionsPackageImpl extends EPackageImpl implements ExpressionsP
     listConstructionEClass.getESuperTypes().add(getExpression());
 
     // Initialize classes, features, and operations; add parameters
-    initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
 
     EOperation op = initEOperation(getExpression__Evaluate__EvaluationContext(), ecorePackage.getEJavaObject(),
         "evaluate", 0, 1, IS_UNIQUE, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java
index c145ed23a6..bf4736bedf 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/FloatValueImpl.java
@@ -69,8 +69,8 @@ public class FloatValueImpl extends ValueImpl implements FloatValue
   @Override
   public Float getLiteral()
   {
-    return (Float)eDynamicGet(ExpressionsPackage.FLOAT_VALUE__LITERAL,
-        ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL, true, true);
+    return (Float)eDynamicGet(ExpressionsPackage.FLOAT_VALUE__LITERAL, ExpressionsPackage.Literals.FLOAT_VALUE__LITERAL,
+        true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java
index 4aa789e00d..1f1fb25cc7 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/ShortValueImpl.java
@@ -69,8 +69,8 @@ public class ShortValueImpl extends ValueImpl implements ShortValue
   @Override
   public Short getLiteral()
   {
-    return (Short)eDynamicGet(ExpressionsPackage.SHORT_VALUE__LITERAL,
-        ExpressionsPackage.Literals.SHORT_VALUE__LITERAL, true, true);
+    return (Short)eDynamicGet(ExpressionsPackage.SHORT_VALUE__LITERAL, ExpressionsPackage.Literals.SHORT_VALUE__LITERAL,
+        true, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java
index da1878aefe..c8556446c7 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/StringValueImpl.java
@@ -80,7 +80,8 @@ public class StringValueImpl extends ValueImpl implements StringValue
    */
   public void setLiteral(String newLiteral)
   {
-    eDynamicSet(ExpressionsPackage.STRING_VALUE__LITERAL, ExpressionsPackage.Literals.STRING_VALUE__LITERAL, newLiteral);
+    eDynamicSet(ExpressionsPackage.STRING_VALUE__LITERAL, ExpressionsPackage.Literals.STRING_VALUE__LITERAL,
+        newLiteral);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java
index 66b5dd723c..a41845e1a7 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/impl/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2013 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) 2013 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.expressions.impl;
-
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java
index ebf8d3bbd4..794a23f5b3 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2013 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) 2013 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
  */
 
 /**
@@ -16,4 +12,3 @@
  * @apiviz.exclude .*\.ExpressionsFactory.*
  */
 package org.eclipse.emf.cdo.expressions;
-
diff --git a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/package-info.java b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/package-info.java
index 609c570899..66c38ce9f6 100644
--- a/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.expressions/src/org/eclipse/emf/cdo/expressions/util/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2013 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) 2013 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
  */
 
 /**
  * The generated EMF utilities of the CDO expressions model.
  */
 package org.eclipse.emf.cdo.expressions.util;
-
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/messages/Messages.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/messages/Messages.java
index e3f0bf63ad..ae6cef9a16 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
index ec5c1a0019..bef3cf9483 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOImporter.java
@@ -76,8 +76,8 @@ public class CDOImporter extends ModelImporter
 
       for (Resource resource : ecoreResourceSet.getResources())
       {
-        getEPackages().addAll(
-            EcoreUtil.<EPackage> getObjectsByType(resource.getContents(), EcorePackage.Literals.EPACKAGE));
+        getEPackages()
+            .addAll(EcoreUtil.<EPackage> getObjectsByType(resource.getContents(), EcorePackage.Literals.EPACKAGE));
       }
 
       BasicDiagnostic diagnosticChain = new BasicDiagnostic(ConverterPlugin.ID, ConverterUtil.ACTION_MESSAGE_NONE,
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
index 3c3c3df017..d45b6343cf 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
index fa7341ce93..402dc3d365 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
@@ -37,8 +37,8 @@ import java.util.Set;
  * @author Eike Stepper
  */
 @SuppressWarnings("deprecation")
-public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImpl implements
-    org.eclipse.emf.cdo.net4j.CDOSessionConfiguration
+public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImpl
+    implements org.eclipse.emf.cdo.net4j.CDOSessionConfiguration
 {
   private String repositoryName;
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
index 099c711338..8016b0dbb5 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
@@ -319,8 +319,8 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
   /**
    * @author Eike Stepper
    */
-  protected class OptionsImpl extends org.eclipse.emf.internal.cdo.session.CDOSessionImpl.OptionsImpl implements
-      org.eclipse.emf.cdo.net4j.CDOSession.Options
+  protected class OptionsImpl extends org.eclipse.emf.internal.cdo.session.CDOSessionImpl.OptionsImpl
+      implements org.eclipse.emf.cdo.net4j.CDOSession.Options
   {
     private int commitTimeout = CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS;
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java
index ead4b2c776..d011c4399c 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java
@@ -22,8 +22,8 @@ import org.eclipse.emf.spi.cdo.InternalCDOSession;
  * @author Eike Stepper
  * @since 4.0
  */
-public class FailoverCDOSessionConfigurationImpl extends RecoveringCDOSessionConfigurationImpl implements
-    FailoverCDOSessionConfiguration
+public class FailoverCDOSessionConfigurationImpl extends RecoveringCDOSessionConfigurationImpl
+    implements FailoverCDOSessionConfiguration
 {
   private String monitorConnectorDescription;
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/ReconnectingCDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/ReconnectingCDOSessionConfigurationImpl.java
index 838e9adc42..19ec5d3d74 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/ReconnectingCDOSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/ReconnectingCDOSessionConfigurationImpl.java
@@ -20,8 +20,8 @@ import org.eclipse.emf.spi.cdo.InternalCDOSession;
 /**
  * @author Caspar De Groot
  */
-public class ReconnectingCDOSessionConfigurationImpl extends RecoveringCDOSessionConfigurationImpl implements
-    ReconnectingCDOSessionConfiguration
+public class ReconnectingCDOSessionConfigurationImpl extends RecoveringCDOSessionConfigurationImpl
+    implements ReconnectingCDOSessionConfiguration
 {
   private String hostAndPort;
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionConfigurationImpl.java
index c7bbe168a6..30f0b79502 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionConfigurationImpl.java
@@ -19,8 +19,8 @@ import org.eclipse.emf.spi.cdo.InternalCDOSession;
 /**
  * @author Caspar De Groot
  */
-public abstract class RecoveringCDOSessionConfigurationImpl extends CDONet4jSessionConfigurationImpl implements
-    RecoveringCDOSessionConfiguration
+public abstract class RecoveringCDOSessionConfigurationImpl extends CDONet4jSessionConfigurationImpl
+    implements RecoveringCDOSessionConfiguration
 {
   private IManagedContainer container;
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/bundle/OM.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/bundle/OM.java
index 5103597d3a..82600aadc4 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/bundle/OM.java
@@ -22,7 +22,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
@@ -46,10 +46,10 @@ public abstract class OM
   public static final OMPreferences PREFS = BUNDLE.preferences();
 
   public static final OMPreference<Integer> PREF_COMMIT_MONITOR_PROGRESS_SECONDS = //
-  PREFS.init("PREF_COMMIT_MONITOR_PROGRESS_SECONDS", CommitTransactionRequest.DEFAULT_MONITOR_PROGRESS_SECONDS); //$NON-NLS-1$
+      PREFS.init("PREF_COMMIT_MONITOR_PROGRESS_SECONDS", CommitTransactionRequest.DEFAULT_MONITOR_PROGRESS_SECONDS); //$NON-NLS-1$
 
   public static final OMPreference<Integer> PREF_COMMIT_MONITOR_TIMEOUT_SECONDS = //
-  PREFS.init("PREF_COMMIT_MONITOR_TIMEOUT_SECONDS", CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS); //$NON-NLS-1$
+      PREFS.init("PREF_COMMIT_MONITOR_TIMEOUT_SECONDS", CommitTransactionRequest.DEFAULT_MONITOR_TIMEOUT_SECONDS); //$NON-NLS-1$
 
   /**
    * @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java
index 3059c4d5a7..acb69ed258 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java
@@ -82,7 +82,7 @@ import java.util.Set;
 /**
  * @author Eike Stepper
  */
-public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionImpl> implements CDOSessionProtocol
+public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionImpl>implements CDOSessionProtocol
 {
   private static final PerfTracer REVISION_LOADING = new PerfTracer(OM.PERF_REVISION_LOADING, CDOClientProtocol.class);
 
@@ -209,7 +209,8 @@ public class CDOClientProtocol extends AuthenticatingSignalProtocol<CDOSessionIm
       Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int initialChunkSize,
       boolean enablePassiveUpdates)
   {
-    return send(new RefreshSessionRequest(this, lastUpdateTime, viewedRevisions, initialChunkSize, enablePassiveUpdates));
+    return send(
+        new RefreshSessionRequest(this, lastUpdateTime, viewedRevisions, initialChunkSize, enablePassiveUpdates));
   }
 
   public void openView(int viewID, boolean readOnly, CDOBranchPoint branchPoint)
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocolFactory.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocolFactory.java
index b8022ea86c..59b16b1a4a 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocolFactory.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocolFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java
index d635fe5054..a9fb671edc 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Simon McDuff - bug 230832
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionCancelRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionCancelRequest.java
index 8141fcae10..25156c0ec2 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionCancelRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionCancelRequest.java
@@ -28,7 +28,7 @@ import java.io.IOException;
  * At this stage, everything on the database was done except to flush on the disk.
  * <p>
  * It is useful to assure that all {@link CDOTransaction} involve in that commit are synchronize.
- * 
+ *
  * @author Simon McDuff
  */
 public class CommitXATransactionCancelRequest extends CommitXATransactionRequest
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase1Request.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase1Request.java
index 4226062af1..c6bb045b77 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase1Request.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase1Request.java
@@ -27,7 +27,7 @@ import java.io.IOException;
  * <p>
  * It needs to fill id mappings for objects immediately to be use by other {@link CDOTransaction} involve in that
  * commit.
- * 
+ *
  * @author Simon McDuff
  */
 public class CommitXATransactionPhase1Request extends CommitXATransactionRequest
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java
index 79403602cf..9d1cb917e8 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java
@@ -81,17 +81,17 @@ public class CommitXATransactionPhase2Request extends CommitXATransactionRequest
       InternalCDOXACommitContext commitContext = context.getTransactionManager().getCommitContext(entry.getValue());
       if (commitContext == null)
       {
-        throw new IllegalStateException(MessageFormat.format(
-            Messages.getString("CommitTransactionPhase2Request.1"), entry //$NON-NLS-1$
-                .getValue()));
+        throw new IllegalStateException(
+            MessageFormat.format(Messages.getString("CommitTransactionPhase2Request.1"), entry //$NON-NLS-1$
+            .getValue()));
       }
 
       CDOID newID = commitContext.getResult().getIDMappings().get(oldCDOID);
       if (newID == null)
       {
-        throw new IllegalStateException(MessageFormat.format(
-            Messages.getString("CommitTransactionPhase2Request.2"), oldCDOID //$NON-NLS-1$
-                .toURIFragment()));
+        throw new IllegalStateException(
+            MessageFormat.format(Messages.getString("CommitTransactionPhase2Request.2"), oldCDOID //$NON-NLS-1$
+            .toURIFragment()));
       }
 
       CDOID newIDExternal = CDOURIUtil.convertExternalCDOID(oldURIExternal, newID);
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase3Request.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase3Request.java
index b35abcb79c..9e2f35a0fc 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase3Request.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase3Request.java
@@ -28,7 +28,7 @@ import java.io.IOException;
  * At this stage, everything on the database was done except to flush on the disk.
  * <p>
  * It is useful to assure that all {@link CDOTransaction} involve in that commit are synchronize.
- * 
+ *
  * @author Simon McDuff
  */
 public class CommitXATransactionPhase3Request extends CommitXATransactionRequest
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/EnableLockNotificationRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/EnableLockNotificationRequest.java
index b97a866cfa..b5b2ff4498 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/EnableLockNotificationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/EnableLockNotificationRequest.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPackagesRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPackagesRequest.java
index a7d1e66c79..ab3c3ee092 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPackagesRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPackagesRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionsRequest.java
index 34d8d584ff..dbc210e212 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionsRequest.java
@@ -117,8 +117,8 @@ public class LoadRevisionsRequest extends CDOClientRequest<List<RevisionInfo>>
       CDOID contextID = ruleManager.getContext();
 
       out.writeInt(fetchSize);
-      out.writeInt(collectionLoadingPolicy != null ? collectionLoadingPolicy.getInitialChunkSize()
-          : CDORevision.UNCHUNKED);
+      out.writeInt(
+          collectionLoadingPolicy != null ? collectionLoadingPolicy.getInitialChunkSize() : CDORevision.UNCHUNKED);
       out.writeCDOID(contextID);
 
       for (CDOFetchRule fetchRule : fetchRules)
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockDelegationRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockDelegationRequest.java
index 591043e727..99f234c319 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockDelegationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockDelegationRequest.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockNotificationIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockNotificationIndication.java
index ef727d6530..6201ef65c0 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockNotificationIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockNotificationIndication.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockStateRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockStateRequest.java
index 307b677baa..dd9c0ec3e2 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockStateRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockStateRequest.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryCancelRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryCancelRequest.java
index 890d7e2f06..914421a6bb 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryCancelRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryCancelRequest.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RepositoryTimeRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RepositoryTimeRequest.java
index 3d0aab1931..273d78666b 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RepositoryTimeRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RepositoryTimeRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/SetLockNotificationModeRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/SetLockNotificationModeRequest.java
index c3451d04d2..660e893d86 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/SetLockNotificationModeRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/SetLockNotificationModeRequest.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockDelegationRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockDelegationRequest.java
index 4f5c8da633..6dcbbc1f62 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockDelegationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockDelegationRequest.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java
index b89b371af3..0de786a256 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
index f01d3512c3..57ee34cac8 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
 
 /**
  * A Net4j-specific CDO {@link CDOSession session}.
- * 
+ *
  * @since 4.1
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
@@ -37,7 +37,7 @@ public interface CDONet4jSession extends org.eclipse.emf.cdo.session.CDOSession
 
   /**
    * Encapsulates a set of notifying {@link CDONet4jSession session} configuration options.
-   * 
+   *
    * @since 4.1
    * @author Eike Stepper
    * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java
index 9c442165a1..4cf0031a72 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java
@@ -20,7 +20,7 @@ import org.eclipse.net4j.util.io.IStreamWrapper;
 
 /**
  * Configures and opens new Net4j-specific CDO {@link CDOSession sessions}.
- * 
+ *
  * @since 4.1
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
@@ -59,7 +59,7 @@ public interface CDONet4jSessionConfiguration extends org.eclipse.emf.cdo.sessio
 
   /**
    * A special package registry can be set <b>before</b> the session is opened and can not be changed thereafter.
-   * 
+   *
    * @see CDONet4jSession#getPackageRegistry()
    */
   public void setPackageRegistry(CDOPackageRegistry packageRegistry);
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
index 499771eaea..b417d47eeb 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
@@ -161,8 +161,8 @@ public final class CDONet4jUtil
    */
   public static CDONet4jSession getNet4jSession(IManagedContainer container, String description)
   {
-    return (CDONet4jSession)container
-        .getElement(CDOSessionFactory.PRODUCT_GROUP, Net4jSessionFactory.TYPE, description);
+    return (CDONet4jSession)container.getElement(CDOSessionFactory.PRODUCT_GROUP, Net4jSessionFactory.TYPE,
+        description);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
index 36164a62ee..c1757a08c0 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
@@ -186,8 +186,8 @@ public abstract class CDONet4jViewProvider extends AbstractCDOViewProvider
 
       try
       {
-        credentialsProvider = (IPasswordCredentialsProvider)getContainer().getElement(
-            "org.eclipse.net4j.util.credentialsProviders", "password", resource);
+        credentialsProvider = (IPasswordCredentialsProvider)getContainer()
+            .getElement("org.eclipse.net4j.util.credentialsProviders", "password", resource);
       }
       catch (FactoryNotFoundException ex)
       {
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java
index 5ae9fdfeb9..a02f877f3c 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
 
 /**
  * Deprecated, use {@link org.eclipse.emf.cdo.net4j.CDONet4jSession CDONet4jSession}.
- * 
+ *
  * @since 2.0
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
@@ -28,7 +28,7 @@ public interface CDOSession extends CDONet4jSession
 {
   /**
    * Returns the {@link Options options} of this session.
-   * 
+   *
    * @deprecated Use {@link org.eclipse.emf.cdo.net4j.CDONet4jSession#options() CDONet4jSession.options()}.
    */
   @Deprecated
@@ -36,7 +36,7 @@ public interface CDOSession extends CDONet4jSession
 
   /**
    * Deprecated, use {@link org.eclipse.emf.cdo.net4j.CDONet4jSession.Options CDONet4jSession.Options}.
-   * 
+   *
    * @author Eike Stepper
    * @noextend This interface is not intended to be extended by clients.
    * @noimplement This interface is not intended to be implemented by clients.
@@ -48,7 +48,7 @@ public interface CDOSession extends CDONet4jSession
     /**
      * Returns the Net4j {@link CDOSessionProtocol protocol} instance that represents the underlying
      * <em>signalling connection</em> to the repository of this session.
-     * 
+     *
      * @see #getNet4jProtocol()
      * @deprecated Kept for 4.0 compatibility. Newer code should call {@link #getNet4jProtocol()}.
      */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
index 2aa1abb53f..5ffe23381a 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.net4j;
 
 /**
  * Deprecated, use {@link org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration CDONet4jSessionConfiguration}.
- * 
+ *
  * @since 3.0
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java
index 624f987da3..8fdf0d5af0 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.session.CDOSessionEvent;
 /**
  * A {@link CDOSessionEvent session event} fired from {@link RecoveringCDOSessionConfiguration recovering session} when
  * recovery has started or finished.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
@@ -28,7 +28,7 @@ public interface CDOSessionRecoveryEvent extends CDOSessionEvent
 
   /**
    * Enumerates the possible types of {@link CDOSessionRecoveryEvent session recovery events}.
-   * 
+   *
    * @author Eike Stepper
    * @noextend This interface is not intended to be extended by clients.
    */
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java
index 13074bfb4a..b05286352d 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.net4j;
 /**
  * A {@link RecoveringCDOSessionConfiguration session configuration} that recovers from network problems by failing over
  * to backup repositories as directed by a fail-over monitor.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java
index 2efc9c8b23..5f4d6f8eae 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.net4j;
 /**
  * A {@link RecoveringCDOSessionConfiguration session configuration} that recovers from network problems by attempting
  * to reconnect to the same repository in specific intervals.
- * 
+ *
  * @author Caspar De Groot
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java
index 4fb64633d7..1a548d8040 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.signal.heartbeat.HeartBeatProtocol;
 /**
  * A {@link CDONet4jSessionConfiguration session configuration} that uses a {@link HeartBeatProtocol heart beat
  * protocol} to detect network problems. Subtypes specify the exact behaviour to recover from these problems.
- * 
+ *
  * @author Caspar De Groot
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java
index e6b782912d..d9625b2c6e 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java
@@ -1,19 +1,14 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Client concepts for dealing with Net4j-based sessions to remote repositories.
- * 
+ *
  * @apiviz.exclude .*Event
  * @apiviz.exclude .*Event\.Type
  */
 package org.eclipse.emf.cdo.net4j;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.apireports/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.apireports/META-INF/MANIFEST.MF
index 3067b7ee6b..e305c541b8 100644
--- a/plugins/org.eclipse.emf.cdo.releng.apireports/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.apireports/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.releng.apireports;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,4 +13,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.buckminster.core;bundle-version="[1.0.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.releng.apireports;version="1.0.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng.apireports;version="1.0.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng.apireports/src/org/eclipse/emf/cdo/releng/apireports/ApiReportsActor.java b/plugins/org.eclipse.emf.cdo.releng.apireports/src/org/eclipse/emf/cdo/releng/apireports/ApiReportsActor.java
index 432d9a6adf..3969c9abe5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.apireports/src/org/eclipse/emf/cdo/releng/apireports/ApiReportsActor.java
+++ b/plugins/org.eclipse.emf.cdo.releng.apireports/src/org/eclipse/emf/cdo/releng/apireports/ApiReportsActor.java
@@ -335,8 +335,8 @@ public class ApiReportsActor extends AbstractActor
   {
     // add package fragment elements only if this is an API package
     IApiDescription apiDescription = apiComponent.getApiDescription();
-    IApiAnnotations annotations = apiDescription.resolveAnnotations(Factory.packageDescriptor(packageFragment
-        .getElementName()));
+    IApiAnnotations annotations = apiDescription
+        .resolveAnnotations(Factory.packageDescriptor(packageFragment.getElementName()));
     if (annotations == null || !VisibilityModifiers.isAPI(annotations.getVisibility()))
     {
       return;
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java
index 9444e710d3..80a5511b2d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -30,8 +30,10 @@ public class TestCDODocumentation
     // add("-subpackages");
     // add(subpackages.toString());
 
-    // add("-sourcepath /develop/ws/cdo/plugins/org.eclipse.net4j.util.doc/src;/develop/ws/cdo/plugins/org.eclipse.net4j.db.doc/src;/develop/ws/cdo/plugins/org.eclipse.net4j.doc/src;/develop/ws/cdo/plugins/org.eclipse.emf.cdo.doc/src");
-    // add("-subpackages org.eclipse.net4j.util.doc:org.eclipse.emf.cdo.doc.programmers.connectors:org.eclipse.emf.cdo.doc.programmers.sessions:org.eclipse.emf.cdo.doc.reference:org.eclipse.emf.cdo.doc.reference.api:org.eclipse.emf.cdo.doc.online:org.eclipse.emf.cdo.doc:org.eclipse.emf.cdo.doc.programmers");
+    // add("-sourcepath
+    // /develop/ws/cdo/plugins/org.eclipse.net4j.util.doc/src;/develop/ws/cdo/plugins/org.eclipse.net4j.db.doc/src;/develop/ws/cdo/plugins/org.eclipse.net4j.doc/src;/develop/ws/cdo/plugins/org.eclipse.emf.cdo.doc/src");
+    // add("-subpackages
+    // org.eclipse.net4j.util.doc:org.eclipse.emf.cdo.doc.programmers.connectors:org.eclipse.emf.cdo.doc.programmers.sessions:org.eclipse.emf.cdo.doc.reference:org.eclipse.emf.cdo.doc.reference.api:org.eclipse.emf.cdo.doc.online:org.eclipse.emf.cdo.doc:org.eclipse.emf.cdo.doc.programmers");
 
     add("-doclet org.eclipse.emf.cdo.releng.doc.article.impl.ArticleDoclet");
     add("-docletpath /develop/ws/cdo/plugins/org.eclipse.emf.cdo.releng.doc/bin;/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental/bin;/develop/ws/cdo/_target/plugins/org.eclipse.emf.ecore_2.7.0.v20110605-0747.jar;/develop/ws/cdo/_target/plugins/org.eclipse.emf.common_2.7.0.v20110605-0747.jar");
@@ -49,8 +51,8 @@ public class TestCDODocumentation
     addJavaFiles("org.eclipse.emf.cdo.doc");
 
     String[] array = arguments.toArray(new String[arguments.size()]);
-    com.sun.tools.javadoc.Main
-        .execute(TestCDODocumentation.class.getSimpleName(), ArticleDoclet.class.getName(), array);
+    com.sun.tools.javadoc.Main.execute(TestCDODocumentation.class.getSimpleName(), ArticleDoclet.class.getName(),
+        array);
   }
 
   private static List<String> arguments = new ArrayList<String>();
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Article.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Article.java
index 408a9fcc83..99b37f567f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Article.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Article.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Article</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getArticle()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java
index c47eb3f7ed..2f8e147a80 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage
  * @generated
  */
@@ -23,14 +23,14 @@ public interface ArticleFactory extends EFactory
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   ArticleFactory eINSTANCE = org.eclipse.emf.cdo.releng.doc.article.impl.ArticleFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Documentation</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Documentation</em>'.
    * @generated
    */
@@ -38,7 +38,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Context</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Context</em>'.
    * @generated
    */
@@ -46,7 +46,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Category</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Category</em>'.
    * @generated
    */
@@ -54,7 +54,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Article</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Article</em>'.
    * @generated
    */
@@ -62,7 +62,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Chapter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Chapter</em>'.
    * @generated
    */
@@ -70,7 +70,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Snippet</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Snippet</em>'.
    * @generated
    */
@@ -78,7 +78,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Diagram</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Diagram</em>'.
    * @generated
    */
@@ -86,7 +86,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Factory</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Factory</em>'.
    * @generated
    */
@@ -94,7 +94,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Java Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Java Element</em>'.
    * @generated
    */
@@ -102,7 +102,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Callout</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Callout</em>'.
    * @generated
    */
@@ -110,7 +110,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>External Target</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>External Target</em>'.
    * @generated
    */
@@ -118,7 +118,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Text</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Text</em>'.
    * @generated
    */
@@ -126,7 +126,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Link</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Link</em>'.
    * @generated
    */
@@ -134,7 +134,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Embedding</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Embedding</em>'.
    * @generated
    */
@@ -142,7 +142,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Source Code</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Source Code</em>'.
    * @generated
    */
@@ -150,7 +150,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Plugin</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Plugin</em>'.
    * @generated
    */
@@ -158,7 +158,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Java Package</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Java Package</em>'.
    * @generated
    */
@@ -166,7 +166,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Javadoc</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Javadoc</em>'.
    * @generated
    */
@@ -174,7 +174,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>External Article</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>External Article</em>'.
    * @generated
    */
@@ -182,7 +182,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Schemadoc</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Schemadoc</em>'.
    * @generated
    */
@@ -190,7 +190,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Extension Point</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Extension Point</em>'.
    * @generated
    */
@@ -198,7 +198,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Toc</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Toc</em>'.
    * @generated
    */
@@ -206,7 +206,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Plugin Resource</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Plugin Resource</em>'.
    * @generated
    */
@@ -214,7 +214,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Excel</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Excel</em>'.
    * @generated
    */
@@ -222,7 +222,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Java Formatter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Java Formatter</em>'.
    * @generated
    */
@@ -230,7 +230,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Xml Formatter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Xml Formatter</em>'.
    * @generated
    */
@@ -238,7 +238,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Image</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Image</em>'.
    * @generated
    */
@@ -246,7 +246,7 @@ public interface ArticleFactory extends EFactory
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
index 86cb04f762..7409a353c3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticleFactory
  * @model kind="package"
  * @generated
@@ -34,28 +34,28 @@ public interface ArticlePackage extends EPackage
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNAME = "article";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/ARTICLE/1.0";
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_PREFIX = "article";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   ArticlePackage eINSTANCE = org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl.init();
@@ -63,7 +63,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.Identifiable <em>Identifiable</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.Identifiable
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getIdentifiable()
    * @generated
@@ -72,7 +72,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -81,7 +81,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Identifiable</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -90,7 +90,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.LinkTargetImpl <em>Link Target</em>}
    * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.LinkTargetImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getLinkTarget()
    * @generated
@@ -99,7 +99,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -107,7 +107,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -115,7 +115,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -124,7 +124,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Link Target</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -133,7 +133,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.StructuralElementImpl
    * <em>Structural Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.StructuralElementImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getStructuralElement()
    * @generated
@@ -142,7 +142,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -150,7 +150,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -158,7 +158,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -167,7 +167,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -175,7 +175,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -183,7 +183,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -191,7 +191,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -199,7 +199,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -208,7 +208,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Structural Element</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -217,7 +217,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.DocumentationImpl
    * <em>Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.DocumentationImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDocumentation()
    * @generated
@@ -226,7 +226,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -234,7 +234,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -242,7 +242,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -251,7 +251,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -259,7 +259,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -267,7 +267,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -275,7 +275,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -283,7 +283,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -291,7 +291,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Context</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -300,7 +300,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Embeddable Elements</b></em>' containment reference list. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -308,7 +308,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Dependencies</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -316,7 +316,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Project</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -325,7 +325,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Plugins</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -334,7 +334,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Documentation</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -343,7 +343,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ContextImpl <em>Context</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ContextImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getContext()
    * @generated
@@ -352,7 +352,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Base Folder</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -360,7 +360,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Project</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -369,7 +369,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Documentations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -377,7 +377,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Root</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -385,7 +385,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Context</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -394,7 +394,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyImpl <em>Body</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.BodyImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getBody()
    * @generated
@@ -403,7 +403,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -411,7 +411,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -419,7 +419,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -428,7 +428,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -436,7 +436,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -444,7 +444,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -452,7 +452,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -460,7 +460,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -469,7 +469,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -477,7 +477,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -485,7 +485,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Body</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -494,7 +494,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.CategoryImpl <em>Category</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.CategoryImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getCategory()
    * @generated
@@ -503,7 +503,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -511,7 +511,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -519,7 +519,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -528,7 +528,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -536,7 +536,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -544,7 +544,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -552,7 +552,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -560,7 +560,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -569,7 +569,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -577,7 +577,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -585,7 +585,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Category</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -594,7 +594,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ChapterImpl <em>Chapter</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ChapterImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getChapter()
    * @generated
@@ -603,7 +603,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -611,7 +611,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -619,7 +619,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -628,7 +628,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -636,7 +636,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -644,7 +644,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -652,7 +652,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -660,7 +660,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -669,7 +669,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -677,7 +677,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -685,7 +685,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Article</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -693,7 +693,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Chapter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -702,7 +702,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ArticleImpl <em>Article</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticleImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getArticle()
    * @generated
@@ -711,7 +711,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -719,7 +719,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -727,7 +727,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -736,7 +736,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -744,7 +744,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -752,7 +752,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -760,7 +760,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -768,7 +768,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -777,7 +777,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -785,7 +785,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -793,7 +793,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Article</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -801,7 +801,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Article</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -810,7 +810,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.EmbeddableElementImpl
    * <em>Embeddable Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.EmbeddableElementImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getEmbeddableElement()
    * @generated
@@ -819,7 +819,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -828,7 +828,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Documentation</b></em>' container reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -836,7 +836,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -845,7 +845,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Embeddable Element</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -854,7 +854,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.SnippetImpl <em>Snippet</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.SnippetImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getSnippet()
    * @generated
@@ -863,7 +863,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -872,7 +872,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Documentation</b></em>' container reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -880,7 +880,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -889,7 +889,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Callouts</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -898,7 +898,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Formatter</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -906,7 +906,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Snippet</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -915,7 +915,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementImpl
    * <em>Body Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getBodyElement()
    * @generated
@@ -925,7 +925,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Container</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -933,7 +933,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tag</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -942,7 +942,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Body Element</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -951,7 +951,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.DiagramImpl <em>Diagram</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.DiagramImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDiagram()
    * @generated
@@ -961,7 +961,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Container</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -969,7 +969,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tag</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -977,7 +977,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Diagram</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -986,7 +986,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.FactoryImpl <em>Factory</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.FactoryImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFactory()
    * @generated
@@ -995,7 +995,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1004,7 +1004,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Documentation</b></em>' container reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1012,7 +1012,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1020,7 +1020,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Factory</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1029,7 +1029,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaElementImpl
    * <em>Java Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavaElementImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavaElement()
    * @generated
@@ -1038,7 +1038,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1046,7 +1046,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1054,7 +1054,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1062,7 +1062,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Class File</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1071,7 +1071,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Java Element</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1080,7 +1080,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementContainerImpl
    * <em>Body Element Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementContainerImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getBodyElementContainer()
    * @generated
@@ -1090,7 +1090,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1099,7 +1099,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Body Element Container</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1108,7 +1108,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.CalloutImpl <em>Callout</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.CalloutImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getCallout()
    * @generated
@@ -1118,7 +1118,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1126,7 +1126,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Snippet</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1134,7 +1134,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Callout</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1143,7 +1143,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExternalTargetImpl
    * <em>External Target</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ExternalTargetImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getExternalTarget()
    * @generated
@@ -1152,7 +1152,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1160,7 +1160,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1168,7 +1168,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1176,7 +1176,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1185,7 +1185,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>External Target</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1194,7 +1194,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.TextImpl <em>Text</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.TextImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getText()
    * @generated
@@ -1204,7 +1204,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Container</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1212,7 +1212,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tag</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1220,7 +1220,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Text</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1229,7 +1229,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.LinkImpl <em>Link</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.LinkImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getLink()
    * @generated
@@ -1239,7 +1239,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Container</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1247,7 +1247,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tag</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1255,7 +1255,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1263,7 +1263,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Link</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1272,7 +1272,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.EmbeddingImpl <em>Embedding</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.EmbeddingImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getEmbedding()
    * @generated
@@ -1282,7 +1282,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Container</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1290,7 +1290,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tag</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1298,7 +1298,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Element</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1306,7 +1306,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Embedding</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1315,7 +1315,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.SourceCodeImpl <em>Source Code</em>}
    * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.SourceCodeImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getSourceCode()
    * @generated
@@ -1324,7 +1324,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1332,7 +1332,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1340,7 +1340,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1348,7 +1348,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1357,7 +1357,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Source Code</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1366,7 +1366,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.PluginImpl <em>Plugin</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.PluginImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getPlugin()
    * @generated
@@ -1375,7 +1375,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1384,7 +1384,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1392,7 +1392,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1401,7 +1401,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Extension Points</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1409,7 +1409,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Plugin</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1418,7 +1418,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaPackageImpl
    * <em>Java Package</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavaPackageImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavaPackage()
    * @generated
@@ -1427,7 +1427,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1435,7 +1435,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Plugin</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1444,7 +1444,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Java Package</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1453,7 +1453,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocImpl <em>Javadoc</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavadocImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavadoc()
    * @generated
@@ -1462,7 +1462,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1470,7 +1470,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1478,7 +1478,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1487,7 +1487,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1495,7 +1495,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1503,7 +1503,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1511,7 +1511,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1519,7 +1519,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1528,7 +1528,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1536,7 +1536,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1544,7 +1544,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Javadoc</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1553,7 +1553,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExternalArticleImpl
    * <em>External Article</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ExternalArticleImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getExternalArticle()
    * @generated
@@ -1562,7 +1562,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1570,7 +1570,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1578,7 +1578,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1587,7 +1587,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1595,7 +1595,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1603,7 +1603,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1611,7 +1611,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1619,7 +1619,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1628,7 +1628,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1636,7 +1636,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1644,7 +1644,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Article</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1652,7 +1652,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1661,7 +1661,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>External Article</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1670,7 +1670,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.SchemadocImpl <em>Schemadoc</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.SchemadocImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getSchemadoc()
    * @generated
@@ -1679,7 +1679,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1687,7 +1687,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1695,7 +1695,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1704,7 +1704,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1712,7 +1712,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1720,7 +1720,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1728,7 +1728,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1736,7 +1736,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1745,7 +1745,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1753,7 +1753,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1761,7 +1761,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Schemadoc</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1770,7 +1770,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExtensionPointImpl
    * <em>Extension Point</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ExtensionPointImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getExtensionPoint()
    * @generated
@@ -1779,7 +1779,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1787,7 +1787,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Plugin</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1796,7 +1796,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Extension Point</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1805,7 +1805,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.TocImpl <em>Toc</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.TocImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getToc()
    * @generated
@@ -1815,7 +1815,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Container</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1823,7 +1823,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tag</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1831,7 +1831,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Levels</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1839,7 +1839,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Toc</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1848,7 +1848,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.PluginResourceImpl
    * <em>Plugin Resource</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.PluginResourceImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getPluginResource()
    * @generated
@@ -1857,7 +1857,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1865,7 +1865,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1873,7 +1873,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1882,7 +1882,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1890,7 +1890,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1898,7 +1898,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1906,7 +1906,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1914,7 +1914,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1923,7 +1923,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1931,7 +1931,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1939,7 +1939,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Article</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1947,7 +1947,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1956,7 +1956,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Plugin Resource</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1965,7 +1965,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExcelImpl <em>Excel</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ExcelImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getExcel()
    * @generated
@@ -1975,7 +1975,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Container</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1983,7 +1983,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tag</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1991,7 +1991,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Excel</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2000,7 +2000,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl <em>Formatter</em>}'
    * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFormatter()
    * @generated
@@ -2009,7 +2009,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Snippet</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2017,7 +2017,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Formatter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2026,7 +2026,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaFormatterImpl
    * <em>Java Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavaFormatterImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavaFormatter()
    * @generated
@@ -2035,7 +2035,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Snippet</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2044,7 +2044,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Java Formatter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2053,7 +2053,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.XmlFormatterImpl
    * <em>Xml Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.XmlFormatterImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getXmlFormatter()
    * @generated
@@ -2062,7 +2062,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Snippet</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2070,7 +2070,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>File</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2079,7 +2079,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The number of structural features of the '<em>Xml Formatter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2088,7 +2088,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ImageImpl <em>Image</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ImageImpl
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getImage()
    * @generated
@@ -2098,7 +2098,7 @@ public interface ArticlePackage extends EPackage
   /**
    * The feature id for the '<em><b>Container</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2106,7 +2106,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Tag</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2114,7 +2114,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>File</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2122,7 +2122,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Image</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -2130,7 +2130,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The meta object id for the '<em>Root Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see com.sun.javadoc.RootDoc
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getRootDoc()
    * @generated
@@ -2139,7 +2139,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The meta object id for the '<em>File</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see java.io.File
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFile()
    * @generated
@@ -2148,7 +2148,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The meta object id for the '<em>Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see com.sun.javadoc.Doc
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDoc()
    * @generated
@@ -2157,7 +2157,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * The meta object id for the '<em>Tag</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see com.sun.javadoc.Tag
    * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getTag()
    * @generated
@@ -2167,7 +2167,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Documentation
    * <em>Documentation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Documentation</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Documentation
    * @generated
@@ -2178,7 +2178,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Documentation#getContext <em>Context</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Context</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Documentation#getContext()
    * @see #getDocumentation()
@@ -2190,7 +2190,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Documentation#getEmbeddableElements <em>Embeddable Elements</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Embeddable Elements</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Documentation#getEmbeddableElements()
    * @see #getDocumentation()
@@ -2202,7 +2202,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Documentation#getDependencies <em>Dependencies</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Dependencies</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Documentation#getDependencies()
    * @see #getDocumentation()
@@ -2213,7 +2213,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Documentation#getProject
    * <em>Project</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Project</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Documentation#getProject()
    * @see #getDocumentation()
@@ -2225,7 +2225,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Documentation#getPlugins <em>Plugins</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Plugins</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Documentation#getPlugins()
    * @see #getDocumentation()
@@ -2236,7 +2236,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Context <em>Context</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Context</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Context
    * @generated
@@ -2246,7 +2246,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Context#getBaseFolder
    * <em>Base Folder</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Base Folder</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Context#getBaseFolder()
    * @see #getContext()
@@ -2257,7 +2257,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Context#getProject
    * <em>Project</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Project</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Context#getProject()
    * @see #getContext()
@@ -2269,7 +2269,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Context#getDocumentations <em>Documentations</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Documentations</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Context#getDocumentations()
    * @see #getContext()
@@ -2280,7 +2280,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Context#getRoot
    * <em>Root</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Root</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Context#getRoot()
    * @see #getContext()
@@ -2291,7 +2291,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Category <em>Category</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Category</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Category
    * @generated
@@ -2301,7 +2301,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Article <em>Article</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Article</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Article
    * @generated
@@ -2311,7 +2311,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Chapter <em>Chapter</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Chapter</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Chapter
    * @generated
@@ -2321,7 +2321,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.releng.doc.article.Chapter#getArticle
    * <em>Article</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Article</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Chapter#getArticle()
    * @see #getChapter()
@@ -2332,7 +2332,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Snippet <em>Snippet</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Snippet</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Snippet
    * @generated
@@ -2343,7 +2343,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Snippet#getCallouts <em>Callouts</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Callouts</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Snippet#getCallouts()
    * @see #getSnippet()
@@ -2355,7 +2355,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the containment reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter <em>Formatter</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference '<em>Formatter</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter()
    * @see #getSnippet()
@@ -2366,7 +2366,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Diagram <em>Diagram</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Diagram</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Diagram
    * @generated
@@ -2376,7 +2376,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Factory <em>Factory</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Factory</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Factory
    * @generated
@@ -2386,7 +2386,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.JavaElement <em>Java Element</em>}
    * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Java Element</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaElement
    * @generated
@@ -2396,7 +2396,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.JavaElement#getClassFile
    * <em>Class File</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Class File</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaElement#getClassFile()
    * @see #getJavaElement()
@@ -2407,7 +2407,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.StructuralElement
    * <em>Structural Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Structural Element</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.StructuralElement
    * @generated
@@ -2418,7 +2418,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getChildren <em>Children</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Children</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getChildren()
    * @see #getStructuralElement()
@@ -2430,7 +2430,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getParent <em>Parent</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getParent()
    * @see #getStructuralElement()
@@ -2442,7 +2442,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getTitle <em>Title</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Title</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getTitle()
    * @see #getStructuralElement()
@@ -2454,7 +2454,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getDocumentation <em>Documentation</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Documentation</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getDocumentation()
    * @see #getStructuralElement()
@@ -2465,7 +2465,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getDoc
    * <em>Doc</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Doc</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getDoc()
    * @see #getStructuralElement()
@@ -2476,7 +2476,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.LinkTarget <em>Link Target</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Link Target</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.LinkTarget
    * @generated
@@ -2487,7 +2487,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.releng.doc.article.LinkTarget#getDefaultLabel <em>Default Label</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Default Label</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.LinkTarget#getDefaultLabel()
    * @see #getLinkTarget()
@@ -2498,7 +2498,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.LinkTarget#getTooltip
    * <em>Tooltip</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Tooltip</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.LinkTarget#getTooltip()
    * @see #getLinkTarget()
@@ -2509,7 +2509,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Callout <em>Callout</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Callout</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Callout
    * @generated
@@ -2520,7 +2520,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Callout#getSnippet <em>Snippet</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Snippet</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Callout#getSnippet()
    * @see #getCallout()
@@ -2531,7 +2531,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement
    * <em>Embeddable Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Embeddable Element</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement
    * @generated
@@ -2542,7 +2542,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement#getDocumentation <em>Documentation</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Documentation</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement#getDocumentation()
    * @see #getEmbeddableElement()
@@ -2553,7 +2553,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement#getDoc
    * <em>Doc</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Doc</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement#getDoc()
    * @see #getEmbeddableElement()
@@ -2564,7 +2564,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.ExternalTarget
    * <em>External Target</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>External Target</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExternalTarget
    * @generated
@@ -2574,7 +2574,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.ExternalTarget#getUrl
    * <em>Url</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Url</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExternalTarget#getUrl()
    * @see #getExternalTarget()
@@ -2585,7 +2585,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Identifiable
    * <em>Identifiable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Identifiable</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Identifiable
    * @generated
@@ -2595,7 +2595,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Identifiable#getId
    * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Id</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Identifiable#getId()
    * @see #getIdentifiable()
@@ -2606,7 +2606,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Body <em>Body</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Body</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Body
    * @generated
@@ -2616,7 +2616,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.releng.doc.article.Body#getCategory
    * <em>Category</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Category</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Body#getCategory()
    * @see #getBody()
@@ -2627,7 +2627,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer
    * <em>Body Element Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Body Element Container</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer
    * @generated
@@ -2638,7 +2638,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer#getElements()
    * @see #getBodyElementContainer()
@@ -2649,7 +2649,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.BodyElement <em>Body Element</em>}
    * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Body Element</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.BodyElement
    * @generated
@@ -2660,7 +2660,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.BodyElement#getContainer <em>Container</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Container</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.BodyElement#getContainer()
    * @see #getBodyElement()
@@ -2671,7 +2671,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.BodyElement#getTag
    * <em>Tag</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Tag</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.BodyElement#getTag()
    * @see #getBodyElement()
@@ -2682,7 +2682,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Text <em>Text</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Text</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Text
    * @generated
@@ -2692,7 +2692,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Link <em>Link</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Link</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Link
    * @generated
@@ -2702,7 +2702,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.releng.doc.article.Link#getTarget
    * <em>Target</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Target</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Link#getTarget()
    * @see #getLink()
@@ -2713,7 +2713,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Embedding <em>Embedding</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Embedding</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Embedding
    * @generated
@@ -2723,7 +2723,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.releng.doc.article.Embedding#getElement
    * <em>Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Embedding#getElement()
    * @see #getEmbedding()
@@ -2734,7 +2734,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.SourceCode <em>Source Code</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Source Code</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.SourceCode
    * @generated
@@ -2744,7 +2744,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Plugin <em>Plugin</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Plugin</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Plugin
    * @generated
@@ -2754,7 +2754,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Plugin#getName
    * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Plugin#getName()
    * @see #getPlugin()
@@ -2766,7 +2766,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Plugin#getPackages <em>Packages</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Packages</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Plugin#getPackages()
    * @see #getPlugin()
@@ -2777,7 +2777,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Plugin#getLabel
    * <em>Label</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Label</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Plugin#getLabel()
    * @see #getPlugin()
@@ -2789,7 +2789,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Plugin#getExtensionPoints <em>Extension Points</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Extension Points</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Plugin#getExtensionPoints()
    * @see #getPlugin()
@@ -2800,7 +2800,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.JavaPackage <em>Java Package</em>}
    * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Java Package</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaPackage
    * @generated
@@ -2810,7 +2810,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.JavaPackage#getName
    * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaPackage#getName()
    * @see #getJavaPackage()
@@ -2822,7 +2822,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.JavaPackage#getPlugin <em>Plugin</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Plugin</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaPackage#getPlugin()
    * @see #getJavaPackage()
@@ -2833,7 +2833,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Javadoc <em>Javadoc</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Javadoc</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Javadoc
    * @generated
@@ -2843,7 +2843,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.ExternalArticle
    * <em>External Article</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>External Article</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExternalArticle
    * @generated
@@ -2853,7 +2853,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.ExternalArticle#getUrl
    * <em>Url</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Url</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExternalArticle#getUrl()
    * @see #getExternalArticle()
@@ -2864,7 +2864,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Schemadoc <em>Schemadoc</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Schemadoc</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Schemadoc
    * @generated
@@ -2874,7 +2874,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint
    * <em>Extension Point</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Extension Point</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint
    * @generated
@@ -2884,7 +2884,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint#getName
    * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint#getName()
    * @see #getExtensionPoint()
@@ -2896,7 +2896,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint#getPlugin <em>Plugin</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Plugin</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint#getPlugin()
    * @see #getExtensionPoint()
@@ -2907,7 +2907,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Toc <em>Toc</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Toc</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Toc
    * @generated
@@ -2917,7 +2917,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Toc#getLevels
    * <em>Levels</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Levels</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Toc#getLevels()
    * @see #getToc()
@@ -2928,7 +2928,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.PluginResource
    * <em>Plugin Resource</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Plugin Resource</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.PluginResource
    * @generated
@@ -2938,7 +2938,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Excel <em>Excel</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Excel</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Excel
    * @generated
@@ -2948,7 +2948,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Formatter <em>Formatter</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Formatter</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Formatter
    * @generated
@@ -2959,7 +2959,7 @@ public interface ArticlePackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet <em>Snippet</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Snippet</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet()
    * @see #getFormatter()
@@ -2970,7 +2970,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.JavaFormatter
    * <em>Java Formatter</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Java Formatter</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaFormatter
    * @generated
@@ -2980,7 +2980,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter
    * <em>Xml Formatter</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Xml Formatter</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.XmlFormatter
    * @generated
@@ -2990,7 +2990,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter#getFile
    * <em>File</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>File</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.XmlFormatter#getFile()
    * @see #getXmlFormatter()
@@ -3001,7 +3001,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Image <em>Image</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Image</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Image
    * @generated
@@ -3011,7 +3011,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Image#getFile
    * <em>File</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>File</em>'.
    * @see org.eclipse.emf.cdo.releng.doc.article.Image#getFile()
    * @see #getImage()
@@ -3022,7 +3022,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for data type '{@link com.sun.javadoc.RootDoc <em>Root Doc</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for data type '<em>Root Doc</em>'.
    * @see com.sun.javadoc.RootDoc
    * @model instanceClass="com.sun.javadoc.RootDoc" serializeable="false"
@@ -3033,7 +3033,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for data type '{@link java.io.File <em>File</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for data type '<em>File</em>'.
    * @see java.io.File
    * @model instanceClass="java.io.File"
@@ -3044,7 +3044,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for data type '{@link com.sun.javadoc.Doc <em>Doc</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for data type '<em>Doc</em>'.
    * @see com.sun.javadoc.Doc
    * @model instanceClass="com.sun.javadoc.Doc" serializeable="false"
@@ -3055,7 +3055,7 @@ public interface ArticlePackage extends EPackage
   /**
    * Returns the meta object for data type '{@link com.sun.javadoc.Tag <em>Tag</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for data type '<em>Tag</em>'.
    * @see com.sun.javadoc.Tag
    * @model instanceClass="com.sun.javadoc.Tag" serializeable="false"
@@ -3065,7 +3065,7 @@ public interface ArticlePackage extends EPackage
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -3080,7 +3080,7 @@ public interface ArticlePackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   interface Literals
@@ -3088,7 +3088,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.DocumentationImpl
      * <em>Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.DocumentationImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDocumentation()
      * @generated
@@ -3098,7 +3098,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Context</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DOCUMENTATION__CONTEXT = eINSTANCE.getDocumentation_Context();
@@ -3106,7 +3106,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Embeddable Elements</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DOCUMENTATION__EMBEDDABLE_ELEMENTS = eINSTANCE.getDocumentation_EmbeddableElements();
@@ -3114,7 +3114,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Dependencies</b></em>' reference list feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DOCUMENTATION__DEPENDENCIES = eINSTANCE.getDocumentation_Dependencies();
@@ -3122,7 +3122,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Project</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute DOCUMENTATION__PROJECT = eINSTANCE.getDocumentation_Project();
@@ -3130,7 +3130,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Plugins</b></em>' containment reference list feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DOCUMENTATION__PLUGINS = eINSTANCE.getDocumentation_Plugins();
@@ -3138,7 +3138,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ContextImpl <em>Context</em>}
      * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ContextImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getContext()
      * @generated
@@ -3148,7 +3148,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Base Folder</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute CONTEXT__BASE_FOLDER = eINSTANCE.getContext_BaseFolder();
@@ -3156,7 +3156,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Project</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute CONTEXT__PROJECT = eINSTANCE.getContext_Project();
@@ -3164,7 +3164,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Documentations</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CONTEXT__DOCUMENTATIONS = eINSTANCE.getContext_Documentations();
@@ -3172,7 +3172,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Root</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute CONTEXT__ROOT = eINSTANCE.getContext_Root();
@@ -3180,7 +3180,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.CategoryImpl
      * <em>Category</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.CategoryImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getCategory()
      * @generated
@@ -3190,7 +3190,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ArticleImpl <em>Article</em>}
      * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticleImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getArticle()
      * @generated
@@ -3200,7 +3200,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ChapterImpl <em>Chapter</em>}
      * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ChapterImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getChapter()
      * @generated
@@ -3210,7 +3210,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Article</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CHAPTER__ARTICLE = eINSTANCE.getChapter_Article();
@@ -3218,7 +3218,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.SnippetImpl <em>Snippet</em>}
      * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.SnippetImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getSnippet()
      * @generated
@@ -3228,7 +3228,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Callouts</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference SNIPPET__CALLOUTS = eINSTANCE.getSnippet_Callouts();
@@ -3236,7 +3236,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Formatter</b></em>' containment reference feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference SNIPPET__FORMATTER = eINSTANCE.getSnippet_Formatter();
@@ -3244,7 +3244,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.DiagramImpl <em>Diagram</em>}
      * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.DiagramImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDiagram()
      * @generated
@@ -3254,7 +3254,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.FactoryImpl <em>Factory</em>}
      * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.FactoryImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFactory()
      * @generated
@@ -3264,7 +3264,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaElementImpl
      * <em>Java Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavaElementImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavaElement()
      * @generated
@@ -3274,7 +3274,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Class File</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute JAVA_ELEMENT__CLASS_FILE = eINSTANCE.getJavaElement_ClassFile();
@@ -3282,7 +3282,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.StructuralElementImpl
      * <em>Structural Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.StructuralElementImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getStructuralElement()
      * @generated
@@ -3292,7 +3292,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference STRUCTURAL_ELEMENT__CHILDREN = eINSTANCE.getStructuralElement_Children();
@@ -3300,7 +3300,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference STRUCTURAL_ELEMENT__PARENT = eINSTANCE.getStructuralElement_Parent();
@@ -3308,7 +3308,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Title</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STRUCTURAL_ELEMENT__TITLE = eINSTANCE.getStructuralElement_Title();
@@ -3316,7 +3316,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Documentation</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference STRUCTURAL_ELEMENT__DOCUMENTATION = eINSTANCE.getStructuralElement_Documentation();
@@ -3324,7 +3324,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Doc</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STRUCTURAL_ELEMENT__DOC = eINSTANCE.getStructuralElement_Doc();
@@ -3332,7 +3332,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.LinkTargetImpl
      * <em>Link Target</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.LinkTargetImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getLinkTarget()
      * @generated
@@ -3342,7 +3342,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Default Label</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute LINK_TARGET__DEFAULT_LABEL = eINSTANCE.getLinkTarget_DefaultLabel();
@@ -3350,7 +3350,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Tooltip</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute LINK_TARGET__TOOLTIP = eINSTANCE.getLinkTarget_Tooltip();
@@ -3358,7 +3358,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.CalloutImpl <em>Callout</em>}
      * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.CalloutImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getCallout()
      * @generated
@@ -3368,7 +3368,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Snippet</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CALLOUT__SNIPPET = eINSTANCE.getCallout_Snippet();
@@ -3376,7 +3376,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.EmbeddableElementImpl
      * <em>Embeddable Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.EmbeddableElementImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getEmbeddableElement()
      * @generated
@@ -3386,7 +3386,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Documentation</b></em>' container reference feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference EMBEDDABLE_ELEMENT__DOCUMENTATION = eINSTANCE.getEmbeddableElement_Documentation();
@@ -3394,7 +3394,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Doc</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute EMBEDDABLE_ELEMENT__DOC = eINSTANCE.getEmbeddableElement_Doc();
@@ -3402,7 +3402,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExternalTargetImpl
      * <em>External Target</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ExternalTargetImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getExternalTarget()
      * @generated
@@ -3412,7 +3412,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Url</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute EXTERNAL_TARGET__URL = eINSTANCE.getExternalTarget_Url();
@@ -3420,7 +3420,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.Identifiable
      * <em>Identifiable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.Identifiable
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getIdentifiable()
      * @generated
@@ -3430,7 +3430,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Id</b></em>' attribute feature. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      */
     EAttribute IDENTIFIABLE__ID = eINSTANCE.getIdentifiable_Id();
@@ -3438,7 +3438,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyImpl <em>Body</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.BodyImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getBody()
      * @generated
@@ -3448,7 +3448,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Category</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference BODY__CATEGORY = eINSTANCE.getBody_Category();
@@ -3456,7 +3456,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementContainerImpl
      * <em>Body Element Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementContainerImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getBodyElementContainer()
      * @generated
@@ -3466,7 +3466,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference BODY_ELEMENT_CONTAINER__ELEMENTS = eINSTANCE.getBodyElementContainer_Elements();
@@ -3474,7 +3474,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementImpl
      * <em>Body Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.BodyElementImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getBodyElement()
      * @generated
@@ -3484,7 +3484,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Container</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference BODY_ELEMENT__CONTAINER = eINSTANCE.getBodyElement_Container();
@@ -3492,7 +3492,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Tag</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute BODY_ELEMENT__TAG = eINSTANCE.getBodyElement_Tag();
@@ -3500,7 +3500,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.TextImpl <em>Text</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.TextImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getText()
      * @generated
@@ -3510,7 +3510,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.LinkImpl <em>Link</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.LinkImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getLink()
      * @generated
@@ -3520,7 +3520,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Target</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference LINK__TARGET = eINSTANCE.getLink_Target();
@@ -3528,7 +3528,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.EmbeddingImpl
      * <em>Embedding</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.EmbeddingImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getEmbedding()
      * @generated
@@ -3538,7 +3538,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference EMBEDDING__ELEMENT = eINSTANCE.getEmbedding_Element();
@@ -3546,7 +3546,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.SourceCodeImpl
      * <em>Source Code</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.SourceCodeImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getSourceCode()
      * @generated
@@ -3556,7 +3556,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.PluginImpl <em>Plugin</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.PluginImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getPlugin()
      * @generated
@@ -3566,7 +3566,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute PLUGIN__NAME = eINSTANCE.getPlugin_Name();
@@ -3574,7 +3574,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Packages</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference PLUGIN__PACKAGES = eINSTANCE.getPlugin_Packages();
@@ -3582,7 +3582,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Label</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute PLUGIN__LABEL = eINSTANCE.getPlugin_Label();
@@ -3590,7 +3590,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Extension Points</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference PLUGIN__EXTENSION_POINTS = eINSTANCE.getPlugin_ExtensionPoints();
@@ -3598,7 +3598,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaPackageImpl
      * <em>Java Package</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavaPackageImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavaPackage()
      * @generated
@@ -3608,7 +3608,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute JAVA_PACKAGE__NAME = eINSTANCE.getJavaPackage_Name();
@@ -3616,7 +3616,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Plugin</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference JAVA_PACKAGE__PLUGIN = eINSTANCE.getJavaPackage_Plugin();
@@ -3624,7 +3624,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavadocImpl <em>Javadoc</em>}
      * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavadocImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavadoc()
      * @generated
@@ -3634,7 +3634,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExternalArticleImpl
      * <em>External Article</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ExternalArticleImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getExternalArticle()
      * @generated
@@ -3644,7 +3644,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Url</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute EXTERNAL_ARTICLE__URL = eINSTANCE.getExternalArticle_Url();
@@ -3652,7 +3652,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.SchemadocImpl
      * <em>Schemadoc</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.SchemadocImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getSchemadoc()
      * @generated
@@ -3662,7 +3662,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExtensionPointImpl
      * <em>Extension Point</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ExtensionPointImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getExtensionPoint()
      * @generated
@@ -3672,7 +3672,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute EXTENSION_POINT__NAME = eINSTANCE.getExtensionPoint_Name();
@@ -3680,7 +3680,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Plugin</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference EXTENSION_POINT__PLUGIN = eINSTANCE.getExtensionPoint_Plugin();
@@ -3688,7 +3688,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.TocImpl <em>Toc</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.TocImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getToc()
      * @generated
@@ -3698,7 +3698,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Levels</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute TOC__LEVELS = eINSTANCE.getToc_Levels();
@@ -3706,7 +3706,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.PluginResourceImpl
      * <em>Plugin Resource</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.PluginResourceImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getPluginResource()
      * @generated
@@ -3716,7 +3716,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExcelImpl <em>Excel</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ExcelImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getExcel()
      * @generated
@@ -3726,7 +3726,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl
      * <em>Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFormatter()
      * @generated
@@ -3736,7 +3736,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Snippet</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference FORMATTER__SNIPPET = eINSTANCE.getFormatter_Snippet();
@@ -3744,7 +3744,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaFormatterImpl
      * <em>Java Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.JavaFormatterImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getJavaFormatter()
      * @generated
@@ -3754,7 +3754,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.XmlFormatterImpl
      * <em>Xml Formatter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.XmlFormatterImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getXmlFormatter()
      * @generated
@@ -3764,7 +3764,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>File</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute XML_FORMATTER__FILE = eINSTANCE.getXmlFormatter_File();
@@ -3772,7 +3772,7 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.ImageImpl <em>Image</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ImageImpl
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getImage()
      * @generated
@@ -3782,14 +3782,14 @@ public interface ArticlePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>File</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute IMAGE__FILE = eINSTANCE.getImage_File();
 
     /**
      * The meta object literal for the '<em>Root Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see com.sun.javadoc.RootDoc
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getRootDoc()
      * @generated
@@ -3798,7 +3798,7 @@ public interface ArticlePackage extends EPackage
 
     /**
      * The meta object literal for the '<em>File</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see java.io.File
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFile()
      * @generated
@@ -3807,7 +3807,7 @@ public interface ArticlePackage extends EPackage
 
     /**
      * The meta object literal for the '<em>Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see com.sun.javadoc.Doc
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDoc()
      * @generated
@@ -3816,7 +3816,7 @@ public interface ArticlePackage extends EPackage
 
     /**
      * The meta object literal for the '<em>Tag</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see com.sun.javadoc.Tag
      * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getTag()
      * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Body.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Body.java
index 4d98901880..54f2894d13 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Body.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Body.java
@@ -18,7 +18,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Body#getCategory <em>Category</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getBody()
  * @model abstract="true"
  * @generated
@@ -32,7 +32,7 @@ public interface Body extends StructuralElement, BodyElementContainer
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Category</em>' reference.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getBody_Category()
    * @model resolveProxies="false" transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElement.java
index 1b5cdd1e4e..a0fe997a3a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElement.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElement.java
@@ -26,7 +26,7 @@ import java.io.PrintWriter;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.BodyElement#getTag <em>Tag</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getBodyElement()
  * @model abstract="true"
  * @generated
@@ -42,7 +42,7 @@ public interface BodyElement extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Container</em>' container reference.
    * @see #setContainer(BodyElementContainer)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getBodyElement_Container()
@@ -55,7 +55,7 @@ public interface BodyElement extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.BodyElement#getContainer <em>Container</em>}'
    * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Container</em>' container reference.
    * @see #getContainer()
@@ -69,7 +69,7 @@ public interface BodyElement extends EObject
    * If the meaning of the '<em>Tag</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Tag</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getBodyElement_Tag()
    * @model dataType="org.eclipse.emf.cdo.releng.doc.article.Tag" transient="true" changeable="false" volatile="true"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElementContainer.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElementContainer.java
index 8961216f84..0ae439ec24 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElementContainer.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElementContainer.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getBodyElementContainer()
  * @model abstract="true"
  * @generated
@@ -39,7 +39,7 @@ public interface BodyElementContainer extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Elements</em>' containment reference list.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getBodyElementContainer_Elements()
    * @see org.eclipse.emf.cdo.releng.doc.article.BodyElement#getContainer
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Callout.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Callout.java
index 5489533b5d..a20a0261d5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Callout.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Callout.java
@@ -20,7 +20,7 @@ import com.sun.javadoc.Tag;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Callout#getSnippet <em>Snippet</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getCallout()
  * @model
  * @generated
@@ -35,7 +35,7 @@ public interface Callout extends BodyElementContainer
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Snippet</em>' container reference.
    * @see #setSnippet(Snippet)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getCallout_Snippet()
@@ -48,7 +48,7 @@ public interface Callout extends BodyElementContainer
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.Callout#getSnippet <em>Snippet</em>}'
    * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Snippet</em>' container reference.
    * @see #getSnippet()
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Category.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Category.java
index 057e989341..7b3a59d2d5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Category.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Category.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getCategory()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java
index b2f9b1aee3..e0d9c228e4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java
@@ -18,7 +18,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Chapter#getArticle <em>Article</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getChapter()
  * @model
  * @generated
@@ -33,7 +33,7 @@ public interface Chapter extends Body
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Article</em>' reference.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getChapter_Article()
    * @model resolveProxies="false" required="true" transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Context.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Context.java
index 51465a0df9..6670322f08 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Context.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Context.java
@@ -28,7 +28,7 @@ import java.io.File;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Context#getRoot <em>Root</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getContext()
  * @model
  * @generated
@@ -42,7 +42,7 @@ public interface Context extends EObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Base Folder</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getContext_BaseFolder()
    * @model dataType="org.eclipse.emf.cdo.releng.doc.article.File" required="true" changeable="false"
@@ -57,7 +57,7 @@ public interface Context extends EObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Project</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getContext_Project()
    * @model required="true" changeable="false"
@@ -74,7 +74,7 @@ public interface Context extends EObject
    * of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Documentations</em>' containment reference list.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getContext_Documentations()
    * @see org.eclipse.emf.cdo.releng.doc.article.Documentation#getContext
@@ -89,7 +89,7 @@ public interface Context extends EObject
    * If the meaning of the '<em>Root</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Root</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getContext_Root()
    * @model dataType="org.eclipse.emf.cdo.releng.doc.article.RootDoc" required="true" transient="true"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Diagram.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Diagram.java
index a080bd2dcf..96163c0fe3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Diagram.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Diagram.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Diagram</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getDiagram()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Documentation.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Documentation.java
index c49361e689..c07efb7415 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Documentation.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Documentation.java
@@ -27,7 +27,7 @@ import java.util.List;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Documentation#getPlugins <em>Plugins</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getDocumentation()
  * @model
  * @generated
@@ -43,7 +43,7 @@ public interface Documentation extends StructuralElement
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Context</em>' container reference.
    * @see #setContext(Context)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getDocumentation_Context()
@@ -56,7 +56,7 @@ public interface Documentation extends StructuralElement
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.Documentation#getContext <em>Context</em>}'
    * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Context</em>' container reference.
    * @see #getContext()
@@ -74,7 +74,7 @@ public interface Documentation extends StructuralElement
    * more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Embeddable Elements</em>' containment reference list.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getDocumentation_EmbeddableElements()
    * @see org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement#getDocumentation
@@ -91,7 +91,7 @@ public interface Documentation extends StructuralElement
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Dependencies</em>' reference list.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getDocumentation_Dependencies()
    * @model resolveProxies="false"
@@ -106,7 +106,7 @@ public interface Documentation extends StructuralElement
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Project</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getDocumentation_Project()
    * @model required="true" changeable="false"
@@ -122,7 +122,7 @@ public interface Documentation extends StructuralElement
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Plugins</em>' containment reference list.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getDocumentation_Plugins()
    * @model containment="true" changeable="false" derived="true"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java
index e207cf7925..f237d01fc5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java
@@ -24,7 +24,7 @@ import java.io.PrintWriter;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement#getDocumentation <em>Documentation</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getEmbeddableElement()
  * @model abstract="true"
  * @generated
@@ -40,7 +40,7 @@ public interface EmbeddableElement extends Identifiable
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Documentation</em>' container reference.
    * @see #setDocumentation(Documentation)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getEmbeddableElement_Documentation()
@@ -53,7 +53,7 @@ public interface EmbeddableElement extends Identifiable
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement#getDocumentation
    * <em>Documentation</em>}' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Documentation</em>' container reference.
    * @see #getDocumentation()
@@ -67,7 +67,7 @@ public interface EmbeddableElement extends Identifiable
    * If the meaning of the '<em>Doc</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Doc</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getEmbeddableElement_Doc()
    * @model dataType="org.eclipse.emf.cdo.releng.doc.article.Doc" required="true" transient="true" changeable="false"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Embedding.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Embedding.java
index e7d195d576..c4b8b671b4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Embedding.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Embedding.java
@@ -18,7 +18,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Embedding#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getEmbedding()
  * @model
  * @generated
@@ -32,7 +32,7 @@ public interface Embedding extends BodyElement
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Element</em>' reference.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getEmbedding_Element()
    * @model resolveProxies="false" required="true" changeable="false"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Excel.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Excel.java
index 263826f4a1..27a1a4f392 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Excel.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Excel.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Excel</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getExcel()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExtensionPoint.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExtensionPoint.java
index 98a6eb61e1..10c06b9e57 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExtensionPoint.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExtensionPoint.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint#getPlugin <em>Plugin</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getExtensionPoint()
  * @model
  * @generated
@@ -34,7 +34,7 @@ public interface ExtensionPoint extends EObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getExtensionPoint_Name()
@@ -46,7 +46,7 @@ public interface ExtensionPoint extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint#getName <em>Name</em>}'
    * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -63,7 +63,7 @@ public interface ExtensionPoint extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Plugin</em>' container reference.
    * @see #setPlugin(Plugin)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getExtensionPoint_Plugin()
@@ -76,7 +76,7 @@ public interface ExtensionPoint extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint#getPlugin <em>Plugin</em>}'
    * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Plugin</em>' container reference.
    * @see #getPlugin()
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExternalArticle.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExternalArticle.java
index e5fa75d686..a8e820f23c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExternalArticle.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExternalArticle.java
@@ -19,7 +19,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.ExternalArticle#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getExternalArticle()
  * @model
  * @generated
@@ -32,7 +32,7 @@ public interface ExternalArticle extends Article
    * If the meaning of the '<em>Url</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Url</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getExternalArticle_Url()
    * @model required="true" changeable="false" derived="true"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExternalTarget.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExternalTarget.java
index 5f735cfbac..7fda32be98 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExternalTarget.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ExternalTarget.java
@@ -18,7 +18,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.ExternalTarget#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getExternalTarget()
  * @model
  * @generated
@@ -32,7 +32,7 @@ public interface ExternalTarget extends LinkTarget
    * If the meaning of the '<em>Url</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Url</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getExternalTarget_Url()
    * @model changeable="false"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Factory.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Factory.java
index 7869e90258..7750e56a22 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Factory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Factory.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Factory</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getFactory()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Formatter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Formatter.java
index d80fac0919..2936c8b02f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Formatter.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Formatter.java
@@ -25,7 +25,7 @@ import java.io.PrintWriter;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet <em>Snippet</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getFormatter()
  * @model abstract="true"
  * @generated
@@ -41,7 +41,7 @@ public interface Formatter extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Snippet</em>' container reference.
    * @see #setSnippet(Snippet)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getFormatter_Snippet()
@@ -54,7 +54,7 @@ public interface Formatter extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.Formatter#getSnippet <em>Snippet</em>}'
    * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Snippet</em>' container reference.
    * @see #getSnippet()
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Identifiable.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Identifiable.java
index 43c5320ee8..ebe05ed8eb 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Identifiable.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Identifiable.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Identifiable#getId <em>Id</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getIdentifiable()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,7 +33,7 @@ public interface Identifiable extends EObject
    * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Id</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getIdentifiable_Id()
    * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Image.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Image.java
index 412c6546d1..76fefc8dfd 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Image.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Image.java
@@ -20,7 +20,7 @@ import java.io.File;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Image#getFile <em>File</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getImage()
  * @model
  * @generated
@@ -33,7 +33,7 @@ public interface Image extends BodyElement
    * If the meaning of the '<em>File</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>File</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getImage_File()
    * @model dataType="org.eclipse.emf.cdo.releng.doc.article.File" required="true" transient="true" changeable="false"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaElement.java
index ae42f92f79..ea08986926 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaElement.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaElement.java
@@ -20,7 +20,7 @@ import java.io.File;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.JavaElement#getClassFile <em>Class File</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavaElement()
  * @model
  * @generated
@@ -35,7 +35,7 @@ public interface JavaElement extends LinkTarget
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Class File</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavaElement_ClassFile()
    * @model dataType="org.eclipse.emf.cdo.releng.doc.article.File" changeable="false"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaFormatter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaFormatter.java
index 4c51cf1e4f..fce8e6d91d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaFormatter.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaFormatter.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Java Formatter</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavaFormatter()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaPackage.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaPackage.java
index dfe3bd2153..7cf4b74d4d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaPackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/JavaPackage.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.JavaPackage#getPlugin <em>Plugin</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavaPackage()
  * @model
  * @generated
@@ -34,7 +34,7 @@ public interface JavaPackage extends EObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavaPackage_Name()
@@ -46,7 +46,7 @@ public interface JavaPackage extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.JavaPackage#getName <em>Name</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -62,7 +62,7 @@ public interface JavaPackage extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Plugin</em>' container reference.
    * @see #setPlugin(Plugin)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavaPackage_Plugin()
@@ -75,7 +75,7 @@ public interface JavaPackage extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.JavaPackage#getPlugin <em>Plugin</em>}'
    * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Plugin</em>' container reference.
    * @see #getPlugin()
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Javadoc.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Javadoc.java
index 114c22c30f..c713f7391e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Javadoc.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Javadoc.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Javadoc</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getJavadoc()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Link.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Link.java
index b177a9db71..6fefd1ae30 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Link.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Link.java
@@ -18,7 +18,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Link#getTarget <em>Target</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getLink()
  * @model
  * @generated
@@ -31,7 +31,7 @@ public interface Link extends BodyElement
    * If the meaning of the '<em>Target</em>' reference isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Target</em>' reference.
    * @see #setTarget(LinkTarget)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getLink_Target()
@@ -43,7 +43,7 @@ public interface Link extends BodyElement
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.Link#getTarget <em>Target</em>}' reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Target</em>' reference.
    * @see #getTarget()
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/LinkTarget.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/LinkTarget.java
index 5607c7d282..a5395fa371 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/LinkTarget.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/LinkTarget.java
@@ -23,7 +23,7 @@ import java.io.PrintWriter;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.LinkTarget#getTooltip <em>Tooltip</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getLinkTarget()
  * @model abstract="true"
  * @generated
@@ -37,7 +37,7 @@ public interface LinkTarget extends Identifiable
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Default Label</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getLinkTarget_DefaultLabel()
    * @model transient="true" changeable="false" volatile="true" derived="true"
@@ -51,7 +51,7 @@ public interface LinkTarget extends Identifiable
    * If the meaning of the '<em>Label</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Tooltip</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getLinkTarget_Tooltip()
    * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
@@ -61,7 +61,7 @@ public interface LinkTarget extends Identifiable
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @model required="true" sourceRequired="true"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Plugin.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Plugin.java
index 4fe9d0f481..613beea601 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Plugin.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Plugin.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Plugin#getExtensionPoints <em>Extension Points</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getPlugin()
  * @model
  * @generated
@@ -37,7 +37,7 @@ public interface Plugin extends EObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getPlugin_Name()
@@ -49,7 +49,7 @@ public interface Plugin extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.Plugin#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -66,7 +66,7 @@ public interface Plugin extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Packages</em>' containment reference list.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getPlugin_Packages()
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaPackage#getPlugin
@@ -81,7 +81,7 @@ public interface Plugin extends EObject
    * If the meaning of the '<em>Label</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Label</em>' attribute.
    * @see #setLabel(String)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getPlugin_Label()
@@ -93,7 +93,7 @@ public interface Plugin extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.Plugin#getLabel <em>Label</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Label</em>' attribute.
    * @see #getLabel()
@@ -110,7 +110,7 @@ public interface Plugin extends EObject
    * more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Extension Points</em>' containment reference list.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getPlugin_ExtensionPoints()
    * @see org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint#getPlugin
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/PluginResource.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/PluginResource.java
index 7b8f298549..5ad4d6720e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/PluginResource.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/PluginResource.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Plugin Resource</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getPluginResource()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Schemadoc.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Schemadoc.java
index c356c37024..eaee98b1cc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Schemadoc.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Schemadoc.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Schemadoc</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getSchemadoc()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Snippet.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Snippet.java
index 2b48a703ff..9ad9dd353b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Snippet.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Snippet.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter <em>Formatter</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getSnippet()
  * @model
  * @generated
@@ -37,7 +37,7 @@ public interface Snippet extends EmbeddableElement
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Callouts</em>' containment reference list.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getSnippet_Callouts()
    * @see org.eclipse.emf.cdo.releng.doc.article.Callout#getSnippet
@@ -54,7 +54,7 @@ public interface Snippet extends EmbeddableElement
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Formatter</em>' containment reference.
    * @see #setFormatter(Formatter)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getSnippet_Formatter()
@@ -67,7 +67,7 @@ public interface Snippet extends EmbeddableElement
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.Snippet#getFormatter <em>Formatter</em>}'
    * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Formatter</em>' containment reference.
    * @see #getFormatter()
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/SourceCode.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/SourceCode.java
index 4f067f3689..69f3186ee6 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/SourceCode.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/SourceCode.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Source Code</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getSourceCode()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java
index 8ef2fa8ddc..197583aca6 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java
@@ -31,7 +31,7 @@ import java.util.List;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getDocumentation <em>Documentation</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getStructuralElement()
  * @model abstract="true"
  * @generated
@@ -48,7 +48,7 @@ public interface StructuralElement extends LinkTarget
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Children</em>' containment reference list.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getStructuralElement_Children()
    * @see org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getParent
@@ -66,7 +66,7 @@ public interface StructuralElement extends LinkTarget
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Parent</em>' container reference.
    * @see #setParent(StructuralElement)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getStructuralElement_Parent()
@@ -79,7 +79,7 @@ public interface StructuralElement extends LinkTarget
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.StructuralElement#getParent <em>Parent</em>}'
    * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Parent</em>' container reference.
    * @see #getParent()
@@ -93,7 +93,7 @@ public interface StructuralElement extends LinkTarget
    * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Title</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getStructuralElement_Title()
    * @model required="true" changeable="false"
@@ -108,7 +108,7 @@ public interface StructuralElement extends LinkTarget
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Documentation</em>' reference.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getStructuralElement_Documentation()
    * @model resolveProxies="false" required="true" transient="true" changeable="false" volatile="true" derived="true"
@@ -122,7 +122,7 @@ public interface StructuralElement extends LinkTarget
    * If the meaning of the '<em>Doc</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Doc</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getStructuralElement_Doc()
    * @model dataType="org.eclipse.emf.cdo.releng.doc.article.Doc" required="true" transient="true" changeable="false"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Text.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Text.java
index e1e2dc11e4..dd9fbe9a07 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Text.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Text.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Text</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getText()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Toc.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Toc.java
index 154e1addd4..5dba6131a5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Toc.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Toc.java
@@ -18,7 +18,7 @@ package org.eclipse.emf.cdo.releng.doc.article;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Toc#getLevels <em>Levels</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getToc()
  * @model
  * @generated
@@ -32,7 +32,7 @@ public interface Toc extends BodyElement
    * If the meaning of the '<em>Levels</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Levels</em>' attribute.
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getToc_Levels()
    * @model default="-1" changeable="false" derived="true"
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/XmlFormatter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/XmlFormatter.java
index 33d9b0c9e2..b5c9432247 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/XmlFormatter.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/XmlFormatter.java
@@ -20,7 +20,7 @@ import java.io.File;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter#getFile <em>File</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getXmlFormatter()
  * @model
  * @generated
@@ -34,7 +34,7 @@ public interface XmlFormatter extends Formatter
    * If the meaning of the '<em>File</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>File</em>' attribute.
    * @see #setFile(File)
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getXmlFormatter_File()
@@ -46,7 +46,7 @@ public interface XmlFormatter extends Formatter
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter#getFile <em>File</em>}'
    * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>File</em>' attribute.
    * @see #getFile()
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleDoclet.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleDoclet.java
index 9fdbcc0180..f150d51855 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleDoclet.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleDoclet.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java
index 4a50cfce81..bea60f14c3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java
@@ -51,14 +51,14 @@ import java.io.File;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static ArticleFactory init()
@@ -81,7 +81,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ArticleFactoryImpl()
@@ -91,7 +91,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -160,7 +160,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -177,7 +177,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -194,7 +194,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Documentation createDocumentation()
@@ -205,7 +205,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Context createContext()
@@ -216,7 +216,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Category createCategory()
@@ -227,7 +227,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Article createArticle()
@@ -238,7 +238,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Chapter createChapter()
@@ -249,7 +249,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Snippet createSnippet()
@@ -260,7 +260,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Diagram createDiagram()
@@ -271,7 +271,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Factory createFactory()
@@ -282,7 +282,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public JavaElement createJavaElement()
@@ -293,7 +293,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Callout createCallout()
@@ -304,7 +304,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ExternalTarget createExternalTarget()
@@ -315,7 +315,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Text createText()
@@ -326,7 +326,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Link createLink()
@@ -337,7 +337,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Embedding createEmbedding()
@@ -348,7 +348,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public SourceCode createSourceCode()
@@ -359,7 +359,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Plugin createPlugin()
@@ -370,7 +370,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public JavaPackage createJavaPackage()
@@ -381,7 +381,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Javadoc createJavadoc()
@@ -392,7 +392,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ExternalArticle createExternalArticle()
@@ -403,7 +403,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Schemadoc createSchemadoc()
@@ -414,7 +414,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ExtensionPoint createExtensionPoint()
@@ -425,7 +425,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Toc createToc()
@@ -436,7 +436,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public PluginResource createPluginResource()
@@ -447,7 +447,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Excel createExcel()
@@ -458,7 +458,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public JavaFormatter createJavaFormatter()
@@ -469,7 +469,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public XmlFormatter createXmlFormatter()
@@ -480,7 +480,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Image createImage()
@@ -491,7 +491,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public File createFileFromString(EDataType eDataType, String initialValue)
@@ -501,7 +501,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String convertFileToString(EDataType eDataType, Object instanceValue)
@@ -511,7 +511,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ArticlePackage getArticlePackage()
@@ -521,7 +521,7 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java
index c3239c7b6c..f9636208ea 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java
@@ -30,7 +30,7 @@ import java.util.Map;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Article</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class ArticleImpl extends ChapterImpl implements Article
@@ -39,7 +39,7 @@ public class ArticleImpl extends ChapterImpl implements Article
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ArticleImpl()
@@ -66,7 +66,7 @@ public class ArticleImpl extends ChapterImpl implements Article
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
index a2c51073fc..705a263f88 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java
@@ -64,280 +64,280 @@ import java.io.File;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass documentationEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass contextEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass categoryEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass articleEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass chapterEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass snippetEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass diagramEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass factoryEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass javaElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass structuralElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass linkTargetEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass calloutEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass embeddableElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass externalTargetEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass identifiableEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass bodyEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass bodyElementContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass bodyElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass textEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass linkEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass embeddingEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass sourceCodeEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass pluginEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass javaPackageEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass javadocEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass externalArticleEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass schemadocEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass extensionPointEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass tocEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass pluginResourceEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass excelEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass formatterEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass javaFormatterEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass xmlFormatterEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass imageEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EDataType rootDocEDataType = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EDataType fileEDataType = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EDataType docEDataType = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EDataType tagEDataType = null;
@@ -349,7 +349,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#eNS_URI
    * @see #init()
@@ -362,7 +362,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static boolean isInited = false;
@@ -373,7 +373,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
    * This method is used to initialize {@link ArticlePackage#eINSTANCE} when that field is accessed. Clients should not
    * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -387,8 +387,9 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
     }
 
     // Obtain or create and register package
-    ArticlePackageImpl theArticlePackage = (ArticlePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ArticlePackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new ArticlePackageImpl());
+    ArticlePackageImpl theArticlePackage = (ArticlePackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof ArticlePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new ArticlePackageImpl());
 
     isInited = true;
 
@@ -408,7 +409,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getDocumentation()
@@ -418,7 +419,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDocumentation_Context()
@@ -428,7 +429,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDocumentation_EmbeddableElements()
@@ -438,7 +439,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDocumentation_Dependencies()
@@ -448,7 +449,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getDocumentation_Project()
@@ -458,7 +459,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDocumentation_Plugins()
@@ -468,7 +469,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getContext()
@@ -478,7 +479,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getContext_BaseFolder()
@@ -488,7 +489,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getContext_Project()
@@ -498,7 +499,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getContext_Documentations()
@@ -508,7 +509,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getContext_Root()
@@ -518,7 +519,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getCategory()
@@ -528,7 +529,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getArticle()
@@ -538,7 +539,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getChapter()
@@ -548,7 +549,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getChapter_Article()
@@ -558,7 +559,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getSnippet()
@@ -568,7 +569,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getSnippet_Callouts()
@@ -578,7 +579,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getSnippet_Formatter()
@@ -588,7 +589,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getDiagram()
@@ -598,7 +599,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getFactory()
@@ -608,7 +609,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getJavaElement()
@@ -618,7 +619,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getJavaElement_ClassFile()
@@ -628,7 +629,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getStructuralElement()
@@ -638,7 +639,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getStructuralElement_Children()
@@ -648,7 +649,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getStructuralElement_Parent()
@@ -658,7 +659,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStructuralElement_Title()
@@ -668,7 +669,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getStructuralElement_Documentation()
@@ -678,7 +679,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStructuralElement_Doc()
@@ -688,7 +689,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getLinkTarget()
@@ -698,7 +699,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getLinkTarget_DefaultLabel()
@@ -708,7 +709,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getLinkTarget_Tooltip()
@@ -718,7 +719,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getCallout()
@@ -728,7 +729,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getCallout_Snippet()
@@ -738,7 +739,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getEmbeddableElement()
@@ -748,7 +749,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getEmbeddableElement_Documentation()
@@ -758,7 +759,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getEmbeddableElement_Doc()
@@ -768,7 +769,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getExternalTarget()
@@ -778,7 +779,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getExternalTarget_Url()
@@ -788,7 +789,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getIdentifiable()
@@ -798,7 +799,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getIdentifiable_Id()
@@ -808,7 +809,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getBody()
@@ -818,7 +819,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getBody_Category()
@@ -828,7 +829,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getBodyElementContainer()
@@ -838,7 +839,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getBodyElementContainer_Elements()
@@ -848,7 +849,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getBodyElement()
@@ -858,7 +859,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getBodyElement_Container()
@@ -868,7 +869,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getBodyElement_Tag()
@@ -878,7 +879,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getText()
@@ -888,7 +889,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getLink()
@@ -898,7 +899,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getLink_Target()
@@ -908,7 +909,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getEmbedding()
@@ -918,7 +919,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getEmbedding_Element()
@@ -928,7 +929,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getSourceCode()
@@ -938,7 +939,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getPlugin()
@@ -948,7 +949,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getPlugin_Name()
@@ -958,7 +959,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getPlugin_Packages()
@@ -968,7 +969,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getPlugin_Label()
@@ -978,7 +979,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getPlugin_ExtensionPoints()
@@ -988,7 +989,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getJavaPackage()
@@ -998,7 +999,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getJavaPackage_Name()
@@ -1008,7 +1009,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getJavaPackage_Plugin()
@@ -1018,7 +1019,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getJavadoc()
@@ -1028,7 +1029,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getExternalArticle()
@@ -1038,7 +1039,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getExternalArticle_Url()
@@ -1048,7 +1049,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getSchemadoc()
@@ -1058,7 +1059,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getExtensionPoint()
@@ -1068,7 +1069,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getExtensionPoint_Name()
@@ -1078,7 +1079,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getExtensionPoint_Plugin()
@@ -1088,7 +1089,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getToc()
@@ -1098,7 +1099,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getToc_Levels()
@@ -1108,7 +1109,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getPluginResource()
@@ -1118,7 +1119,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getExcel()
@@ -1128,7 +1129,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getFormatter()
@@ -1138,7 +1139,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getFormatter_Snippet()
@@ -1148,7 +1149,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getJavaFormatter()
@@ -1158,7 +1159,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getXmlFormatter()
@@ -1168,7 +1169,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getXmlFormatter_File()
@@ -1178,7 +1179,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getImage()
@@ -1188,7 +1189,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getImage_File()
@@ -1198,7 +1199,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EDataType getRootDoc()
@@ -1208,7 +1209,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EDataType getFile()
@@ -1218,7 +1219,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EDataType getDoc()
@@ -1228,7 +1229,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EDataType getTag()
@@ -1238,7 +1239,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ArticleFactory getArticleFactory()
@@ -1248,7 +1249,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isCreated = false;
@@ -1256,7 +1257,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void createPackageContents()
@@ -1391,7 +1392,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isInitialized = false;
@@ -1399,7 +1400,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void initializePackageContents()
@@ -1470,8 +1471,8 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
     initEClass(contextEClass, Context.class, "Context", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getContext_BaseFolder(), getFile(), "baseFolder", null, 1, 1, Context.class, !IS_TRANSIENT,
         !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getContext_Project(), ecorePackage.getEString(), "project", null, 1, 1, Context.class,
-        !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getContext_Project(), ecorePackage.getEString(), "project", null, 1, 1, Context.class, !IS_TRANSIENT,
+        !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getContext_Documentations(), getDocumentation(), getDocumentation_Context(), "documentations", null,
         1, -1, Context.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1540,8 +1541,8 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
     initEClass(embeddableElementEClass, EmbeddableElement.class, "EmbeddableElement", IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getEmbeddableElement_Documentation(), getDocumentation(), getDocumentation_EmbeddableElements(),
-        "documentation", null, 1, 1, EmbeddableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        "documentation", null, 1, 1, EmbeddableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getEmbeddableElement_Doc(), getDoc(), "doc", null, 1, 1, EmbeddableElement.class, IS_TRANSIENT,
         IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1636,9 +1637,9 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
     initEClass(excelEClass, Excel.class, "Excel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(formatterEClass, Formatter.class, "Formatter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getFormatter_Snippet(), getSnippet(), getSnippet_Formatter(), "snippet", null, 1, 1,
-        Formatter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getFormatter_Snippet(), getSnippet(), getSnippet_Formatter(), "snippet", null, 1, 1, Formatter.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(javaFormatterEClass, JavaFormatter.class, "JavaFormatter", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java
index 86e0c79d98..c804ba7036 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java
@@ -110,8 +110,8 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement
    */
   public void setContainer(BodyElementContainer newContainer)
   {
-    if (newContainer != eInternalContainer() || eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CONTAINER
-        && newContainer != null)
+    if (newContainer != eInternalContainer()
+        || eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CONTAINER && newContainer != null)
     {
       if (EcoreUtil.isAncestor(this, newContainer))
       {
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CalloutImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CalloutImpl.java
index e9ad5348d8..407466a382 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CalloutImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CalloutImpl.java
@@ -31,7 +31,7 @@ import com.sun.javadoc.Tag;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.CalloutImpl#getSnippet <em>Snippet</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class CalloutImpl extends BodyElementContainerImpl implements Callout
@@ -42,7 +42,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected CalloutImpl()
@@ -61,7 +61,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -72,7 +72,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Snippet getSnippet()
@@ -86,7 +86,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public NotificationChain basicSetSnippet(Snippet newSnippet, NotificationChain msgs)
@@ -97,13 +97,13 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setSnippet(Snippet newSnippet)
   {
-    if (newSnippet != eInternalContainer() || eContainerFeatureID() != ArticlePackage.CALLOUT__SNIPPET
-        && newSnippet != null)
+    if (newSnippet != eInternalContainer()
+        || eContainerFeatureID() != ArticlePackage.CALLOUT__SNIPPET && newSnippet != null)
     {
       if (EcoreUtil.isAncestor(this, newSnippet))
       {
@@ -132,7 +132,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -152,7 +152,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -168,7 +168,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -184,7 +184,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -200,7 +200,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -217,7 +217,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -234,7 +234,7 @@ public class CalloutImpl extends BodyElementContainerImpl implements Callout
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java
index 10a7ad81fc..bb8913451c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java
@@ -29,14 +29,14 @@ import java.util.List;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class CategoryImpl extends BodyImpl implements Category
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected CategoryImpl()
@@ -61,7 +61,7 @@ public class CategoryImpl extends BodyImpl implements Category
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java
index eae5f6a950..33f3523de4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java
@@ -48,7 +48,7 @@ import java.util.Map;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.ContextImpl#getRoot <em>Root</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ContextImpl extends EObjectImpl implements Context
@@ -56,7 +56,7 @@ public class ContextImpl extends EObjectImpl implements Context
   /**
    * The default value of the '{@link #getBaseFolder() <em>Base Folder</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getBaseFolder()
    * @generated
    * @ordered
@@ -66,7 +66,7 @@ public class ContextImpl extends EObjectImpl implements Context
   /**
    * The cached value of the '{@link #getBaseFolder() <em>Base Folder</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getBaseFolder()
    * @generated
    * @ordered
@@ -76,7 +76,7 @@ public class ContextImpl extends EObjectImpl implements Context
   /**
    * The default value of the '{@link #getProject() <em>Project</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getProject()
    * @generated
    * @ordered
@@ -86,7 +86,7 @@ public class ContextImpl extends EObjectImpl implements Context
   /**
    * The cached value of the '{@link #getProject() <em>Project</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getProject()
    * @generated
    * @ordered
@@ -96,7 +96,7 @@ public class ContextImpl extends EObjectImpl implements Context
   /**
    * The cached value of the '{@link #getDocumentations() <em>Documentations</em>}' containment reference list. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getDocumentations()
    * @generated
    * @ordered
@@ -106,7 +106,7 @@ public class ContextImpl extends EObjectImpl implements Context
   /**
    * The default value of the '{@link #getRoot() <em>Root</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getRoot()
    * @generated
    * @ordered
@@ -121,7 +121,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ContextImpl()
@@ -177,7 +177,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -188,7 +188,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public File getBaseFolder()
@@ -198,7 +198,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getProject()
@@ -208,7 +208,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EList<Documentation> getDocumentations()
@@ -223,7 +223,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public RootDoc getRoot()
@@ -233,7 +233,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -250,7 +250,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -266,7 +266,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -288,7 +288,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -307,7 +307,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -324,7 +324,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -346,7 +346,7 @@ public class ContextImpl extends EObjectImpl implements Context
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DelegatingTag.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DelegatingTag.java
index 1e176af1a2..da0e2adbf3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DelegatingTag.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DelegatingTag.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java
index c8039a4785..0a9511a577 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java
@@ -27,7 +27,7 @@ import java.io.PrintWriter;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Diagram</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class DiagramImpl extends BodyElementImpl implements Diagram
@@ -42,7 +42,7 @@ public class DiagramImpl extends BodyElementImpl implements Diagram
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected DiagramImpl()
@@ -80,7 +80,7 @@ public class DiagramImpl extends BodyElementImpl implements Diagram
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
index 10ee454054..4ed04b4cf8 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
@@ -412,8 +412,8 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
    */
   public void setContext(Context newContext)
   {
-    if (newContext != eInternalContainer() || eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT
-        && newContext != null)
+    if (newContext != eInternalContainer()
+        || eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT && newContext != null)
     {
       if (EcoreUtil.isAncestor(this, newContext))
       {
@@ -437,8 +437,8 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.DOCUMENTATION__CONTEXT, newContext,
-          newContext));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, ArticlePackage.DOCUMENTATION__CONTEXT, newContext, newContext));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java
index de98865b38..a0b1b746b5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddableElementImpl.java
@@ -121,7 +121,8 @@ public abstract class EmbeddableElementImpl extends EObjectImpl implements Embed
    */
   public NotificationChain basicSetDocumentation(Documentation newDocumentation, NotificationChain msgs)
   {
-    msgs = eBasicSetContainer((InternalEObject)newDocumentation, ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION, msgs);
+    msgs = eBasicSetContainer((InternalEObject)newDocumentation, ArticlePackage.EMBEDDABLE_ELEMENT__DOCUMENTATION,
+        msgs);
     return msgs;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddingImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddingImpl.java
index c70b38d034..6af55408d8 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddingImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddingImpl.java
@@ -31,7 +31,7 @@ import java.io.PrintWriter;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.EmbeddingImpl#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EmbeddingImpl extends BodyElementImpl implements Embedding
@@ -39,7 +39,7 @@ public class EmbeddingImpl extends BodyElementImpl implements Embedding
   /**
    * The cached value of the '{@link #getElement() <em>Element</em>}' reference. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getElement()
    * @generated
    * @ordered
@@ -48,7 +48,7 @@ public class EmbeddingImpl extends BodyElementImpl implements Embedding
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected EmbeddingImpl()
@@ -64,7 +64,7 @@ public class EmbeddingImpl extends BodyElementImpl implements Embedding
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -75,7 +75,7 @@ public class EmbeddingImpl extends BodyElementImpl implements Embedding
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EmbeddableElement getElement()
@@ -85,7 +85,7 @@ public class EmbeddingImpl extends BodyElementImpl implements Embedding
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -101,7 +101,7 @@ public class EmbeddingImpl extends BodyElementImpl implements Embedding
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExcelImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExcelImpl.java
index 0e2262461a..6c221ddb4f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExcelImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExcelImpl.java
@@ -19,24 +19,24 @@ import org.eclipse.emf.ecore.EClass;
 
 import com.sun.javadoc.Tag;
 
-import de.escnet.ExcelTable;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 
+import de.escnet.ExcelTable;
+
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Excel</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class ExcelImpl extends BodyElementImpl implements Excel
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ExcelImpl()
@@ -51,7 +51,7 @@ public class ExcelImpl extends BodyElementImpl implements Excel
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExtensionPointImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExtensionPointImpl.java
index 7374eaf268..d179d467ca 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExtensionPointImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExtensionPointImpl.java
@@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExtensionPointImpl#getPlugin <em>Plugin</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
@@ -40,7 +40,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -49,7 +49,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -58,7 +58,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ExtensionPointImpl()
@@ -68,7 +68,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -79,7 +79,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -89,7 +89,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -104,7 +104,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Plugin getPlugin()
@@ -118,7 +118,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public NotificationChain basicSetPlugin(Plugin newPlugin, NotificationChain msgs)
@@ -129,13 +129,13 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setPlugin(Plugin newPlugin)
   {
-    if (newPlugin != eInternalContainer() || eContainerFeatureID() != ArticlePackage.EXTENSION_POINT__PLUGIN
-        && newPlugin != null)
+    if (newPlugin != eInternalContainer()
+        || eContainerFeatureID() != ArticlePackage.EXTENSION_POINT__PLUGIN && newPlugin != null)
     {
       if (EcoreUtil.isAncestor(this, newPlugin))
       {
@@ -159,14 +159,14 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.EXTENSION_POINT__PLUGIN, newPlugin,
-          newPlugin));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, ArticlePackage.EXTENSION_POINT__PLUGIN, newPlugin, newPlugin));
     }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -186,7 +186,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -202,7 +202,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -218,7 +218,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -236,7 +236,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -256,7 +256,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -276,7 +276,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -294,7 +294,7 @@ public class ExtensionPointImpl extends EObjectImpl implements ExtensionPoint
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java
index 84c8f259d1..1a1b651818 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java
@@ -30,14 +30,14 @@ import java.io.IOException;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.ExternalArticleImpl#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
 {
   /**
    * The default value of the '{@link #getUrl() <em>Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getUrl()
    * @generated
    * @ordered
@@ -46,7 +46,7 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
 
   /**
    * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getUrl()
    * @generated
    * @ordered
@@ -55,7 +55,7 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ExternalArticleImpl()
@@ -71,7 +71,7 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -82,7 +82,7 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getUrl()
@@ -92,7 +92,7 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -108,7 +108,7 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -124,7 +124,7 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java
index c21f296524..5d228475c9 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java
@@ -26,14 +26,14 @@ import java.io.PrintWriter;
  * -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget
 {
   /**
    * The default value of the '{@link #getUrl() <em>Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getUrl()
    * @generated
    * @ordered
@@ -42,7 +42,7 @@ public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget
 
   /**
    * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getUrl()
    * @generated
    * @ordered
@@ -53,7 +53,7 @@ public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ExternalTargetImpl()
@@ -70,7 +70,7 @@ public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -81,7 +81,7 @@ public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getUrl()
@@ -91,7 +91,7 @@ public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -107,7 +107,7 @@ public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -123,7 +123,7 @@ public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FactoryImpl.java
index 2269f3797b..fbf0f6d695 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FactoryImpl.java
@@ -26,7 +26,7 @@ import java.io.PrintWriter;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Factory</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class FactoryImpl extends EmbeddableElementImpl implements Factory
@@ -35,7 +35,7 @@ public class FactoryImpl extends EmbeddableElementImpl implements Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected FactoryImpl()
@@ -52,7 +52,7 @@ public class FactoryImpl extends EmbeddableElementImpl implements Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FormatterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FormatterImpl.java
index 541b17f86e..98fa6ac5fc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FormatterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FormatterImpl.java
@@ -32,14 +32,14 @@ import com.sun.javadoc.Doc;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.FormatterImpl#getSnippet <em>Snippet</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class FormatterImpl extends EObjectImpl implements Formatter
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected FormatterImpl()
@@ -49,7 +49,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -60,7 +60,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Snippet getSnippet()
@@ -85,7 +85,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public NotificationChain basicSetSnippet(Snippet newSnippet, NotificationChain msgs)
@@ -96,13 +96,13 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setSnippet(Snippet newSnippet)
   {
-    if (newSnippet != eInternalContainer() || eContainerFeatureID() != ArticlePackage.FORMATTER__SNIPPET
-        && newSnippet != null)
+    if (newSnippet != eInternalContainer()
+        || eContainerFeatureID() != ArticlePackage.FORMATTER__SNIPPET && newSnippet != null)
     {
       if (EcoreUtil.isAncestor(this, newSnippet))
       {
@@ -131,7 +131,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -151,7 +151,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -167,7 +167,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -183,7 +183,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -199,7 +199,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -216,7 +216,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -233,7 +233,7 @@ public abstract class FormatterImpl extends EObjectImpl implements Formatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java
index 59e4ce96a3..d6bb0305b1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java
@@ -34,7 +34,7 @@ import java.io.PrintWriter;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaElementImpl#getClassFile <em>Class File</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class JavaElementImpl extends LinkTargetImpl implements JavaElement
@@ -42,7 +42,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
   /**
    * The default value of the '{@link #getClassFile() <em>Class File</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getClassFile()
    * @generated
    * @ordered
@@ -52,7 +52,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
   /**
    * The cached value of the '{@link #getClassFile() <em>Class File</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getClassFile()
    * @generated
    * @ordered
@@ -65,7 +65,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected JavaElementImpl()
@@ -84,7 +84,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -95,7 +95,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public File getClassFile()
@@ -105,7 +105,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -121,7 +121,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -137,7 +137,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaFormatterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaFormatterImpl.java
index 53022e78b1..3a46fb40da 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaFormatterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaFormatterImpl.java
@@ -29,7 +29,7 @@ import java.util.Map;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Java Formatter</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class JavaFormatterImpl extends FormatterImpl implements JavaFormatter
@@ -54,7 +54,7 @@ public class JavaFormatterImpl extends FormatterImpl implements JavaFormatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected JavaFormatterImpl()
@@ -64,7 +64,7 @@ public class JavaFormatterImpl extends FormatterImpl implements JavaFormatter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaPackageImpl.java
index 06d7041a61..5e601d251e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaPackageImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.JavaPackageImpl#getPlugin <em>Plugin</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class JavaPackageImpl extends EObjectImpl implements JavaPackage
@@ -39,7 +39,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -48,7 +48,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -57,7 +57,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected JavaPackageImpl()
@@ -67,7 +67,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -78,7 +78,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -88,7 +88,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -103,7 +103,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Plugin getPlugin()
@@ -117,7 +117,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public NotificationChain basicSetPlugin(Plugin newPlugin, NotificationChain msgs)
@@ -128,13 +128,13 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setPlugin(Plugin newPlugin)
   {
-    if (newPlugin != eInternalContainer() || eContainerFeatureID() != ArticlePackage.JAVA_PACKAGE__PLUGIN
-        && newPlugin != null)
+    if (newPlugin != eInternalContainer()
+        || eContainerFeatureID() != ArticlePackage.JAVA_PACKAGE__PLUGIN && newPlugin != null)
     {
       if (EcoreUtil.isAncestor(this, newPlugin))
       {
@@ -163,7 +163,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -183,7 +183,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -199,7 +199,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -215,7 +215,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -233,7 +233,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -253,7 +253,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -273,7 +273,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -291,7 +291,7 @@ public class JavaPackageImpl extends EObjectImpl implements JavaPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java
index 17aea57ba5..b0f29ba68d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java
@@ -30,7 +30,7 @@ import java.io.IOException;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Javadoc</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class JavadocImpl extends CategoryImpl implements Javadoc
@@ -39,7 +39,7 @@ public class JavadocImpl extends CategoryImpl implements Javadoc
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected JavadocImpl()
@@ -54,7 +54,7 @@ public class JavadocImpl extends CategoryImpl implements Javadoc
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java
index d1196b3def..c1c48aa73e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java
@@ -33,7 +33,7 @@ import java.io.PrintWriter;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.LinkImpl#getTarget <em>Target</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class LinkImpl extends BodyElementImpl implements Link
@@ -41,7 +41,7 @@ public class LinkImpl extends BodyElementImpl implements Link
   /**
    * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTarget()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class LinkImpl extends BodyElementImpl implements Link
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected LinkImpl()
@@ -66,7 +66,7 @@ public class LinkImpl extends BodyElementImpl implements Link
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -77,7 +77,7 @@ public class LinkImpl extends BodyElementImpl implements Link
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public LinkTarget getTarget()
@@ -87,7 +87,7 @@ public class LinkImpl extends BodyElementImpl implements Link
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setTarget(LinkTarget newTarget)
@@ -102,7 +102,7 @@ public class LinkImpl extends BodyElementImpl implements Link
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -118,7 +118,7 @@ public class LinkImpl extends BodyElementImpl implements Link
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -135,7 +135,7 @@ public class LinkImpl extends BodyElementImpl implements Link
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -152,7 +152,7 @@ public class LinkImpl extends BodyElementImpl implements Link
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkTargetImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkTargetImpl.java
index 203254e17b..c154f9a9fe 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkTargetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkTargetImpl.java
@@ -152,8 +152,8 @@ public abstract class LinkTargetImpl extends EObjectImpl implements LinkTarget
     case ArticlePackage.LINK_TARGET__ID:
       return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT.equals(getId());
     case ArticlePackage.LINK_TARGET__DEFAULT_LABEL:
-      return DEFAULT_LABEL_EDEFAULT == null ? getDefaultLabel() != null : !DEFAULT_LABEL_EDEFAULT
-          .equals(getDefaultLabel());
+      return DEFAULT_LABEL_EDEFAULT == null ? getDefaultLabel() != null
+          : !DEFAULT_LABEL_EDEFAULT.equals(getDefaultLabel());
     case ArticlePackage.LINK_TARGET__TOOLTIP:
       return TOOLTIP_EDEFAULT == null ? getTooltip() != null : !TOOLTIP_EDEFAULT.equals(getTooltip());
     }
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginImpl.java
index 4d9ef09019..0cfd32945d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginImpl.java
@@ -38,7 +38,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.PluginImpl#getExtensionPoints <em>Extension Points</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PluginImpl extends EObjectImpl implements Plugin
@@ -46,7 +46,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -55,7 +55,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -65,7 +65,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
   /**
    * The cached value of the '{@link #getPackages() <em>Packages</em>}' containment reference list. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getPackages()
    * @generated
    * @ordered
@@ -75,7 +75,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
   /**
    * The default value of the '{@link #getLabel() <em>Label</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getLabel()
    * @generated
    * @ordered
@@ -85,7 +85,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
   /**
    * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getLabel()
    * @generated
    * @ordered
@@ -95,7 +95,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
   /**
    * The cached value of the '{@link #getExtensionPoints() <em>Extension Points</em>}' containment reference list. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getExtensionPoints()
    * @generated
    * @ordered
@@ -104,7 +104,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected PluginImpl()
@@ -114,7 +114,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -125,7 +125,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -135,7 +135,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -150,7 +150,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EList<JavaPackage> getPackages()
@@ -165,7 +165,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getLabel()
@@ -175,7 +175,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setLabel(String newLabel)
@@ -190,7 +190,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EList<ExtensionPoint> getExtensionPoints()
@@ -205,7 +205,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -224,7 +224,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -242,7 +242,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -264,7 +264,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -293,7 +293,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -319,7 +319,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -341,7 +341,7 @@ public class PluginImpl extends EObjectImpl implements Plugin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java
index 4d0438b038..fd0490d672 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java
@@ -28,14 +28,14 @@ import java.io.IOException;
  * -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class PluginResourceImpl extends ExternalArticleImpl implements PluginResource
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected PluginResourceImpl()
@@ -50,7 +50,7 @@ public class PluginResourceImpl extends ExternalArticleImpl implements PluginRes
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java
index 557e3ab85e..699eb98255 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java
@@ -28,14 +28,14 @@ import java.io.IOException;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Schemadoc</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class SchemadocImpl extends CategoryImpl implements Schemadoc
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected SchemadocImpl()
@@ -50,7 +50,7 @@ public class SchemadocImpl extends CategoryImpl implements Schemadoc
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java
index c77c337c57..19f753899e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java
@@ -249,8 +249,8 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.SNIPPET__FORMATTER, newFormatter,
-          newFormatter));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, ArticlePackage.SNIPPET__FORMATTER, newFormatter, newFormatter));
     }
   }
 
@@ -270,8 +270,8 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
     case ArticlePackage.SNIPPET__FORMATTER:
       if (formatter != null)
       {
-        msgs = ((InternalEObject)formatter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - ArticlePackage.SNIPPET__FORMATTER, null, msgs);
+        msgs = ((InternalEObject)formatter).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - ArticlePackage.SNIPPET__FORMATTER, null, msgs);
       }
       return basicSetFormatter((Formatter)otherEnd, msgs);
     }
@@ -546,7 +546,7 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet
     alt = alt.replaceAll("\"", "&quot;");
 
     return "<a name=\"" + name + nameSuffix + "\" href=\"#" + name + hrefSuffix + "\" alt=\"" + alt + "\" title=\""
-        + alt + "\">" + image + "</a>";
+    + alt + "\">" + image + "</a>";
   }
 
 } // SnippetImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SourceCodeImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SourceCodeImpl.java
index c4ece4dfaa..5e1aa4c90f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SourceCodeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SourceCodeImpl.java
@@ -19,14 +19,14 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Source Code</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class SourceCodeImpl extends ExternalTargetImpl implements SourceCode
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected SourceCodeImpl()
@@ -36,7 +36,7 @@ public class SourceCodeImpl extends ExternalTargetImpl implements SourceCode
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
index 6f86ffad8c..08d8bcf81e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
@@ -211,8 +211,8 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
    */
   public void setParent(StructuralElement newParent)
   {
-    if (newParent != eInternalContainer() || eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT
-        && newParent != null)
+    if (newParent != eInternalContainer()
+        || eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
       {
@@ -606,8 +606,9 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
       file.getParentFile().mkdirs();
       out = new PrintWriter(file);
 
-      out.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
-          + NL);
+      out.write(
+          "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
+              + NL);
       out.write("<HTML>" + NL);
       out.write("" + NL);
       out.write("<HEAD>" + NL);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java
index d0c5fdb866..dd59f99f11 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java
@@ -26,14 +26,14 @@ import java.io.PrintWriter;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Text</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class TextImpl extends BodyElementImpl implements Text
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TextImpl()
@@ -48,7 +48,7 @@ public class TextImpl extends BodyElementImpl implements Text
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextTag.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextTag.java
index 06d8278168..2cbf9fd1af 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextTag.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextTag.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java
index 035b1dea95..c1d734e201 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/XmlFormatterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/XmlFormatterImpl.java
index 1dbb3dafe4..37cb6f33cd 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/XmlFormatterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/XmlFormatterImpl.java
@@ -260,9 +260,9 @@ public class XmlFormatterImpl extends FormatterImpl implements XmlFormatter
     @Override
     public void startDocument() throws SAXException
     {
-      builder
-          .append("<font color=\"#0000e1\">&lt;?xml version=<font color=\"#000080\">'1.0'</font> encoding=<font color=\"#000080\">'UTF-8'</font>?&gt;</font><br/>"
-              + NL);
+      builder.append(
+          "<font color=\"#0000e1\">&lt;?xml version=<font color=\"#000080\">'1.0'</font> encoding=<font color=\"#000080\">'UTF-8'</font>?&gt;</font><br/>"
+          + NL);
     }
 
     @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java
index e6d81c22fb..f76c72d9d5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java
@@ -55,7 +55,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage
  * @generated
  */
@@ -63,14 +63,14 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static ArticlePackage modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ArticleAdapterFactory()
@@ -85,7 +85,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
+   *
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -105,7 +105,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ArticleSwitch<Adapter> modelSwitch = new ArticleSwitch<Adapter>()
@@ -329,7 +329,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -345,7 +345,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Documentation
    * <em>Documentation</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Documentation
    * @generated
@@ -359,7 +359,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Context
    * <em>Context</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Context
    * @generated
@@ -373,7 +373,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Category
    * <em>Category</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Category
    * @generated
@@ -387,7 +387,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Article
    * <em>Article</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Article
    * @generated
@@ -401,7 +401,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Chapter
    * <em>Chapter</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Chapter
    * @generated
@@ -415,7 +415,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Snippet
    * <em>Snippet</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Snippet
    * @generated
@@ -429,7 +429,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Diagram
    * <em>Diagram</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Diagram
    * @generated
@@ -443,7 +443,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Factory
    * <em>Factory</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Factory
    * @generated
@@ -457,7 +457,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.JavaElement
    * <em>Java Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaElement
    * @generated
@@ -472,7 +472,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * <em>Structural Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
    * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.StructuralElement
    * @generated
@@ -486,7 +486,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.LinkTarget
    * <em>Link Target</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.LinkTarget
    * @generated
@@ -500,7 +500,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Callout
    * <em>Callout</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Callout
    * @generated
@@ -515,7 +515,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * <em>Embeddable Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
    * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement
    * @generated
@@ -529,7 +529,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.ExternalTarget
    * <em>External Target</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExternalTarget
    * @generated
@@ -543,7 +543,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Identifiable
    * <em>Identifiable</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Identifiable
    * @generated
@@ -557,7 +557,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Body <em>Body</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Body
    * @generated
@@ -572,7 +572,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * <em>Body Element Container</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
    * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
    * end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer
    * @generated
@@ -586,7 +586,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.BodyElement
    * <em>Body Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.BodyElement
    * @generated
@@ -600,7 +600,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Text <em>Text</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Text
    * @generated
@@ -614,7 +614,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Link <em>Link</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Link
    * @generated
@@ -628,7 +628,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Embedding
    * <em>Embedding</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Embedding
    * @generated
@@ -642,7 +642,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.SourceCode
    * <em>Source Code</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.SourceCode
    * @generated
@@ -656,7 +656,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Plugin <em>Plugin</em>}
    * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
    * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Plugin
    * @generated
@@ -670,7 +670,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.JavaPackage
    * <em>Java Package</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaPackage
    * @generated
@@ -684,7 +684,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Javadoc
    * <em>Javadoc</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Javadoc
    * @generated
@@ -698,7 +698,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.ExternalArticle
    * <em>External Article</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExternalArticle
    * @generated
@@ -712,7 +712,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Schemadoc
    * <em>Schemadoc</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Schemadoc
    * @generated
@@ -726,7 +726,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint
    * <em>Extension Point</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.ExtensionPoint
    * @generated
@@ -740,7 +740,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Toc <em>Toc</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Toc
    * @generated
@@ -754,7 +754,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.PluginResource
    * <em>Plugin Resource</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.PluginResource
    * @generated
@@ -768,7 +768,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Excel <em>Excel</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Excel
    * @generated
@@ -782,7 +782,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Formatter
    * <em>Formatter</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
    * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Formatter
    * @generated
@@ -796,7 +796,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.JavaFormatter
    * <em>Java Formatter</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.JavaFormatter
    * @generated
@@ -810,7 +810,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.XmlFormatter
    * <em>Xml Formatter</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.XmlFormatter
    * @generated
@@ -824,7 +824,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Image <em>Image</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.releng.doc.article.Image
    * @generated
@@ -837,7 +837,7 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleException.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleException.java
index 71b409d6f1..aabd8d4c28 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleException.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleException.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
index 3c90091d48..baf8e5ad7d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
@@ -57,7 +57,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage
  * @generated
  */
@@ -65,14 +65,14 @@ public class ArticleSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static ArticlePackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ArticleSwitch()
@@ -86,7 +86,7 @@ public class ArticleSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -98,7 +98,7 @@ public class ArticleSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -118,7 +118,7 @@ public class ArticleSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -784,7 +784,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Documentation</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Documentation</em>'.
@@ -799,7 +799,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Context</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Context</em>'.
@@ -814,7 +814,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Category</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Category</em>'.
@@ -829,7 +829,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Article</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Article</em>'.
@@ -844,7 +844,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Chapter</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Chapter</em>'.
@@ -859,7 +859,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Snippet</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Snippet</em>'.
@@ -874,7 +874,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Diagram</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Diagram</em>'.
@@ -889,7 +889,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Factory</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Factory</em>'.
@@ -904,7 +904,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Java Element</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Java Element</em>'.
@@ -919,7 +919,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Structural Element</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Structural Element</em>'.
@@ -934,7 +934,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Link Target</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Link Target</em>'.
@@ -949,7 +949,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Callout</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Callout</em>'.
@@ -964,7 +964,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Embeddable Element</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Embeddable Element</em>'.
@@ -979,7 +979,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>External Target</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>External Target</em>'.
@@ -994,7 +994,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Identifiable</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Identifiable</em>'.
@@ -1009,7 +1009,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Body</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Body</em>'.
@@ -1025,7 +1025,7 @@ public class ArticleSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Body Element Container</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Body Element Container</em>'.
@@ -1040,7 +1040,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Body Element</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Body Element</em>'.
@@ -1055,7 +1055,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Text</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Text</em>'.
@@ -1070,7 +1070,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Link</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Link</em>'.
@@ -1085,7 +1085,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Embedding</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Embedding</em>'.
@@ -1100,7 +1100,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Source Code</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Source Code</em>'.
@@ -1115,7 +1115,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Plugin</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Plugin</em>'.
@@ -1130,7 +1130,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Java Package</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Java Package</em>'.
@@ -1145,7 +1145,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Javadoc</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Javadoc</em>'.
@@ -1160,7 +1160,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>External Article</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>External Article</em>'.
@@ -1175,7 +1175,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Schemadoc</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Schemadoc</em>'.
@@ -1190,7 +1190,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Extension Point</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Extension Point</em>'.
@@ -1205,7 +1205,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Toc</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Toc</em>'.
@@ -1220,7 +1220,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Plugin Resource</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Plugin Resource</em>'.
@@ -1235,7 +1235,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Excel</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Excel</em>'.
@@ -1250,7 +1250,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Formatter</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Formatter</em>'.
@@ -1265,7 +1265,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Java Formatter</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Java Formatter</em>'.
@@ -1280,7 +1280,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Xml Formatter</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Xml Formatter</em>'.
@@ -1295,7 +1295,7 @@ public class ArticleSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Image</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Image</em>'.
@@ -1311,7 +1311,7 @@ public class ArticleSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleUtil.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleUtil.java
index a6fb5bfb11..883d8325b2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleUtil.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MakeHrefsRelative.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MakeHrefsRelative.java
index 05c6263ca5..c88ffcc836 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MakeHrefsRelative.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MakeHrefsRelative.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MovePackageDescriptions.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MovePackageDescriptions.java
index 14316918f1..ef15b97ce6 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MovePackageDescriptions.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MovePackageDescriptions.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -25,12 +25,13 @@ public class MovePackageDescriptions
 {
   private static final String NL = System.getProperty("line.separator");
 
-  private static final Pattern PATTERN = Pattern.compile("(.*</H2>\\s*)" //
-      + "(.*<B>See:</B>.*<A HREF=\"#package_description\"><B>Description</B></A>)" // To be replaced...
-      + "(.*)" //
-      + "(<A NAME=\"package_description\"><!-- --></A><H2>.*</H2>.*<P>\\s*)" //
-      + "(.*)" // ... with full description
-      + "(<P>\\s*<P>\\s*<DL>\\s*</DL>\\s*<HR>.*)", //
+  private static final Pattern PATTERN = Pattern.compile(
+      "(.*</H2>\\s*)" //
+          + "(.*<B>See:</B>.*<A HREF=\"#package_description\"><B>Description</B></A>)" // To be replaced...
+          + "(.*)" //
+          + "(<A NAME=\"package_description\"><!-- --></A><H2>.*</H2>.*<P>\\s*)" //
+          + "(.*)" // ... with full description
+          + "(<P>\\s*<P>\\s*<DL>\\s*</DL>\\s*<HR>.*)", //
       Pattern.MULTILINE | Pattern.DOTALL);
 
   public static void main(String[] args) throws IOException
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/SortListItems.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/SortListItems.java
index 1cc1099eb5..2f222b30b3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/SortListItems.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/SortListItems.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF
index 81b57c38f7..7afc1dd1d9 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.releng.help; singleton:=true
-Bundle-Version: 4.1.200.qualifier
+Bundle-Version: 4.1.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -11,16 +11,16 @@ Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=opti
  org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.1.0,5.0.0)",
  org.eclipse.net4j.http.server;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.releng.help;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.contributor;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.online;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.reference;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.reference.api;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.releng;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.releng.building;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.releng.promoting;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.releng.provisioning;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.writer;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.writer.authoring;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.writer.building;version="4.1.200",
- org.eclipse.emf.cdo.releng.help.writer.examples;version="4.1.200"
+Export-Package: org.eclipse.emf.cdo.releng.help;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.contributor;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.online;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.reference;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.reference.api;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.releng;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.releng.building;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.releng.promoting;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.releng.provisioning;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.writer;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.writer.authoring;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.writer.building;version="4.1.300",
+ org.eclipse.emf.cdo.releng.help.writer.examples;version="4.1.300"
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/Legal.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/Legal.java
index c33307f798..4db0d39695 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/Legal.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/Legal.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.help;
 
 /**
  * Legal
- * 
+ *
  * @external about.html
  * @number 666
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/Overview.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/Overview.java
index d883102e6c..c21179cc14 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/Overview.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/Overview.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.releng.help;
  * Overview
  * <p>
  * {@toc}
- * 
+ *
  * @default
  */
 public class Overview
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Bugzilla.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Bugzilla.java
index 870fd7ad0e..fb3303dd17 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Bugzilla.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Bugzilla.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.contributor;
 /**
  * Using Bugzilla
  * <p>
- * 
+ *
  * @number 2
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Infrastructure.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Infrastructure.java
index 569240883f..f09a7925d1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Infrastructure.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Infrastructure.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.contributor;
 /**
  * Project Infrastructure
  * <p>
- * 
+ *
  * @number 1
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Subversion.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Subversion.java
index b5472c3ca5..21c7fdc682 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Subversion.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Subversion.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.contributor;
 /**
  * Using Subversion
  * <p>
- * 
+ *
  * @number 3
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Tools.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Tools.java
index 6def9352fe..4e56a9d0af 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Tools.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/Tools.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.contributor;
 /**
  * Additional Tools
  * <p>
- * 
+ *
  * @number 4
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/package-info.java
index eb7cca4553..f628dbe2ab 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/contributor/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Contributor's Guide
- * 
+ *
  * @number 1
  */
 package org.eclipse.emf.cdo.releng.help.contributor;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/Homepage.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/Homepage.java
index 1dc5d95f35..98f6efc97c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/Homepage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/Homepage.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.help.online;
 
 /**
  * Homepage
- * 
+ *
  * @external http://www.eclipse.org/cdo
  * @number 1
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/Wiki.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/Wiki.java
index 3d9e538d0e..68ec44eb60 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/Wiki.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/Wiki.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.releng.help.online;
 
 /**
  * Wiki
- * 
+ *
  * @external http://wiki.eclipse.org/CDO
  * @number 2
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/package-info.java
index eb2acb68e4..6c941e3b92 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/online/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Online Docs
- * 
+ *
  * @number 555
  */
 package org.eclipse.emf.cdo.releng.help.online;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/reference/api/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/reference/api/package-info.java
index 94dd3b5c10..2a8ea98908 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/reference/api/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/reference/api/package-info.java
@@ -4,14 +4,14 @@
  * 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
  */
 
 /**
  * API Reference
- * 
+ *
  * @number 1
  */
 package org.eclipse.emf.cdo.releng.help.reference.api;
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/reference/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/reference/package-info.java
index 0f24427772..5d037e81c7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/reference/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/reference/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Reference
- * 
+ *
  * @number 444
  */
 package org.eclipse.emf.cdo.releng.help.reference;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/Locally.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/Locally.java
index 5b38bf0ed0..93694b8a02 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/Locally.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/Locally.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.releng.building;
 /**
  * Building Locally
  * <p>
- * 
+ *
  * @number 2
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/OnHudson.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/OnHudson.java
index 24a142a250..ed6130904d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/OnHudson.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/OnHudson.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.releng.building;
 /**
  * Building on Hudson
  * <p>
- * 
+ *
  * @number 1
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/package-info.java
index b025e38a9e..83a8b8758f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/building/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Building
- * 
+ *
  * @number 3
  */
 package org.eclipse.emf.cdo.releng.help.releng.building;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/package-info.java
index ce157d5d36..ab01d39482 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Release Engineer's Guide
- * 
+ *
  * @number 2
  */
 package org.eclipse.emf.cdo.releng.help.releng;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/Extending.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/Extending.java
index 56d19c9113..e26bed4f97 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/Extending.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/Extending.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.releng.promoting;
 /**
  * Extending the Promotion Service
  * <p>
- * 
+ *
  * @number 2
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/Understanding.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/Understanding.java
index a5acd2f499..55440b9b0b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/Understanding.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/Understanding.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.releng.promoting;
 /**
  * Understanding the Promotion Service
  * <p>
- * 
+ *
  * @number 1
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/package-info.java
index cc471500a7..5cb6c76da4 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/promoting/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Promoting
- * 
+ *
  * @number 4
  */
 package org.eclipse.emf.cdo.releng.help.releng.promoting;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/Buckminster.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/Buckminster.java
index baf6ad6231..d09ea2558e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/Buckminster.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/Buckminster.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.releng.provisioning;
 /**
  * Using Buckminster
  * <p>
- * 
+ *
  * @number 1
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/RelengComponent.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/RelengComponent.java
index 5904a6e91d..f4cdb57ec6 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/RelengComponent.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/RelengComponent.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.releng.provisioning;
 /**
  * Maintaining the Releng Component
  * <p>
- * 
+ *
  * @number 2
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/package-info.java
index 53fe1b3b4a..76dde47e44 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/releng/provisioning/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Provisioning
- * 
+ *
  * @number 1
  */
 package org.eclipse.emf.cdo.releng.help.releng.provisioning;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/Articles.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/Articles.java
index 9730ae116f..1dda4878d7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/Articles.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/Articles.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.writer.authoring;
 /**
  * Authoring Articles
  * <p>
- * 
+ *
  * @number 2
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/JavaDocs.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/JavaDocs.java
index 6f29e3248d..68127a63e5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/JavaDocs.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/JavaDocs.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.writer.authoring;
 /**
  * Authoring JavaDocs
  * <p>
- * 
+ *
  * @number 1
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/package-info.java
index 07e4639c52..37ddb8f3d7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/authoring/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Authoring Documentations
- * 
+ *
  * @number 1
  */
 package org.eclipse.emf.cdo.releng.help.writer.authoring;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/Generator.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/Generator.java
index a015799c09..23de39be34 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/Generator.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/Generator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.writer.building;
 /**
  * Generating Documentations
  * <p>
- * 
+ *
  * @number 2
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/Plugins.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/Plugins.java
index bc3a6cd337..0cacff1fbf 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/Plugins.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/Plugins.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.releng.help.writer.building;
 /**
  * Assembling Plugins
  * <p>
- * 
+ *
  * @number 1
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/package-info.java
index 159f73812b..fbf8df8038 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/building/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Building Documentations
- * 
+ *
  * @number 2
  */
 package org.eclipse.emf.cdo.releng.help.writer.building;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/ConnectingToRepositories.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/ConnectingToRepositories.java
index e02c49f7cc..9748e4c152 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/ConnectingToRepositories.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/ConnectingToRepositories.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/CreatingTransportConnections.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/CreatingTransportConnections.java
index 0fa03e4c27..40683a8aaf 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/CreatingTransportConnections.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/CreatingTransportConnections.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -49,7 +49,7 @@ import java.nio.channels.SocketChannel;
  * ultricies dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus.
  * <p>
  * <b>Table of Contents</b> {@toc}
- * 
+ *
  * @author Eike Stepper
  */
 public class CreatingTransportConnections
@@ -65,7 +65,7 @@ public class CreatingTransportConnections
    * <li><b>HTTP</b> to connect to an {@link IHTTPAcceptor} that is made available by a servlet.
    * </ul>
    * Continue with {@link SetConnectionTimeout}.
-   * 
+   *
    * @see SetBufferCapacity
    */
   public class SelectTransportType
@@ -172,7 +172,7 @@ class Snippets
     {
     }
 
-    public void multiplexChannel(InternalChannel /* callout */channel)
+    public void multiplexChannel(InternalChannel /* callout */ channel)
     {
     }
 
@@ -184,8 +184,7 @@ class Snippets
     }
 
     @Override
-    protected void registerChannelWithPeer(short channelID, long timeout, IProtocol<?> protocol)
-        throws ChannelException
+    protected void registerChannelWithPeer(short channelID, long timeout, IProtocol<?> protocol) throws ChannelException
     {
     }
     // snap
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/XmlSnippets.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/XmlSnippets.java
index cdd49d8252..97a00541e2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/XmlSnippets.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/XmlSnippets.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/package-info.java
index 717a8319ca..860c86ec44 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/examples/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Examples
- * 
+ *
  * @number 3
  */
 package org.eclipse.emf.cdo.releng.help.writer.examples;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/package-info.java b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/package-info.java
index 437291088f..ca0ac22ba0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.releng.help/src/org/eclipse/emf/cdo/releng/help/writer/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Technical Writer's Guide
- * 
+ *
  * @number 3
  */
 package org.eclipse.emf.cdo.releng.help.writer;
-
diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF
index 52d6cc3363..a664806506 100644
--- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.releng.relativepaths;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.releng.relativepaths;version="1.0.200";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng.relativepaths;version="1.0.300";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng.relativepaths/src/org/eclipse/emf/cdo/releng/relativepaths/CreateRelativePathAction.java b/plugins/org.eclipse.emf.cdo.releng.relativepaths/src/org/eclipse/emf/cdo/releng/relativepaths/CreateRelativePathAction.java
index a922578105..c34a560899 100644
--- a/plugins/org.eclipse.emf.cdo.releng.relativepaths/src/org/eclipse/emf/cdo/releng/relativepaths/CreateRelativePathAction.java
+++ b/plugins/org.eclipse.emf.cdo.releng.relativepaths/src/org/eclipse/emf/cdo/releng/relativepaths/CreateRelativePathAction.java
@@ -70,8 +70,8 @@ public class CreateRelativePathAction implements IObjectActionDelegate
       String link = createLink(source, target);
 
       copyToClipboard(shell.getDisplay(), link);
-      MessageDialog.openInformation(shell, TITLE, "The following relative path has been copied to the clipboard:\n"
-          + link);
+      MessageDialog.openInformation(shell, TITLE,
+          "The following relative path has been copied to the clipboard:\n" + link);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.tasks/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.tasks/META-INF/MANIFEST.MF
index 78baa98689..ab0e26e29f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.tasks/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.tasks/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.releng.tasks;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.nebula.widgets.grid;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.cdo.releng.tasks;version="1.0.200";x-internal:=true,
- org.eclipse.emf.cdo.releng.tasks.decorators;version="1.0.200";x-internal:=true,
- org.eclipse.emf.cdo.releng.tasks.handlers;version="1.0.200";x-internal:=true,
- org.eclipse.emf.cdo.releng.tasks.table;version="1.0.200";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng.tasks;version="1.0.300";x-internal:=true,
+ org.eclipse.emf.cdo.releng.tasks.decorators;version="1.0.300";x-internal:=true,
+ org.eclipse.emf.cdo.releng.tasks.handlers;version="1.0.300";x-internal:=true,
+ org.eclipse.emf.cdo.releng.tasks.table;version="1.0.300";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng.tasks/src/org/eclipse/emf/cdo/releng/tasks/table/TaskModel.java b/plugins/org.eclipse.emf.cdo.releng.tasks/src/org/eclipse/emf/cdo/releng/tasks/table/TaskModel.java
index 90939d27e1..6f349da47b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.tasks/src/org/eclipse/emf/cdo/releng/tasks/table/TaskModel.java
+++ b/plugins/org.eclipse.emf.cdo.releng.tasks/src/org/eclipse/emf/cdo/releng/tasks/table/TaskModel.java
@@ -183,12 +183,12 @@ public class TaskModel
         logicalTask.getVersionTasks().add(versionTask);
 
         Activator.getDefault().getLog()
-            .log(new Status(IStatus.INFO, Activator.PLUGIN_ID, "Version " + version + " added to task " + logicalTask));
+        .log(new Status(IStatus.INFO, Activator.PLUGIN_ID, "Version " + version + " added to task " + logicalTask));
       }
       catch (Exception ex)
       {
         Activator.getDefault().getLog()
-            .log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Processing task " + task.getTaskId() + " failed", ex));
+        .log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Processing task " + task.getTaskId() + " failed", ex));
         ex.printStackTrace();
 
         // Cleanup
diff --git a/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF
index 9326719933..87f793fa36 100644
--- a/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Release Engineering
 Bundle-SymbolicName: org.eclipse.emf.cdo.releng
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.releng;version="4.2.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng;version="4.2.200";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java
index e576fbca78..ab1f01a54e 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Api2Html.java
@@ -54,8 +54,8 @@ public class Api2Html extends DefaultHandler
 
   private static final String NO_DOCS = "";
 
-  private static final Pattern VERSION_CHANGED = Pattern
-      .compile("The ([^ ]+) version has been changed for the api component ([^ ]+) \\(from version ([^ ]+) to ([^ ]+)\\)");
+  private static final Pattern VERSION_CHANGED = Pattern.compile(
+      "The ([^ ]+) version has been changed for the api component ([^ ]+) \\(from version ([^ ]+) to ([^ ]+)\\)");
 
   private int lastNodeID;
 
@@ -379,7 +379,7 @@ public class Api2Html extends DefaultHandler
     {
       // Just for local testing!
       args = new String[] { "/develop", "R20120918-0947", "/develop/git/cdo/plugins",
-          "/develop/ws/cdo/.buckminster/tp/plugins" };
+      "/develop/ws/cdo/.buckminster/tp/plugins" };
     }
 
     new Api2Html(new File(args[0]), args[1], new File(args[2]), new File(args[3]));
@@ -477,7 +477,7 @@ public class Api2Html extends DefaultHandler
     {
       String href = getHref();
       out.print(indent + getIcon() + " " + (href != null ? "<a href='" + href + "' target='_blank'>" : "") + getText()
-          + (href != null ? "</a>" : ""));
+      + (href != null ? "</a>" : ""));
     }
 
     protected String getHref() throws Exception
@@ -502,9 +502,9 @@ public class Api2Html extends DefaultHandler
     @Override
     public void generate(PrintStream out, String indent) throws Exception
     {
-      out.print(indent + "<div class='" + getClass().getSimpleName().toLowerCase()
-          + "'><a href=\"javascript:toggle('node" + id + "')\"><img src='" + (isCollapsed() ? PLUS : MINUS)
-          + "' id='img_node" + id + "'></a>");
+      out.print(
+          indent + "<div class='" + getClass().getSimpleName().toLowerCase() + "'><a href=\"javascript:toggle('node"
+              + id + "')\"><img src='" + (isCollapsed() ? PLUS : MINUS) + "' id='img_node" + id + "'></a>");
       super.generate(out, "");
       out.println("</div>");
 
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java
index 8b29225dac..d4b9b6e601 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java
@@ -129,7 +129,8 @@ public class GenerateExampleBuilders
 
     Pattern pattern = Pattern.compile(
         "(\\s*<buildCommand>.*?</buildCommand>)*(\\s*<buildCommand>.*?<value>&lt;project&gt;/\\.externalToolBuilders/"
-            + targetProject.getName().replace(".", "\\.") + "\\.launch</value>.*?</buildCommand>)", Pattern.DOTALL);
+            + targetProject.getName().replace(".", "\\.") + "\\.launch</value>.*?</buildCommand>)",
+        Pattern.DOTALL);
     Matcher matcher = pattern.matcher(description);
     if (matcher.find())
     {
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Main.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Main.java
index 05ba222f69..c6d486ef8f 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Main.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/Main.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintReleaseDeliverablesForPlan.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintReleaseDeliverablesForPlan.java
index aee9460582..7cdd36f280 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintReleaseDeliverablesForPlan.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/PrintReleaseDeliverablesForPlan.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.security.edit/META-INF/MANIFEST.MF
index 29d0bc6029..90fa7190fe 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.security.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.security.edit;singleton:=true
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.cdo.security.provider.SecurityEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AndFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AndFilterItemProvider.java
index 16286277de..be3bc76403 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AndFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AndFilterItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  * @generated
  */
 public class AndFilterItemProvider extends CombinedFilterItemProvider 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.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java
index 6ea8727874..69a924775e 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class AssigneeItemProvider extends SecurityItemItemProvider 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,11 +81,11 @@ public class AssigneeItemProvider extends SecurityItemItemProvider implements IE
    */
   protected void addRolesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Assignee_roles_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Assignee_roles_feature", "_UI_Assignee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.ASSIGNEE__ROLES, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Assignee_roles_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Assignee_roles_feature", "_UI_Assignee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.ASSIGNEE__ROLES, true, false, true, null, null, null));
   }
 
   /**
@@ -96,13 +96,12 @@ public class AssigneeItemProvider extends SecurityItemItemProvider implements IE
    */
   protected void addIdPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_Assignee_id_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Assignee_id_feature", "_UI_Assignee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.ASSIGNEE__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Assignee_id_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Assignee_id_feature", "_UI_Assignee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.ASSIGNEE__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -126,7 +125,8 @@ public class AssigneeItemProvider extends SecurityItemItemProvider implements IE
   public String getText(Object object)
   {
     String label = ((Assignee)object).getId();
-    return label == null || label.length() == 0 ? getString("_UI_Assignee_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_Assignee_type") //$NON-NLS-1$
+        :
         getString("_UI_Assignee_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java
index be349d3164..6cc56fc428 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @generated
  */
 public class ClassFilterItemProvider extends PermissionFilterItemProvider 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.
@@ -83,13 +83,12 @@ public class ClassFilterItemProvider extends PermissionFilterItemProvider implem
    */
   protected void addApplicableClassPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_ClassFilter_applicableClass_feature"), //$NON-NLS-1$
-        getString(
-            "_UI_PropertyDescriptor_description", "_UI_ClassFilter_applicableClass_feature", "_UI_ClassFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.CLASS_FILTER__APPLICABLE_CLASS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_ClassFilter_applicableClass_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_ClassFilter_applicableClass_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ClassFilter_type"), //$NON-NLS-1$
+            SecurityPackage.Literals.CLASS_FILTER__APPLICABLE_CLASS, true, false, true, null, null, null));
   }
 
   /**
@@ -100,13 +99,12 @@ public class ClassFilterItemProvider extends PermissionFilterItemProvider implem
    */
   protected void addSubTypesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_ClassFilter_subTypes_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_ClassFilter_subTypes_feature", "_UI_ClassFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.CLASS_FILTER__SUB_TYPES, true, false, false,
-        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_ClassFilter_subTypes_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_ClassFilter_subTypes_feature", "_UI_ClassFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.CLASS_FILTER__SUB_TYPES, true, false, false,
+            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java
index b091dde7d6..0181d7d7f9 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java
@@ -48,8 +48,8 @@ import java.util.List;
  */
 @Deprecated
 public class ClassPermissionItemProvider extends PermissionItemProvider 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.
@@ -88,55 +88,56 @@ public class ClassPermissionItemProvider extends PermissionItemProvider implemen
    */
   protected void addApplicableClassPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_ClassPermission_applicableClass_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_ClassPermission_applicableClass_feature",
-            "_UI_ClassPermission_type"), SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, true, false,
-        true, null, null, null)
-    {
-      @Override
-      public Collection<?> getChoiceOfValues(Object object)
-      {
-        if (object instanceof ClassPermission)
+    itemPropertyDescriptors
+        .add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_ClassPermission_applicableClass_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_ClassPermission_applicableClass_feature",
+                "_UI_ClassPermission_type"),
+            SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, true, false, true, null, null, null)
         {
-          ClassPermission classPermission = (ClassPermission)object;
-          CDOView view = classPermission.cdoView();
-          if (view != null)
+          @Override
+          public Collection<?> getChoiceOfValues(Object object)
           {
-            List<EClass> result = new ArrayList<EClass>();
-            for (CDOPackageInfo packageInfo : view.getSession().getPackageRegistry().getPackageInfos())
+            if (object instanceof ClassPermission)
             {
-              for (EClassifier classifier : packageInfo.getEPackage().getEClassifiers())
+              ClassPermission classPermission = (ClassPermission)object;
+              CDOView view = classPermission.cdoView();
+              if (view != null)
               {
-                if (classifier instanceof EClass)
+                List<EClass> result = new ArrayList<EClass>();
+                for (CDOPackageInfo packageInfo : view.getSession().getPackageRegistry().getPackageInfos())
                 {
-                  result.add((EClass)classifier);
-
+                  for (EClassifier classifier : packageInfo.getEPackage().getEClassifiers())
+                  {
+                    if (classifier instanceof EClass)
+                    {
+                      result.add((EClass)classifier);
+
+                    }
+                  }
                 }
-              }
-            }
 
-            Collections.sort(result, new Comparator<EClass>()
-            {
-              public int compare(EClass c1, EClass c2)
-              {
-                int comparison = c1.getName().compareTo(c2.getName());
-                if (comparison == 0)
+                Collections.sort(result, new Comparator<EClass>()
                 {
-                  comparison = c1.getEPackage().getNsURI().compareTo(c2.getEPackage().getNsURI());
-                }
-
-                return comparison;
+                  public int compare(EClass c1, EClass c2)
+                  {
+                    int comparison = c1.getName().compareTo(c2.getName());
+                    if (comparison == 0)
+                    {
+                      comparison = c1.getEPackage().getNsURI().compareTo(c2.getEPackage().getNsURI());
+                    }
+
+                    return comparison;
+                  }
+                });
+
+                return result;
               }
-            });
+            }
 
-            return result;
+            return super.getChoiceOfValues(object);
           }
-        }
-
-        return super.getChoiceOfValues(object);
-      }
-    });
+        });
   }
 
   /**
@@ -180,7 +181,8 @@ public class ClassPermissionItemProvider extends PermissionItemProvider implemen
       label += " " + applicableClass.getName();
     }
 
-    return label == null || label.length() == 0 ? getString("_UI_ClassPermission_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_ClassPermission_type") //$NON-NLS-1$
+        :
         label;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java
index ac3db1e288..2ec7a0b6b8 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @generated
  */
 public class CombinedFilterItemProvider extends PermissionFilterItemProvider 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.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java
index 4b1a182e3c..716b1cad86 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @generated
  */
 public class DirectoryItemProvider extends SecurityItemItemProvider 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.
@@ -82,13 +82,12 @@ public class DirectoryItemProvider extends SecurityItemItemProvider implements I
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_Directory_name_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Directory_name_feature", "_UI_Directory_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.DIRECTORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Directory_name_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Directory_name_feature", "_UI_Directory_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.DIRECTORY__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -157,7 +156,8 @@ public class DirectoryItemProvider extends SecurityItemItemProvider implements I
   public String getText(Object object)
   {
     String label = ((Directory)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Directory_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_Directory_type") //$NON-NLS-1$
+        :
         label;
   }
 
@@ -197,17 +197,17 @@ public class DirectoryItemProvider extends SecurityItemItemProvider implements I
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS,
-        SecurityFactory.eINSTANCE.createDirectory()));
+    newChildDescriptors.add(
+        createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createDirectory()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS,
-        SecurityFactory.eINSTANCE.createRole()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createRole()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS,
-        SecurityFactory.eINSTANCE.createGroup()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createGroup()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS,
-        SecurityFactory.eINSTANCE.createUser()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.DIRECTORY__ITEMS, SecurityFactory.eINSTANCE.createUser()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java
index d33d859005..46096843ae 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @generated
  */
 public class ExpressionFilterItemProvider extends ObjectFilterItemProvider 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.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java
index be04c676d8..93c4587da4 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java
@@ -45,8 +45,8 @@ import java.util.List;
  * @generated
  */
 public class FilterPermissionItemProvider extends PermissionItemProvider 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.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java
index a9b2b8bb1c..a2da8e5324 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java
@@ -38,8 +38,8 @@ import java.util.List;
  * @generated
  */
 public class GroupItemProvider extends AssigneeItemProvider 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,11 +80,11 @@ public class GroupItemProvider extends AssigneeItemProvider implements IEditingD
    */
   protected void addUsersPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Group_users_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Group_users_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.GROUP__USERS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Group_users_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Group_users_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.GROUP__USERS, true, false, true, null, null, null));
   }
 
   /**
@@ -95,11 +95,11 @@ public class GroupItemProvider extends AssigneeItemProvider implements IEditingD
    */
   protected void addInheritedGroupsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Group_inheritedGroups_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Group_inheritedGroups_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.GROUP__INHERITED_GROUPS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Group_inheritedGroups_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Group_inheritedGroups_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.GROUP__INHERITED_GROUPS, true, false, true, null, null, null));
   }
 
   /**
@@ -110,11 +110,11 @@ public class GroupItemProvider extends AssigneeItemProvider implements IEditingD
    */
   protected void addInheritingGroupsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Group_inheritingGroups_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Group_inheritingGroups_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.GROUP__INHERITING_GROUPS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Group_inheritingGroups_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Group_inheritingGroups_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.GROUP__INHERITING_GROUPS, true, false, true, null, null, null));
   }
 
   /**
@@ -150,7 +150,8 @@ public class GroupItemProvider extends AssigneeItemProvider implements IEditingD
   public String getText(Object object)
   {
     String label = ((Group)object).getId();
-    return label == null || label.length() == 0 ? getString("_UI_Group_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_Group_type") //$NON-NLS-1$
+        :
         label;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java
index 278df7c5b8..f9eeff0e95 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  * @generated
  */
 public class LinkedFilterItemProvider extends PermissionFilterItemProvider 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.
@@ -79,11 +79,11 @@ public class LinkedFilterItemProvider extends PermissionFilterItemProvider imple
    */
   protected void addFilterPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_LinkedFilter_filter_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_LinkedFilter_filter_feature", "_UI_LinkedFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.LINKED_FILTER__FILTER, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_LinkedFilter_filter_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_LinkedFilter_filter_feature", "_UI_LinkedFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.LINKED_FILTER__FILTER, true, false, true, null, null, null));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/NotFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/NotFilterItemProvider.java
index e807d4f36d..ffc6e45e79 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/NotFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/NotFilterItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  * @generated
  */
 public class NotFilterItemProvider extends CombinedFilterItemProvider 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.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectFilterItemProvider.java
index 9941a73b52..7687bb7ea6 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectFilterItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  * @generated
  */
 public class ObjectFilterItemProvider extends PermissionFilterItemProvider 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.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectPermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectPermissionItemProvider.java
index a6f84af7a8..84ad636ef9 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectPermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectPermissionItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  */
 @Deprecated
 public class ObjectPermissionItemProvider extends PermissionItemProvider 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.
@@ -92,7 +92,8 @@ public class ObjectPermissionItemProvider extends PermissionItemProvider impleme
   {
     Access labelValue = ((ObjectPermission)object).getAccess();
     String label = labelValue == null ? null : labelValue.toString();
-    return label == null || label.length() == 0 ? getString("_UI_ObjectPermission_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_ObjectPermission_type") //$NON-NLS-1$
+        :
         getString("_UI_ObjectPermission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/OrFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/OrFilterItemProvider.java
index 1293114e19..131299063a 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/OrFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/OrFilterItemProvider.java
@@ -37,8 +37,8 @@ import java.util.List;
  * @generated
  */
 public class OrFilterItemProvider extends CombinedFilterItemProvider 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.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java
index a0fe08af7b..992bbe0055 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java
@@ -39,8 +39,8 @@ import java.util.List;
  * @generated
  */
 public class PackageFilterItemProvider extends PermissionFilterItemProvider 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,11 +80,10 @@ public class PackageFilterItemProvider extends PermissionFilterItemProvider impl
   protected void addApplicablePackagePropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_PackageFilter_applicablePackage_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_PackageFilter_applicablePackage_feature", "_UI_PackageFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_PackageFilter_applicablePackage_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_PackageFilter_applicablePackage_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_PackageFilter_type"), //$NON-NLS-1$
             SecurityPackage.Literals.PACKAGE_FILTER__APPLICABLE_PACKAGE, true, false, true, null, null, null));
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java
index 07eaea1577..8451454c3c 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java
@@ -47,8 +47,8 @@ import java.util.List;
  */
 @Deprecated
 public class PackagePermissionItemProvider extends PermissionItemProvider 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,42 +87,43 @@ public class PackagePermissionItemProvider extends PermissionItemProvider implem
    */
   protected void addApplicablePackagePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-        .getRootAdapterFactory(), getResourceLocator(), getString("_UI_PackagePermission_applicablePackage_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_PackagePermission_applicablePackage_feature",
-            "_UI_PackagePermission_type"), SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, true,
-        false, true, null, null, null)
-    {
-      @Override
-      public Collection<?> getChoiceOfValues(Object object)
-      {
-        if (object instanceof PackagePermission)
+    itemPropertyDescriptors
+        .add(new ItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_PackagePermission_applicablePackage_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_PackagePermission_applicablePackage_feature",
+                "_UI_PackagePermission_type"),
+            SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, true, false, true, null, null, null)
         {
-          PackagePermission packagePermission = (PackagePermission)object;
-          CDOView view = packagePermission.cdoView();
-          if (view != null)
+          @Override
+          public Collection<?> getChoiceOfValues(Object object)
           {
-            List<EPackage> result = new ArrayList<EPackage>();
-            for (CDOPackageInfo packageInfo : view.getSession().getPackageRegistry().getPackageInfos())
-            {
-              result.add(packageInfo.getEPackage());
-            }
-
-            Collections.sort(result, new Comparator<EPackage>()
+            if (object instanceof PackagePermission)
             {
-              public int compare(EPackage p1, EPackage p2)
+              PackagePermission packagePermission = (PackagePermission)object;
+              CDOView view = packagePermission.cdoView();
+              if (view != null)
               {
-                return p1.getNsURI().compareTo(p2.getNsURI());
+                List<EPackage> result = new ArrayList<EPackage>();
+                for (CDOPackageInfo packageInfo : view.getSession().getPackageRegistry().getPackageInfos())
+                {
+                  result.add(packageInfo.getEPackage());
+                }
+
+                Collections.sort(result, new Comparator<EPackage>()
+                {
+                  public int compare(EPackage p1, EPackage p2)
+                  {
+                    return p1.getNsURI().compareTo(p2.getNsURI());
+                  }
+                });
+
+                return result;
               }
-            });
+            }
 
-            return result;
+            return super.getChoiceOfValues(object);
           }
-        }
-
-        return super.getChoiceOfValues(object);
-      }
-    });
+        });
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java
index 3da7771606..eb1de52640 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
  * @generated
  */
 public class PermissionFilterItemProvider extends ItemProviderAdapter 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.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java
index ab7458b074..523bc1a78f 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java
@@ -44,8 +44,8 @@ import java.util.List;
  * @generated
  */
 public class PermissionItemProvider extends ItemProviderAdapter 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,13 +84,12 @@ public class PermissionItemProvider extends ItemProviderAdapter implements IEdit
    */
   protected void addAccessPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_Permission_access_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Permission_access_feature", "_UI_Permission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.PERMISSION__ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Permission_access_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Permission_access_feature", "_UI_Permission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.PERMISSION__ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -126,7 +125,8 @@ public class PermissionItemProvider extends ItemProviderAdapter implements IEdit
   {
     Access labelValue = ((Permission)object).getAccess();
     String label = labelValue == null ? null : labelValue.toString();
-    return label == null || label.length() == 0 ? getString("_UI_Permission_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_Permission_type") //$NON-NLS-1$
+        :
         getString("_UI_Permission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java
index 144f73cbef..13b041980e 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @generated
  */
 public class RealmItemProvider extends SecurityElementItemProvider 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,11 +87,11 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
    */
   protected void addAllPermissionsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Realm_allPermissions_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Realm_allPermissions_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.REALM__ALL_PERMISSIONS, false, false, false, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Realm_allPermissions_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Realm_allPermissions_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.REALM__ALL_PERMISSIONS, false, false, false, null, null, null));
   }
 
   /**
@@ -102,13 +102,12 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_Realm_name_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Realm_name_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.REALM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Realm_name_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Realm_name_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.REALM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -119,13 +118,12 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
    */
   protected void addDefaultAccessPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_Realm_defaultAccess_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultAccess_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.REALM__DEFAULT_ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Realm_defaultAccess_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultAccess_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.REALM__DEFAULT_ACCESS, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -137,11 +135,11 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
    */
   protected void addDefaultUserDirectoryPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Realm_defaultUserDirectory_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultUserDirectory_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.REALM__DEFAULT_USER_DIRECTORY, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Realm_defaultUserDirectory_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultUserDirectory_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.REALM__DEFAULT_USER_DIRECTORY, true, false, true, null, null, null));
   }
 
   /**
@@ -153,11 +151,12 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
    */
   protected void addDefaultGroupDirectoryPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Realm_defaultGroupDirectory_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultGroupDirectory_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.REALM__DEFAULT_GROUP_DIRECTORY, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Realm_defaultGroupDirectory_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultGroupDirectory_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_Realm_type"), //$NON-NLS-1$
+            SecurityPackage.Literals.REALM__DEFAULT_GROUP_DIRECTORY, true, false, true, null, null, null));
   }
 
   /**
@@ -169,11 +168,11 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
    */
   protected void addDefaultRoleDirectoryPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Realm_defaultRoleDirectory_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultRoleDirectory_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.REALM__DEFAULT_ROLE_DIRECTORY, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Realm_defaultRoleDirectory_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultRoleDirectory_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.REALM__DEFAULT_ROLE_DIRECTORY, true, false, true, null, null, null));
   }
 
   /**
@@ -242,7 +241,8 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
   public String getText(Object object)
   {
     String label = ((Realm)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Realm_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_Realm_type") //$NON-NLS-1$
+        :
         label;
   }
 
@@ -283,17 +283,17 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS,
-        SecurityFactory.eINSTANCE.createDirectory()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createDirectory()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS,
-        SecurityFactory.eINSTANCE.createRole()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createRole()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS,
-        SecurityFactory.eINSTANCE.createGroup()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createGroup()));
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS,
-        SecurityFactory.eINSTANCE.createUser()));
+    newChildDescriptors
+        .add(createChildParameter(SecurityPackage.Literals.REALM__ITEMS, SecurityFactory.eINSTANCE.createUser()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java
index 361c112a93..c6c511e7e4 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @generated
  */
 public class ResourceFilterItemProvider extends PermissionFilterItemProvider 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.
@@ -90,13 +90,13 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider imp
    */
   protected void addPathPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_ResourceFilter_path_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_path_feature", "_UI_ResourceFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.RESOURCE_FILTER__PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_ResourceFilter_path_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_path_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourceFilter_type"), //$NON-NLS-1$
+            SecurityPackage.Literals.RESOURCE_FILTER__PATH, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -108,12 +108,10 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider imp
   protected void addPatternStylePropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_ResourceFilter_patternStyle_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_ResourceFilter_patternStyle_feature", "_UI_ResourceFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_ResourceFilter_patternStyle_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_patternStyle_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourceFilter_type"), //$NON-NLS-1$
             SecurityPackage.Literals.RESOURCE_FILTER__PATTERN_STYLE, true, false, false,
             ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
@@ -127,12 +125,10 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider imp
   protected void addFoldersPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_ResourceFilter_folders_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_ResourceFilter_folders_feature", "_UI_ResourceFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_ResourceFilter_folders_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_folders_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourceFilter_type"), //$NON-NLS-1$
             SecurityPackage.Literals.RESOURCE_FILTER__FOLDERS, true, false, false,
             ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
@@ -146,12 +142,10 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider imp
   protected void addModelResourcesPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_ResourceFilter_modelResources_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelResources_feature", "_UI_ResourceFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_ResourceFilter_modelResources_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelResources_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourceFilter_type"), //$NON-NLS-1$
             SecurityPackage.Literals.RESOURCE_FILTER__MODEL_RESOURCES, true, false, false,
             ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
@@ -165,12 +159,10 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider imp
   protected void addModelObjectsPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_ResourceFilter_modelObjects_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelObjects_feature", "_UI_ResourceFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_ResourceFilter_modelObjects_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelObjects_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourceFilter_type"), //$NON-NLS-1$
             SecurityPackage.Literals.RESOURCE_FILTER__MODEL_OBJECTS, true, false, false,
             ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
@@ -184,12 +176,10 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider imp
   protected void addIncludeParentsPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_ResourceFilter_includeParents_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeParents_feature", "_UI_ResourceFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_ResourceFilter_includeParents_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeParents_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourceFilter_type"), //$NON-NLS-1$
             SecurityPackage.Literals.RESOURCE_FILTER__INCLUDE_PARENTS, true, false, false,
             ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
@@ -202,14 +192,13 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider imp
    */
   protected void addIncludeRootPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_ResourceFilter_includeRoot_feature"), //$NON-NLS-1$
-        getString(
-            "_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeRoot_feature", "_UI_ResourceFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.RESOURCE_FILTER__INCLUDE_ROOT, true, false, false,
-        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_ResourceFilter_includeRoot_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeRoot_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourceFilter_type"), //$NON-NLS-1$
+            SecurityPackage.Literals.RESOURCE_FILTER__INCLUDE_ROOT, true, false, false,
+            ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -221,12 +210,10 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider imp
   protected void addTextResourcesPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_ResourceFilter_textResources_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_ResourceFilter_textResources_feature", "_UI_ResourceFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_ResourceFilter_textResources_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_textResources_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourceFilter_type"), //$NON-NLS-1$
             SecurityPackage.Literals.RESOURCE_FILTER__TEXT_RESOURCES, true, false, false,
             ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
@@ -240,12 +227,10 @@ public class ResourceFilterItemProvider extends PermissionFilterItemProvider imp
   protected void addBinaryResourcesPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_ResourceFilter_binaryResources_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_ResourceFilter_binaryResources_feature", "_UI_ResourceFilter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_ResourceFilter_binaryResources_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_binaryResources_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourceFilter_type"), //$NON-NLS-1$
             SecurityPackage.Literals.RESOURCE_FILTER__BINARY_RESOURCES, true, false, false,
             ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java
index 4d935b70a8..11617988a8 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  */
 @Deprecated
 public class ResourcePermissionItemProvider extends PermissionItemProvider 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.
@@ -83,12 +83,10 @@ public class ResourcePermissionItemProvider extends PermissionItemProvider imple
   protected void addPatternPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_ResourcePermission_pattern_feature"), //$NON-NLS-1$
-            getString(
-                "_UI_PropertyDescriptor_description", "_UI_ResourcePermission_pattern_feature", "_UI_ResourcePermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_ResourcePermission_pattern_feature"), //$NON-NLS-1$
+        getString("_UI_PropertyDescriptor_description", "_UI_ResourcePermission_pattern_feature", //$NON-NLS-1$ //$NON-NLS-2$
+                "_UI_ResourcePermission_type"), //$NON-NLS-1$
             SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, true, false, false,
             ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java
index 31d955e1ad..e442f19ab9 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java
@@ -44,8 +44,8 @@ import java.util.List;
  * @generated
  */
 public class RoleItemProvider extends SecurityItemItemProvider 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.
@@ -85,11 +85,11 @@ public class RoleItemProvider extends SecurityItemItemProvider implements IEditi
    */
   protected void addAssigneesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Role_assignees_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Role_assignees_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.ROLE__ASSIGNEES, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Role_assignees_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_Role_assignees_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.ROLE__ASSIGNEES, true, false, true, null, null, null));
   }
 
   /**
@@ -173,7 +173,8 @@ public class RoleItemProvider extends SecurityItemItemProvider implements IEditi
   public String getText(Object object)
   {
     String label = ((Role)object).getId();
-    return label == null || label.length() == 0 ? getString("_UI_Role_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_Role_type") //$NON-NLS-1$
+        :
         label;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityElementItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityElementItemProvider.java
index 9f8fe5f0f4..c66f52795e 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityElementItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityElementItemProvider.java
@@ -36,8 +36,8 @@ import java.util.List;
  * @generated
  */
 public class SecurityElementItemProvider 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.
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemItemProvider.java
index c2316e7a18..8b6d24ebb7 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemItemProvider.java
@@ -34,8 +34,8 @@ import java.util.List;
  * @generated
  */
 public class SecurityItemItemProvider extends SecurityElementItemProvider 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.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
index c885abb8c2..efd93d1d7e 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java
@@ -50,8 +50,8 @@ import java.util.List;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable, IChildCreationExtender
+public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -636,7 +636,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory i
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
       {
         return adapter;
       }
@@ -714,7 +714,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory i
   }
 
   /**
-   * This disposes all of the item providers created by this factory. 
+   * This disposes all of the item providers created by this factory.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -722,41 +722,77 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory i
   public void dispose()
   {
     if (realmItemProvider != null)
+    {
       realmItemProvider.dispose();
+    }
     if (directoryItemProvider != null)
+    {
       directoryItemProvider.dispose();
+    }
     if (roleItemProvider != null)
+    {
       roleItemProvider.dispose();
+    }
     if (groupItemProvider != null)
+    {
       groupItemProvider.dispose();
+    }
     if (userItemProvider != null)
+    {
       userItemProvider.dispose();
+    }
     if (userPasswordItemProvider != null)
+    {
       userPasswordItemProvider.dispose();
+    }
     if (classPermissionItemProvider != null)
+    {
       classPermissionItemProvider.dispose();
+    }
     if (packagePermissionItemProvider != null)
+    {
       packagePermissionItemProvider.dispose();
+    }
     if (resourcePermissionItemProvider != null)
+    {
       resourcePermissionItemProvider.dispose();
+    }
     if (filterPermissionItemProvider != null)
+    {
       filterPermissionItemProvider.dispose();
+    }
     if (linkedFilterItemProvider != null)
+    {
       linkedFilterItemProvider.dispose();
+    }
     if (packageFilterItemProvider != null)
+    {
       packageFilterItemProvider.dispose();
+    }
     if (classFilterItemProvider != null)
+    {
       classFilterItemProvider.dispose();
+    }
     if (resourceFilterItemProvider != null)
+    {
       resourceFilterItemProvider.dispose();
+    }
     if (expressionFilterItemProvider != null)
+    {
       expressionFilterItemProvider.dispose();
+    }
     if (notFilterItemProvider != null)
+    {
       notFilterItemProvider.dispose();
+    }
     if (andFilterItemProvider != null)
+    {
       andFilterItemProvider.dispose();
+    }
     if (orFilterItemProvider != null)
+    {
       orFilterItemProvider.dispose();
+    }
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java
index a9b335e61f..c9748c8a2b 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java
@@ -42,8 +42,8 @@ import java.util.List;
  * @generated
  */
 public class UserItemProvider extends AssigneeItemProvider 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.
@@ -90,11 +90,11 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
    */
   protected void addGroupsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_User_groups_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_User_groups_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.USER__GROUPS, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_User_groups_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_User_groups_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.USER__GROUPS, true, false, true, null, null, null));
   }
 
   /**
@@ -105,13 +105,12 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
    */
   protected void addLabelPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_User_label_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_User_label_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.USER__LABEL, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_User_label_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_User_label_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.USER__LABEL, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -122,13 +121,12 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
    */
   protected void addFirstNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_User_firstName_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_User_firstName_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.USER__FIRST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_User_firstName_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_User_firstName_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.USER__FIRST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -139,13 +137,12 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
    */
   protected void addLastNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_User_lastName_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_User_lastName_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.USER__LAST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_User_lastName_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_User_lastName_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.USER__LAST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -156,13 +153,12 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
    */
   protected void addEmailPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_User_email_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_User_email_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.USER__EMAIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_User_email_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_User_email_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.USER__EMAIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -173,13 +169,12 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
    */
   protected void addDefaultAccessOverridePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_User_defaultAccessOverride_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_User_defaultAccessOverride_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.USER__DEFAULT_ACCESS_OVERRIDE, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_User_defaultAccessOverride_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_User_defaultAccessOverride_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.USER__DEFAULT_ACCESS_OVERRIDE, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -190,13 +185,12 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
    */
   protected void addDefaultAccessPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_User_defaultAccess_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_User_defaultAccess_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.USER__DEFAULT_ACCESS, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_User_defaultAccess_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_User_defaultAccess_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.USER__DEFAULT_ACCESS, false, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -207,13 +201,12 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
    */
   protected void addLockedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_User_locked_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_User_locked_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.USER__LOCKED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_User_locked_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_User_locked_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.USER__LOCKED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -224,11 +217,11 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
    */
   protected void addAllPermissionsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_User_allPermissions_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_User_allPermissions_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        SecurityPackage.Literals.USER__ALL_PERMISSIONS, false, false, false, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_User_allPermissions_feature"), //$NON-NLS-1$
+            getString("_UI_PropertyDescriptor_description", "_UI_User_allPermissions_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            SecurityPackage.Literals.USER__ALL_PERMISSIONS, false, false, false, null, null, null));
   }
 
   /**
@@ -311,7 +304,8 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
   public String getText(Object object)
   {
     String label = ((User)object).getId();
-    return label == null || label.length() == 0 ? getString("_UI_User_type") : //$NON-NLS-1$
+    return label == null || label.length() == 0 ? getString("_UI_User_type") //$NON-NLS-1$
+        :
         label;
   }
 
@@ -357,8 +351,8 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.USER__PASSWORD,
-        SecurityFactory.eINSTANCE.createUserPassword()));
+    newChildDescriptors.add(
+        createChildParameter(SecurityPackage.Literals.USER__PASSWORD, SecurityFactory.eINSTANCE.createUserPassword()));
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java
index 11cb317f97..c9cbf06b5c 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java
@@ -41,8 +41,8 @@ import java.util.List;
  * @generated
  */
 public class UserPasswordItemProvider extends ItemProviderAdapter 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.security.edit/src/org/eclipse/emf/cdo/security/provider/package-info.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/package-info.java
index 6e85f052b0..7b26c2d39e 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2012 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) 2012 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.security.provider;
-
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityActionBarContributor.java b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityActionBarContributor.java
index 7919fdbe34..522923017c 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityActionBarContributor.java
@@ -49,8 +49,7 @@ import java.util.Collection;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SecurityActionBarContributor extends EditingDomainActionBarContributor implements
-    ISelectionChangedListener
+public class SecurityActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener
 {
   /**
    * This keeps track of the active editor.
@@ -75,8 +74,8 @@ public class SecurityActionBarContributor extends EditingDomainActionBarContribu
    * @generated
    */
   protected IAction showPropertiesViewAction = new Action(
-      SecurityEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
-  {
+      SecurityEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))//$NON-NLS-1$
+      {
     @Override
     public void run()
     {
@@ -89,385 +88,385 @@ public class SecurityActionBarContributor extends EditingDomainActionBarContribu
         SecurityEditorPlugin.INSTANCE.log(exception);
       }
     }
-  };
-
-  /**
-   * This action refreshes the viewer of the current editor if the editor
-   * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected IAction refreshViewerAction = new Action(
-      SecurityEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
-  {
-    @Override
-    public boolean isEnabled()
-    {
-      return activeEditorPart instanceof IViewerProvider;
-    }
-
-    @Override
-    public void run()
-    {
-      if (activeEditorPart instanceof IViewerProvider)
-      {
-        Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
-        if (viewer != null)
+      };
+
+      /**
+       * This action refreshes the viewer of the current editor if the editor
+       * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+       * <!-- begin-user-doc -->
+       * <!-- end-user-doc -->
+       * @generated
+       */
+      protected IAction refreshViewerAction = new Action(
+          SecurityEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))//$NON-NLS-1$
+          {
+        @Override
+        public boolean isEnabled()
         {
-          viewer.refresh();
+          return activeEditorPart instanceof IViewerProvider;
         }
-      }
-    }
-  };
-
-  /**
-   * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-   * generated for the current selection by the item provider.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected Collection<IAction> createChildActions;
-
-  /**
-   * This is the menu manager into which menu contribution items should be added for CreateChild actions.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected IMenuManager createChildMenuManager;
-
-  /**
-   * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-   * generated for the current selection by the item provider.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected Collection<IAction> createSiblingActions;
-
-  /**
-   * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected IMenuManager createSiblingMenuManager;
-
-  /**
-   * This creates an instance of the contributor.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SecurityActionBarContributor()
-  {
-    super(ADDITIONS_LAST_STYLE);
-    loadResourceAction = new LoadResourceAction();
-    validateAction = new ValidateAction();
-    controlAction = new ControlAction();
-  }
-
-  /**
-   * This adds Separators for editor additions to the tool bar.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void contributeToToolBar(IToolBarManager toolBarManager)
-  {
-    toolBarManager.add(new Separator("security-settings")); //$NON-NLS-1$
-    toolBarManager.add(new Separator("security-additions")); //$NON-NLS-1$
-  }
-
-  /**
-   * This adds to the menu bar a menu and some separators for editor additions,
-   * as well as the sub-menus for object creation items.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void contributeToMenu(IMenuManager menuManager)
-  {
-    super.contributeToMenu(menuManager);
-
-    IMenuManager submenuManager = new MenuManager(
-        SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityEditor_menu"), "org.eclipse.emf.cdo.securityMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
-    menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
-    submenuManager.add(new Separator("settings")); //$NON-NLS-1$
-    submenuManager.add(new Separator("actions")); //$NON-NLS-1$
-    submenuManager.add(new Separator("additions")); //$NON-NLS-1$
-    submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
-
-    // Prepare for CreateChild item addition or removal.
-    //
-    createChildMenuManager = new MenuManager(SecurityEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
-    submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
-
-    // Prepare for CreateSibling item addition or removal.
-    //
-    createSiblingMenuManager = new MenuManager(SecurityEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
-    submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
-
-    // Force an update because Eclipse hides empty menus now.
-    //
-    submenuManager.addMenuListener(new IMenuListener()
-    {
-      public void menuAboutToShow(IMenuManager menuManager)
-      {
-        menuManager.updateAll(true);
-      }
-    });
-
-    addGlobalActions(submenuManager);
-  }
-
-  /**
-   * When the active editor changes, this remembers the change and registers with it as a selection provider.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setActiveEditor(IEditorPart part)
-  {
-    super.setActiveEditor(part);
-    activeEditorPart = part;
-
-    // Switch to the new selection provider.
-    //
-    if (selectionProvider != null)
-    {
-      selectionProvider.removeSelectionChangedListener(this);
-    }
-    if (part == null)
-    {
-      selectionProvider = null;
-    }
-    else
-    {
-      selectionProvider = part.getSite().getSelectionProvider();
-      selectionProvider.addSelectionChangedListener(this);
-
-      // Fake a selection changed event to update the menus.
-      //
-      if (selectionProvider.getSelection() != null)
-      {
-        selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
-      }
-    }
-  }
-
-  /**
-   * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
-   * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
-   * that can be added to the selected object and updating the menus accordingly.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    // Remove any menu items for old selection.
-    //
-    if (createChildMenuManager != null)
-    {
-      depopulateManager(createChildMenuManager, createChildActions);
-    }
-    if (createSiblingMenuManager != null)
-    {
-      depopulateManager(createSiblingMenuManager, createSiblingActions);
-    }
-
-    // Query the new selection for appropriate new child/sibling descriptors
-    //
-    Collection<?> newChildDescriptors = null;
-    Collection<?> newSiblingDescriptors = null;
-
-    ISelection selection = event.getSelection();
-    if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1)
-    {
-      Object object = ((IStructuredSelection)selection).getFirstElement();
 
-      EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+        @Override
+        public void run()
+        {
+          if (activeEditorPart instanceof IViewerProvider)
+          {
+            Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+            if (viewer != null)
+            {
+              viewer.refresh();
+            }
+          }
+        }
+          };
+
+          /**
+           * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+           * generated for the current selection by the item provider.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          protected Collection<IAction> createChildActions;
+
+          /**
+           * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          protected IMenuManager createChildMenuManager;
+
+          /**
+           * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+           * generated for the current selection by the item provider.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          protected Collection<IAction> createSiblingActions;
+
+          /**
+           * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          protected IMenuManager createSiblingMenuManager;
+
+          /**
+           * This creates an instance of the contributor.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          public SecurityActionBarContributor()
+          {
+            super(ADDITIONS_LAST_STYLE);
+            loadResourceAction = new LoadResourceAction();
+            validateAction = new ValidateAction();
+            controlAction = new ControlAction();
+          }
 
-      newChildDescriptors = domain.getNewChildDescriptors(object, null);
-      newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-    }
+          /**
+           * This adds Separators for editor additions to the tool bar.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          @Override
+          public void contributeToToolBar(IToolBarManager toolBarManager)
+          {
+            toolBarManager.add(new Separator("security-settings")); //$NON-NLS-1$
+            toolBarManager.add(new Separator("security-additions")); //$NON-NLS-1$
+          }
 
-    // Generate actions for selection; populate and redraw the menus.
-    //
-    createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-    createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+          /**
+           * This adds to the menu bar a menu and some separators for editor additions,
+           * as well as the sub-menus for object creation items.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          @Override
+          public void contributeToMenu(IMenuManager menuManager)
+          {
+            super.contributeToMenu(menuManager);
+
+            IMenuManager submenuManager = new MenuManager(SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityEditor_menu"), //$NON-NLS-1$
+        "org.eclipse.emf.cdo.securityMenuID"); //$NON-NLS-1$
+            menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
+            submenuManager.add(new Separator("settings")); //$NON-NLS-1$
+            submenuManager.add(new Separator("actions")); //$NON-NLS-1$
+            submenuManager.add(new Separator("additions")); //$NON-NLS-1$
+            submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+
+            // Prepare for CreateChild item addition or removal.
+            //
+            createChildMenuManager = new MenuManager(SecurityEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+            submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+
+            // Prepare for CreateSibling item addition or removal.
+            //
+            createSiblingMenuManager = new MenuManager(SecurityEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+            submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+
+            // Force an update because Eclipse hides empty menus now.
+            //
+            submenuManager.addMenuListener(new IMenuListener()
+            {
+              public void menuAboutToShow(IMenuManager menuManager)
+              {
+                menuManager.updateAll(true);
+              }
+            });
+
+            addGlobalActions(submenuManager);
+          }
 
-    if (createChildMenuManager != null)
-    {
-      populateManager(createChildMenuManager, createChildActions, null);
-      createChildMenuManager.update(true);
-    }
-    if (createSiblingMenuManager != null)
-    {
-      populateManager(createSiblingMenuManager, createSiblingActions, null);
-      createSiblingMenuManager.update(true);
-    }
-  }
+          /**
+           * When the active editor changes, this remembers the change and registers with it as a selection provider.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          @Override
+          public void setActiveEditor(IEditorPart part)
+          {
+            super.setActiveEditor(part);
+            activeEditorPart = part;
+
+            // Switch to the new selection provider.
+            //
+            if (selectionProvider != null)
+            {
+              selectionProvider.removeSelectionChangedListener(this);
+            }
+            if (part == null)
+            {
+              selectionProvider = null;
+            }
+            else
+            {
+              selectionProvider = part.getSite().getSelectionProvider();
+              selectionProvider.addSelectionChangedListener(this);
+
+              // Fake a selection changed event to update the menus.
+              //
+              if (selectionProvider.getSelection() != null)
+              {
+                selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+              }
+            }
+          }
 
-  /**
-   * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
-   * and returns the collection of these actions.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection)
-  {
-    Collection<IAction> actions = new ArrayList<IAction>();
-    if (descriptors != null)
-    {
-      for (Object descriptor : descriptors)
-      {
-        actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
-      }
-    }
-    return actions;
-  }
+          /**
+           * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+           * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+           * that can be added to the selected object and updating the menus accordingly.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          public void selectionChanged(SelectionChangedEvent event)
+          {
+            // Remove any menu items for old selection.
+            //
+            if (createChildMenuManager != null)
+            {
+              depopulateManager(createChildMenuManager, createChildActions);
+            }
+            if (createSiblingMenuManager != null)
+            {
+              depopulateManager(createSiblingMenuManager, createSiblingActions);
+            }
+
+            // Query the new selection for appropriate new child/sibling descriptors
+            //
+            Collection<?> newChildDescriptors = null;
+            Collection<?> newSiblingDescriptors = null;
+
+            ISelection selection = event.getSelection();
+            if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1)
+            {
+              Object object = ((IStructuredSelection)selection).getFirstElement();
+
+              EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+              newChildDescriptors = domain.getNewChildDescriptors(object, null);
+              newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+            }
+
+            // Generate actions for selection; populate and redraw the menus.
+            //
+            createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+            createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+            if (createChildMenuManager != null)
+            {
+              populateManager(createChildMenuManager, createChildActions, null);
+              createChildMenuManager.update(true);
+            }
+            if (createSiblingMenuManager != null)
+            {
+              populateManager(createSiblingMenuManager, createSiblingActions, null);
+              createSiblingMenuManager.update(true);
+            }
+          }
 
-  /**
-   * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
-   * and returns the collection of these actions.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection)
-  {
-    Collection<IAction> actions = new ArrayList<IAction>();
-    if (descriptors != null)
-    {
-      for (Object descriptor : descriptors)
-      {
-        actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
-      }
-    }
-    return actions;
-  }
+          /**
+           * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+           * and returns the collection of these actions.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection)
+          {
+            Collection<IAction> actions = new ArrayList<IAction>();
+            if (descriptors != null)
+            {
+              for (Object descriptor : descriptors)
+              {
+                actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+              }
+            }
+            return actions;
+          }
 
-  /**
-   * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-   * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
-   * by inserting them before the specified contribution item <code>contributionID</code>.
-   * If <code>contributionID</code> is <code>null</code>, they are simply added.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-      String contributionID)
-  {
-    if (actions != null)
-    {
-      for (IAction action : actions)
-      {
-        if (contributionID != null)
-        {
-          manager.insertBefore(contributionID, action);
-        }
-        else
-        {
-          manager.add(action);
-        }
-      }
-    }
-  }
+          /**
+           * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+           * and returns the collection of these actions.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection)
+          {
+            Collection<IAction> actions = new ArrayList<IAction>();
+            if (descriptors != null)
+            {
+              for (Object descriptor : descriptors)
+              {
+                actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+              }
+            }
+            return actions;
+          }
 
-  /**
-   * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-   * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions)
-  {
-    if (actions != null)
-    {
-      IContributionItem[] items = manager.getItems();
-      for (int i = 0; i < items.length; i++)
-      {
-        // Look into SubContributionItems
-        //
-        IContributionItem contributionItem = items[i];
-        while (contributionItem instanceof SubContributionItem)
-        {
-          contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
-        }
+          /**
+           * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+           * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+           * by inserting them before the specified contribution item <code>contributionID</code>.
+           * If <code>contributionID</code> is <code>null</code>, they are simply added.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
+              String contributionID)
+          {
+            if (actions != null)
+            {
+              for (IAction action : actions)
+              {
+                if (contributionID != null)
+                {
+                  manager.insertBefore(contributionID, action);
+                }
+                else
+                {
+                  manager.add(action);
+                }
+              }
+            }
+          }
 
-        // Delete the ActionContributionItems with matching action.
-        //
-        if (contributionItem instanceof ActionContributionItem)
-        {
-          IAction action = ((ActionContributionItem)contributionItem).getAction();
-          if (actions.contains(action))
+          /**
+           * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+           * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions)
           {
-            manager.remove(contributionItem);
+            if (actions != null)
+            {
+              IContributionItem[] items = manager.getItems();
+              for (int i = 0; i < items.length; i++)
+              {
+                // Look into SubContributionItems
+                //
+                IContributionItem contributionItem = items[i];
+                while (contributionItem instanceof SubContributionItem)
+                {
+                  contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+                }
+
+                // Delete the ActionContributionItems with matching action.
+                //
+                if (contributionItem instanceof ActionContributionItem)
+                {
+                  IAction action = ((ActionContributionItem)contributionItem).getAction();
+                  if (actions.contains(action))
+                  {
+                    manager.remove(contributionItem);
+                  }
+                }
+              }
+            }
           }
-        }
-      }
-    }
-  }
 
-  /**
-   * This populates the pop-up menu before it appears.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void menuAboutToShow(IMenuManager menuManager)
-  {
-    super.menuAboutToShow(menuManager);
-    MenuManager submenuManager = null;
+          /**
+           * This populates the pop-up menu before it appears.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          @Override
+          public void menuAboutToShow(IMenuManager menuManager)
+          {
+            super.menuAboutToShow(menuManager);
+            MenuManager submenuManager = null;
 
-    submenuManager = new MenuManager(SecurityEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
-    populateManager(submenuManager, createChildActions, null);
-    menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+            submenuManager = new MenuManager(SecurityEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+            populateManager(submenuManager, createChildActions, null);
+            menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
 
-    submenuManager = new MenuManager(SecurityEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
-    populateManager(submenuManager, createSiblingActions, null);
-    menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
-  }
+            submenuManager = new MenuManager(SecurityEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+            populateManager(submenuManager, createSiblingActions, null);
+            menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+          }
 
-  /**
-   * This inserts global actions before the "additions-end" separator.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected void addGlobalActions(IMenuManager menuManager)
-  {
-    menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
-    menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+          /**
+           * This inserts global actions before the "additions-end" separator.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          @Override
+          protected void addGlobalActions(IMenuManager menuManager)
+          {
+            menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
+            menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
 
-    refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-    menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+            refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
+            menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
 
-    super.addGlobalActions(menuManager);
-  }
+            super.addGlobalActions(menuManager);
+          }
 
-  /**
-   * This ensures that a delete action will clean up all references to deleted objects.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected boolean removeAllReferencesOnDelete()
-  {
-    return true;
-  }
+          /**
+           * This ensures that a delete action will clean up all references to deleted objects.
+           * <!-- begin-user-doc -->
+           * <!-- end-user-doc -->
+           * @generated
+           */
+          @Override
+          protected boolean removeAllReferencesOnDelete()
+          {
+            return true;
+          }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
index f821be6a5c..cd1ff9b347 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
+++ b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityEditor.java
@@ -126,8 +126,8 @@ import java.util.Map;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SecurityEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider, IGotoMarker
+public class SecurityEditor extends MultiPageEditorPart
+    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
 {
   /**
    * This keeps track of the editing domain that is used to track all changes to the model.
@@ -420,11 +420,11 @@ public class SecurityEditor extends MultiPageEditorPart implements IEditingDomai
           {
             if (delta.getResource().getType() == IResource.FILE)
             {
-              if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED
-                  && delta.getFlags() != IResourceDelta.MARKERS)
+              if (delta.getKind() == IResourceDelta.REMOVED
+                  || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
               {
-                Resource resource = resourceSet.getResource(
-                    URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                Resource resource = resourceSet
+                    .getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
                 if (resource != null)
                 {
                   if (delta.getKind() == IResourceDelta.REMOVED)
@@ -1022,8 +1022,8 @@ public class SecurityEditor extends MultiPageEditorPart implements IEditingDomai
       setCurrentViewer(selectionViewer);
 
       selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-      selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory,
-          selectionViewer));
+      selectionViewer
+          .setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, selectionViewer));
       selectionViewer.setInput(editingDomain.getResourceSet());
       selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
 
@@ -1181,8 +1181,8 @@ public class SecurityEditor extends MultiPageEditorPart implements IEditingDomai
           // Set up the tree viewer.
           //
           contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-          contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory,
-              contentOutlineViewer));
+          contentOutlineViewer.setLabelProvider(
+              new AdapterFactoryLabelProvider.FontAndColorProvider(adapterFactory, contentOutlineViewer));
           contentOutlineViewer.setInput(editingDomain.getResourceSet());
 
           // Make sure our popups work.
@@ -1193,8 +1193,8 @@ public class SecurityEditor extends MultiPageEditorPart implements IEditingDomai
           {
             // Select the root object in the view.
             //
-            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources()
-                .get(0)), true);
+            contentOutlineViewer
+                .setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
           }
         }
 
@@ -1447,9 +1447,9 @@ public class SecurityEditor extends MultiPageEditorPart implements IEditingDomai
     editingDomain.getResourceSet().getResources().get(0).setURI(uri);
     setInputWithNotify(editorInput);
     setPartName(editorInput.getName());
-    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
-        .getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-    doSave(progressMonitor);
+    IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
+        ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+        doSave(progressMonitor);
   }
 
   /**
@@ -1552,8 +1552,8 @@ public class SecurityEditor extends MultiPageEditorPart implements IEditingDomai
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
-        : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityModelWizard.java b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityModelWizard.java
index 43e3687eab..dc462ea39a 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityModelWizard.java
+++ b/plugins/org.eclipse.emf.cdo.security.editor/src/org/eclipse/emf/cdo/security/presentation/SecurityModelWizard.java
@@ -91,8 +91,8 @@ public class SecurityModelWizard extends Wizard implements INewWizard
    * <!-- end-user-doc -->
    * @generated
    */
-  public static final String FORMATTED_FILE_EXTENSIONS = SecurityEditorPlugin.INSTANCE.getString(
-      "_UI_SecurityEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+  public static final String FORMATTED_FILE_EXTENSIONS = SecurityEditorPlugin.INSTANCE
+      .getString("_UI_SecurityEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
   /**
    * This caches an instance of the model package.
@@ -161,8 +161,8 @@ public class SecurityModelWizard extends Wizard implements INewWizard
     this.workbench = workbench;
     this.selection = selection;
     setWindowTitle(SecurityEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
-    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(SecurityEditorPlugin.INSTANCE
-        .getImage("full/wizban/NewSecurity"))); //$NON-NLS-1$
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
+        .getImageDescriptor(SecurityEditorPlugin.INSTANCE.getImage("full/wizban/NewSecurity"))); //$NON-NLS-1$
   }
 
   /**
@@ -607,8 +607,8 @@ public class SecurityModelWizard extends Wizard implements INewWizard
     newFileCreationPage = new SecurityModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
     newFileCreationPage.setTitle(SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityModelWizard_label")); //$NON-NLS-1$
     newFileCreationPage.setDescription(SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityModelWizard_description")); //$NON-NLS-1$
-    newFileCreationPage
-        .setFileName(SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+    newFileCreationPage.setFileName(SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityEditorFilenameDefaultBase") //$NON-NLS-1$
+        + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$
     addPage(newFileCreationPage);
 
     // Try and get the resource selection to determine a current directory for the file dialog.
@@ -652,8 +652,8 @@ public class SecurityModelWizard extends Wizard implements INewWizard
     }
     initialObjectCreationPage = new SecurityModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
     initialObjectCreationPage.setTitle(SecurityEditorPlugin.INSTANCE.getString("_UI_SecurityModelWizard_label")); //$NON-NLS-1$
-    initialObjectCreationPage.setDescription(SecurityEditorPlugin.INSTANCE
-        .getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
+    initialObjectCreationPage
+        .setDescription(SecurityEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
     addPage(initialObjectCreationPage);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
index c68b0398b2..8ace30fa22 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
@@ -61,7 +61,7 @@ import org.eclipse.ui.forms.widgets.TableWrapData;
  *
  * @author Christian W. Damus (CEA LIST)
  */
-public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSectionPart<T> implements IDetailsPage
+public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSectionPart<T>implements IDetailsPage
 {
   public AbstractDetailsPage(Class<T> elementType, EClass elementEClass, EditingDomain domain,
       AdapterFactory adapterFactory)
@@ -104,8 +104,8 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
   protected Text text(Composite parent, FormToolkit toolkit, String label, EAttribute attribute)
   {
     toolkit.createLabel(parent, label);
-    Text result = toolkit.createText(
-        createDecorationComposite(parent, toolkit, layoutData(parent, SWT.FILL, false, 1)), ""); //$NON-NLS-1$
+    Text result = toolkit.createText(createDecorationComposite(parent, toolkit, layoutData(parent, SWT.FILL, false, 1)),
+        ""); //$NON-NLS-1$
     getContext().bindValue(observeText(result),
         EMFEditObservables.observeDetailValue(getRealm(), getEditingDomain(), getValue(), attribute));
     getContext().bindValue(WidgetProperties.enabled().observe(result), getValue(), null,
@@ -293,8 +293,9 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
   protected ComboViewer combo(Composite parent, FormToolkit toolkit, String label, EAttribute attribute)
   {
     toolkit.createLabel(parent, label);
-    ComboViewer result = new ComboViewer(createDecorationComposite(parent, toolkit,
-        layoutData(parent, SWT.LEFT, false, 1)), SWT.READ_ONLY | SWT.DROP_DOWN);
+    ComboViewer result = new ComboViewer(
+        createDecorationComposite(parent, toolkit, layoutData(parent, SWT.LEFT, false, 1)),
+        SWT.READ_ONLY | SWT.DROP_DOWN);
     result.setLabelProvider(new AdapterFactoryLabelProvider(getAdapterFactory()));
     result.setContentProvider(new ArrayContentProvider());
     result.setInput(attribute.getEAttributeType().getInstanceClass().getEnumConstants());
@@ -327,8 +328,8 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
     final ControlDecoration decoration = new ControlDecoration(control, SWT.RIGHT | SWT.CENTER);
     decoration.hide();
     decoration.setDescriptionText(Messages.AbstractDetailsPage_3);
-    decoration.setImage(ExtendedImageRegistry.getInstance().getImage(
-        URI.createPlatformPluginURI(OM.BUNDLE_ID + "/icons/full/elcl16/revert.gif", true))); //$NON-NLS-1$
+    decoration.setImage(ExtendedImageRegistry.getInstance()
+        .getImage(URI.createPlatformPluginURI(OM.BUNDLE_ID + "/icons/full/elcl16/revert.gif", true))); //$NON-NLS-1$
     decoration.setMarginWidth(2);
 
     decoration.addSelectionListener(new SelectionAdapter()
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java
index 67b14889de..9aaf0a45f6 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java
@@ -62,7 +62,8 @@ public abstract class AbstractSectionPart<T extends EObject> extends AbstractFor
 
   private IActionBars editorActionBars;
 
-  public AbstractSectionPart(Class<T> inputType, EClass inputEClass, EditingDomain domain, AdapterFactory adapterFactory)
+  public AbstractSectionPart(Class<T> inputType, EClass inputEClass, EditingDomain domain,
+      AdapterFactory adapterFactory)
   {
     this.inputType = inputType;
     this.inputEClass = inputEClass;
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java
index ac63369910..428c5528f7 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java
@@ -108,8 +108,8 @@ public class CDOSecurityFormEditor extends FormEditor implements IEditingDomainP
       }
       catch (CommitException e)
       {
-        StatusAdapter status = new StatusAdapter(new Status(IStatus.ERROR, OM.BUNDLE_ID,
-            Messages.CDOSecurityFormEditor_0, e));
+        StatusAdapter status = new StatusAdapter(
+            new Status(IStatus.ERROR, OM.BUNDLE_ID, Messages.CDOSecurityFormEditor_0, e));
         status.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, Messages.CDOSecurityFormEditor_1);
         status.setProperty(IStatusAdapterConstants.TIMESTAMP_PROPERTY, System.currentTimeMillis());
         StatusManager.getManager().handle(status, StatusManager.SHOW);
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java
index ce524fa457..669f392886 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java
@@ -337,16 +337,16 @@ public class CDOSecurityPage extends FormPage
 
   private IAction createEditAdvancedAction()
   {
-    return new Action(Messages.CDOSecurityPage_0, ExtendedImageRegistry.getInstance().getImageDescriptor(
-        URI.createPlatformPluginURI(OM.BUNDLE_ID + "/icons/full/elcl16/advanced.gif", true))) //$NON-NLS-1$
-    {
+    return new Action(Messages.CDOSecurityPage_0, ExtendedImageRegistry.getInstance()
+        .getImageDescriptor(URI.createPlatformPluginURI(OM.BUNDLE_ID + "/icons/full/elcl16/advanced.gif", true))) //$NON-NLS-1$
+        {
       @Override
       public void run()
       {
         try
         {
-          IEditorInput newEditorInput = CDOEditorUtil.createCDOEditorInputWithEditingDomain(
-              (CDOEditorInput)getEditorInput(), getEditingDomain());
+          IEditorInput newEditorInput = CDOEditorUtil
+              .createCDOEditorInputWithEditingDomain((CDOEditorInput)getEditorInput(), getEditingDomain());
           getSite().getPage().openEditor(newEditorInput, CDOEditorUtil.getEditorID(), true,
               IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
         }
@@ -355,6 +355,6 @@ public class CDOSecurityPage extends FormPage
           OM.LOG.error(e);
         }
       }
-    };
+        };
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java
index 7d10558023..d7b2f38018 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java
@@ -98,8 +98,9 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role>
       public Command createConfigureCommand(Object newObject)
       {
         ResourceFilter filter = SecurityFactory.eINSTANCE.createResourceFilter("/home/${user}", PatternStyle.TREE); //$NON-NLS-1$
-        Command result = CreateChildCommand.create(getEditingDomain(), newObject, new CommandParameter(newObject,
-            SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, filter), Collections.singleton(newObject));
+        Command result = CreateChildCommand.create(getEditingDomain(), newObject,
+            new CommandParameter(newObject, SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, filter),
+            Collections.singleton(newObject));
         result = result.chain(SetCommand.create(getEditingDomain(), newObject,
             SecurityPackage.Literals.PERMISSION__ACCESS, Access.WRITE));
         return result;
@@ -245,8 +246,8 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role>
         case COL_PATH:
           if (!ObjectUtil.equals(filter.getPath(), value))
           {
-            execute(SetCommand
-                .create(getEditingDomain(), filter, SecurityPackage.Literals.RESOURCE_FILTER__PATH, value));
+            execute(
+                SetCommand.create(getEditingDomain(), filter, SecurityPackage.Literals.RESOURCE_FILTER__PATH, value));
             viewer.refresh(element);
           }
           break;
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
index 382db35f29..b2aa0eae9e 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
@@ -237,7 +237,7 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
     Command dummy = createDeleteCommand(EcoreUtil.create(elementEClass));
 
     return new SelectionListenerAction<EObject>(dummy.getLabel(), SharedIcons.getDescriptor("etool16/delete.gif")) //$NON-NLS-1$
-    {
+        {
       @Override
       public void run()
       {
@@ -259,7 +259,7 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
       {
         return EObject.class;
       }
-    };
+        };
   }
 
   protected Command createDeleteCommand(EObject toDelete)
@@ -291,59 +291,59 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
   {
     viewer.addDropSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY,
         new Transfer[] { LocalSelectionTransfer.getTransfer() }, new ViewerDropAdapter(viewer)
-        {
-          {
-            // We don't want it to look like you can insert new elements, only drop onto existing elements
-            setFeedbackEnabled(false);
-          }
+    {
+      {
+        // We don't want it to look like you can insert new elements, only drop onto existing elements
+        setFeedbackEnabled(false);
+      }
+
+      @Override
+      public boolean validateDrop(Object target, int operation, TransferData transferType)
+      {
+        boolean result = false;
 
-          @Override
-          public boolean validateDrop(Object target, int operation, TransferData transferType)
+        if (target instanceof EObject && LocalSelectionTransfer.getTransfer().isSupportedType(transferType))
+        {
+          EObject objectToDrop = getObjectToDrop(transferType);
+          if (objectToDrop != null)
           {
-            boolean result = false;
+            result = getDropReference((EObject)target, objectToDrop) != null;
 
-            if (target instanceof EObject && LocalSelectionTransfer.getTransfer().isSupportedType(transferType))
+            if (result && (getCurrentEvent().operations | DND.DROP_COPY) != 0)
             {
-              EObject objectToDrop = getObjectToDrop(transferType);
-              if (objectToDrop != null)
-              {
-                result = getDropReference((EObject)target, objectToDrop) != null;
-
-                if (result && (getCurrentEvent().operations | DND.DROP_COPY) != 0)
-                {
-                  overrideOperation(DND.DROP_COPY);
-                }
-              }
+              overrideOperation(DND.DROP_COPY);
             }
-
-            return result;
           }
+        }
 
-          @Override
-          public boolean performDrop(Object data)
-          {
-            IStructuredSelection selection = (IStructuredSelection)data;
-            EObject objectToDrop = UIUtil.getElement(selection, EObject.class);
-            EObject target = (EObject)getCurrentTarget();
+        return result;
+      }
 
-            Command command = AddCommand.create(getEditingDomain(), target, getDropReference(target, objectToDrop),
-                selection.toList());
+      @Override
+      public boolean performDrop(Object data)
+      {
+        IStructuredSelection selection = (IStructuredSelection)data;
+        EObject objectToDrop = UIUtil.getElement(selection, EObject.class);
+        EObject target = (EObject)getCurrentTarget();
 
-            boolean result = execute(command);
-            if (result)
-            {
-              viewer.getControl().setFocus();
-              viewer.setSelection(new StructuredSelection(target));
-            }
+        Command command = AddCommand.create(getEditingDomain(), target, getDropReference(target, objectToDrop),
+            selection.toList());
 
-            return result;
-          }
+        boolean result = execute(command);
+        if (result)
+        {
+          viewer.getControl().setFocus();
+          viewer.setSelection(new StructuredSelection(target));
+        }
 
-          private EObject getObjectToDrop(TransferData transferType)
-          {
-            return UIUtil.getElement(LocalSelectionTransfer.getTransfer().getSelection(), EObject.class);
-          }
-        });
+        return result;
+      }
+
+      private EObject getObjectToDrop(TransferData transferType)
+      {
+        return UIUtil.getElement(LocalSelectionTransfer.getTransfer().getSelection(), EObject.class);
+      }
+    });
   }
 
   protected EReference getDropReference(EObject target, EObject objectToDrop)
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java
index ae88b5830c..7c3d69c6f6 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java
@@ -368,8 +368,8 @@ public class ManageSecurityHandler extends LongRunningHandler
       IManagedContainer container = IPluginContainer.INSTANCE;
       String productGroup = CredentialsProviderFactory.PRODUCT_GROUP;
       String factoryType = "interactive"; //$NON-NLS-1$
-      IPasswordCredentialsProvider credentialsProvider = (IPasswordCredentialsProvider)container.getElement(
-          productGroup, factoryType, null);
+      IPasswordCredentialsProvider credentialsProvider = (IPasswordCredentialsProvider)container
+          .getElement(productGroup, factoryType, null);
 
       if (credentialsProvider == null)
       {
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/messages/Messages.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/messages/Messages.java
index f73dafbe72..e0401ce494 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -14,7 +14,7 @@ import org.eclipse.osgi.util.NLS;
 
 /**
  * Localized messages bundle.
- * 
+ *
  * @author Christian W. Damus (CEA LIST)
  */
 public class Messages extends NLS
@@ -112,6 +112,7 @@ public class Messages extends NLS
   public static String UserDetailsPage_9;
 
   public static String UsersSection_0;
+
   static
   {
     // Initialize resource bundle
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/INewObjectConfigurator.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/INewObjectConfigurator.java
index f757c7e0f1..5a5210d88d 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/INewObjectConfigurator.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/INewObjectConfigurator.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -14,7 +14,7 @@ import org.eclipse.emf.common.command.Command;
 
 /**
  * A protocol for the configuration of newly created elements in the editor.
- * 
+ *
  * @author Christian W. Damus (CEA LIST)
  */
 public interface INewObjectConfigurator
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
index 391b71a479..a9658cfdc5 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
@@ -312,12 +312,12 @@ public class OneToManyBlock
             available.removeAll(value);
             SecurityUIUtil.applySupportedElementFilter(available, itemType);
 
-            String label = NLS.bind(Messages.OneToManyBlock_3, SecurityEditPlugin.INSTANCE.getString(String.format(
-                "_UI_%s_%s_feature", reference.getEContainingClass().getName(), reference.getName()))); //$NON-NLS-1$
+            String label = NLS.bind(Messages.OneToManyBlock_3, SecurityEditPlugin.INSTANCE.getString(
+                String.format("_UI_%s_%s_feature", reference.getEContainingClass().getName(), reference.getName()))); //$NON-NLS-1$
 
-            FeatureEditorDialog dlg = new FeatureEditorDialog(viewer.getControl().getShell(), new TableLabelProvider(
-                adapterFactory), input.getValue(), reference.getEContainingClass(), Collections.EMPTY_LIST, label,
-                available, false, true, true);
+            FeatureEditorDialog dlg = new FeatureEditorDialog(viewer.getControl().getShell(),
+                new TableLabelProvider(adapterFactory), input.getValue(), reference.getEContainingClass(),
+                Collections.EMPTY_LIST, label, available, false, true, true);
 
             if (dlg.open() == Window.OK && !dlg.getResult().isEmpty())
             {
@@ -335,7 +335,7 @@ public class OneToManyBlock
 
     final SelectionListenerAction<EObject> removeAction = new SelectionListenerAction<EObject>(
         Messages.OneToManyBlock_2, SharedIcons.getDescriptor("etool16/delete.gif")) //$NON-NLS-1$
-        {
+    {
       @Override
       public void run()
       {
@@ -368,23 +368,23 @@ public class OneToManyBlock
       {
         return EObject.class;
       }
-        };
+    };
 
-        removeButton.addSelectionListener(new SelectionAdapter()
+    removeButton.addSelectionListener(new SelectionAdapter()
+    {
+      @Override
+      public void widgetSelected(SelectionEvent e)
+      {
+        if (removeAction.isEnabled())
         {
-          @Override
-          public void widgetSelected(SelectionEvent e)
-          {
-            if (removeAction.isEnabled())
-            {
-              removeAction.run();
-            }
-          }
-        });
+          removeAction.run();
+        }
+      }
+    });
 
-        viewer.addSelectionChangedListener(removeAction);
+    viewer.addSelectionChangedListener(removeAction);
 
-        new ActionBarsHelper(editorActionBars).addGlobalAction(ActionFactory.DELETE.getId(), removeAction).install(viewer);
+    new ActionBarsHelper(editorActionBars).addGlobalAction(ActionFactory.DELETE.getId(), removeAction).install(viewer);
   }
 
   public void setInput(IObservableValue input)
@@ -404,8 +404,8 @@ public class OneToManyBlock
       value.dispose();
     }
 
-    value = EMFEditObservables.observeDetailList(context.getValidationRealm(), domain, input, getConfiguration()
-        .getModelReference());
+    value = EMFEditObservables.observeDetailList(context.getValidationRealm(), domain, input,
+        getConfiguration().getModelReference());
 
     if (viewer != null)
     {
@@ -479,64 +479,64 @@ public class OneToManyBlock
   {
     viewer.addDropSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY,
         new Transfer[] { LocalSelectionTransfer.getTransfer() }, new DropTargetAdapter()
-    {
-      @Override
-      public void dragEnter(DropTargetEvent event)
-      {
-        if (!canDrop(event))
-        {
-          // Reject this drop
-          event.detail = DND.DROP_NONE;
-        }
-        else if ((event.operations | DND.DROP_COPY) != 0)
         {
-          event.detail = DND.DROP_COPY;
-        }
-      }
+          @Override
+          public void dragEnter(DropTargetEvent event)
+          {
+            if (!canDrop(event))
+            {
+              // Reject this drop
+              event.detail = DND.DROP_NONE;
+            }
+            else if ((event.operations | DND.DROP_COPY) != 0)
+            {
+              event.detail = DND.DROP_COPY;
+            }
+          }
 
-      private boolean canDrop(DropTargetEvent event)
-      {
-        boolean result = false;
+          private boolean canDrop(DropTargetEvent event)
+          {
+            boolean result = false;
 
-        if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType))
-        {
-          result = canPresentAll(LocalSelectionTransfer.getTransfer().getSelection());
-        }
+            if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType))
+            {
+              result = canPresentAll(LocalSelectionTransfer.getTransfer().getSelection());
+            }
 
-        return result;
-      }
+            return result;
+          }
 
-      @Override
-      public void dropAccept(DropTargetEvent event)
-      {
-        if (!canDrop(event))
-        {
-          // Reject this drop
-          event.detail = DND.DROP_NONE;
-        }
-        else if ((event.operations | DND.DROP_COPY) != 0)
-        {
-          event.detail = DND.DROP_COPY;
-        }
-      }
+          @Override
+          public void dropAccept(DropTargetEvent event)
+          {
+            if (!canDrop(event))
+            {
+              // Reject this drop
+              event.detail = DND.DROP_NONE;
+            }
+            else if ((event.operations | DND.DROP_COPY) != 0)
+            {
+              event.detail = DND.DROP_COPY;
+            }
+          }
 
-      @Override
-      public void drop(DropTargetEvent event)
-      {
-        if (canDrop(event))
-        {
-          IStructuredSelection selection = (IStructuredSelection)LocalSelectionTransfer.getTransfer()
-              .getSelection();
-          Command command = AddCommand.create(domain, input.getValue(), getConfiguration().getModelReference(),
-              selection.toList());
-          if (execute(command))
+          @Override
+          public void drop(DropTargetEvent event)
           {
-            viewer.setSelection(selection);
-            viewer.getControl().setFocus();
+            if (canDrop(event))
+            {
+              IStructuredSelection selection = (IStructuredSelection)LocalSelectionTransfer.getTransfer()
+                  .getSelection();
+              Command command = AddCommand.create(domain, input.getValue(), getConfiguration().getModelReference(),
+                  selection.toList());
+              if (execute(command))
+              {
+                viewer.setSelection(selection);
+                viewer.getControl().setFocus();
+              }
+            }
           }
-        }
-      }
-    });
+        });
   }
 
   protected void hookUnsupportedModelContentValidation(IObservableList observableList)
@@ -565,8 +565,8 @@ public class OneToManyBlock
     {
       if (!supportedContentFilter.select(element))
       {
-        configuration.getManagedForm().getMessageManager()
-        .addMessage(this, Messages.TableSection_3, null, IStatus.WARNING, viewer.getControl());
+        configuration.getManagedForm().getMessageManager().addMessage(this, Messages.TableSection_3, null,
+            IStatus.WARNING, viewer.getControl());
         return;
       }
     }
@@ -607,8 +607,8 @@ public class OneToManyBlock
 
     public OneToManyConfiguration(IManagedForm managedForm, EReference reference)
     {
-      this(managedForm, reference, reference.getEReferenceType(), SecurityUIUtil.getSupportedElementFilter(reference
-          .getEReferenceType()));
+      this(managedForm, reference, reference.getEReferenceType(),
+          SecurityUIUtil.getSupportedElementFilter(reference.getEReferenceType()));
     }
 
     public OneToManyConfiguration(IManagedForm managedForm, EReference reference, EClass itemType)
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyTableBlock.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyTableBlock.java
index 23426d79c7..28f829f48f 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyTableBlock.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyTableBlock.java
@@ -70,10 +70,8 @@ public class OneToManyTableBlock extends OneToManyBlock
     {
       TableViewerColumn column = new TableViewerColumn(viewer, SWT.LEFT);
       column.getColumn().setText(columnTitles[i]);
-      layout.setColumnData(
-          column.getColumn(),
-          new ColumnWeightData(tableConfig.getColumnWeight(i), tableConfig.getColumnMinimumSize(i), tableConfig
-              .isColumnResizable(i)));
+      layout.setColumnData(column.getColumn(), new ColumnWeightData(tableConfig.getColumnWeight(i),
+          tableConfig.getColumnMinimumSize(i), tableConfig.isColumnResizable(i)));
 
       final int columnIndex = i;
 
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/ui/package-info.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/ui/package-info.java
index 71d1c97d8e..29c980376e 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/ui/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/ui/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2013 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) 2013 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
  */
 
 /**
  * Concepts and default implementations for the CDO security user interface.
  */
 package org.eclipse.emf.cdo.security.ui;
-
diff --git a/plugins/org.eclipse.emf.cdo.security/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.security/META-INF/MANIFEST.MF
index 16d217ab05..016f944636 100644
--- a/plugins/org.eclipse.emf.cdo.security/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.security/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.security;singleton:=true
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.internal.security;version="4.3.0";
+Export-Package: org.eclipse.emf.cdo.internal.security;version="4.3.100";
   x-friends:="org.eclipse.emf.cdo.security.edit,
    org.eclipse.emf.cdo.security.editor,
    org.eclipse.emf.cdo.server.security,
@@ -17,10 +17,10 @@ Export-Package: org.eclipse.emf.cdo.internal.security;version="4.3.0";
    org.eclipse.emf.cdo.tests.hibernate,
    org.eclipse.emf.cdo.tests.mongodb,
    org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.internal.security.bundle;version="4.3.0";x-internal:=true,
- org.eclipse.emf.cdo.security;version="4.3.0",
- org.eclipse.emf.cdo.security.impl;version="4.3.0",
- org.eclipse.emf.cdo.security.util;version="4.3.0"
+ org.eclipse.emf.cdo.internal.security.bundle;version="4.3.100";x-internal:=true,
+ org.eclipse.emf.cdo.security;version="4.3.100",
+ org.eclipse.emf.cdo.security.impl;version="4.3.100",
+ org.eclipse.emf.cdo.security.util;version="4.3.100"
 Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.1.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.expressions;bundle-version="[4.3.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/internal/security/bundle/OM.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/internal/security/bundle/OM.java
index 30ccd021cc..7c479a386e 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/internal/security/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/internal/security/bundle/OM.java
@@ -30,7 +30,7 @@ import java.util.ResourceBundle;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PatternStyle.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PatternStyle.java
index 18305b6030..477c4e2381 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PatternStyle.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/PatternStyle.java
@@ -37,29 +37,29 @@ public enum PatternStyle implements Enumerator
    * @ordered
    */
   EXACT(0, "EXACT", "EXACT"), /**
-                              * The '<em><b>TREE</b></em>' literal object.
-                              * <!-- begin-user-doc -->
-                              * <!-- end-user-doc -->
-                              * @see #TREE_VALUE
-                              * @generated
-                              * @ordered
-                              */
+   * The '<em><b>TREE</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #TREE_VALUE
+   * @generated
+   * @ordered
+   */
   TREE(1, "TREE", "TREE"), /**
-                           * The '<em><b>ANT</b></em>' literal object.
-                           * <!-- begin-user-doc -->
-                              * <!-- end-user-doc -->
-                           * @see #ANT_VALUE
-                           * @generated
-                           * @ordered
-                           */
+   * The '<em><b>ANT</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #ANT_VALUE
+   * @generated
+   * @ordered
+   */
   ANT(2, "ANT", "ANT"), /**
-                        * The '<em><b>REGEX</b></em>' literal object.
-                        * <!-- begin-user-doc -->
-                                                     * <!-- end-user-doc -->
-                        * @see #REGEX_VALUE
-                        * @generated
-                        * @ordered
-                        */
+   * The '<em><b>REGEX</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #REGEX_VALUE
+   * @generated
+   * @ordered
+   */
   REGEX(3, "REGEX", "REGEX"); //$NON-NLS-1$ //$NON-NLS-2$
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityItemContainer.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityItemContainer.java
index c162988209..bf63a4221c 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityItemContainer.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityItemContainer.java
@@ -13,9 +13,9 @@ package org.eclipse.emf.cdo.security;
 import org.eclipse.net4j.util.security.IPasswordCredentials;
 
 /**
- * A {@link SecurityItemProvider security item provider} that {@link SecurityItem items} 
+ * A {@link SecurityItemProvider security item provider} that {@link SecurityItem items}
  * such as {@link User users} or {@link Role roles} can be added to or removed from.
- * 
+ *
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  * @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityPackage.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityPackage.java
index 48658c4d30..dc9e0a4227 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityPackage.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/SecurityPackage.java
@@ -2899,7 +2899,7 @@ public interface SecurityPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.security.impl.LinkedFilterImpl <em>Linked Filter</em>}' class.
      * <!-- begin-user-doc -->
-    * @since 4.3
+     * @since 4.3
      * <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.security.impl.LinkedFilterImpl
      * @see org.eclipse.emf.cdo.security.impl.SecurityPackageImpl#getLinkedFilter()
@@ -2910,7 +2910,7 @@ public interface SecurityPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Filter</b></em>' reference feature.
      * <!-- begin-user-doc -->
-    * @since 4.3
+     * @since 4.3
      * <!-- end-user-doc -->
      * @generated
      */
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java
index 3383a00258..8843c04489 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ClassPermissionImpl.java
@@ -75,7 +75,8 @@ public class ClassPermissionImpl extends PermissionImpl implements ClassPermissi
     eSet(SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, newApplicableClass);
   }
 
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
+      CDOBranchPoint securityContext)
   {
     EClass actualClass = revision.getEClass();
     EClass applicableClass = getApplicableClass();
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/FilterPermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/FilterPermissionImpl.java
index ba81320db1..7b6a712b71 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/FilterPermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/FilterPermissionImpl.java
@@ -73,7 +73,8 @@ public class FilterPermissionImpl extends PermissionImpl implements FilterPermis
     return (EList<PermissionFilter>)eGet(SecurityPackage.Literals.FILTER_PERMISSION__FILTERS, true);
   }
 
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
+      CDOBranchPoint securityContext)
   {
     if (TRACER.isEnabled())
     {
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectPermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectPermissionImpl.java
index 125b36abeb..39e293a7a0 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectPermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectPermissionImpl.java
@@ -64,7 +64,8 @@ public abstract class ObjectPermissionImpl extends PermissionImpl implements Obj
   /**
    * @ADDED
    */
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
+      CDOBranchPoint securityContext)
   {
     CDOView view = getView(revisionProvider);
     CDOID id = revision.getID();
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java
index e8ade3f45b..20da58a8ff 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/PackagePermissionImpl.java
@@ -76,7 +76,8 @@ public class PackagePermissionImpl extends PermissionImpl implements PackagePerm
     eSet(SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, newApplicablePackage);
   }
 
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
+      CDOBranchPoint securityContext)
   {
     EPackage actualPackage = revision.getEClass().getEPackage();
     EPackage applicablePackage = getApplicablePackage();
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java
index d3e8401112..9f7449b492 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ResourcePermissionImpl.java
@@ -84,7 +84,8 @@ public class ResourcePermissionImpl extends PermissionImpl implements ResourcePe
     eSet(SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, newPattern);
   }
 
-  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext)
+  public boolean isApplicable(CDORevision revision, CDORevisionProvider revisionProvider,
+      CDOBranchPoint securityContext)
   {
     if (pattern == null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
index 1a6689bb4a..c4d7c848b7 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/SecurityPackageImpl.java
@@ -296,7 +296,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link SecurityPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -314,8 +314,9 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     }
 
     // Obtain or create and register package
-    SecurityPackageImpl theSecurityPackage = (SecurityPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SecurityPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new SecurityPackageImpl());
+    SecurityPackageImpl theSecurityPackage = (SecurityPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof SecurityPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new SecurityPackageImpl());
 
     isInited = true;
 
@@ -1463,335 +1464,229 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
     orFilterEClass.getESuperTypes().add(getCombinedFilter());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(securityElementEClass, SecurityElement.class,
-        "SecurityElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEClass(securityElementEClass, SecurityElement.class, "SecurityElement", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
 
     addEOperation(securityElementEClass, getRealm(), "getRealm", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(securityItemEClass, SecurityItem.class,
-        "SecurityItem", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEClass(securityItemEClass, SecurityItem.class, "SecurityItem", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(realmEClass, Realm.class, "Realm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getRealm_Items(),
-        getSecurityItem(),
-        null,
-        "items", null, 0, -1, Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getRealm_AllUsers(),
-        getUser(),
-        null,
-        "allUsers", null, 0, -1, Realm.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getRealm_AllGroups(),
-        getGroup(),
-        null,
-        "allGroups", null, 0, -1, Realm.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getRealm_AllRoles(),
-        getRole(),
-        null,
-        "allRoles", null, 0, -1, Realm.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getRealm_AllPermissions(),
-        getPermission(),
-        null,
-        "allPermissions", null, 0, -1, Realm.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getRealm_Name(),
-        theEcorePackage.getEString(),
-        "name", null, 0, 1, Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getRealm_DefaultAccess(),
-        getAccessObject(),
-        "defaultAccess", null, 0, 1, Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getRealm_DefaultUserDirectory(),
-        getDirectory(),
-        null,
-        "defaultUserDirectory", null, 0, 1, Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getRealm_DefaultGroupDirectory(),
-        getDirectory(),
-        null,
-        "defaultGroupDirectory", null, 0, 1, Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getRealm_DefaultRoleDirectory(),
-        getDirectory(),
-        null,
-        "defaultRoleDirectory", null, 0, 1, Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+    initEReference(getRealm_Items(), getSecurityItem(), null, "items", null, 0, -1, Realm.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getRealm_AllUsers(), getUser(), null, "allUsers", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getRealm_AllGroups(), getGroup(), null, "allGroups", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getRealm_AllRoles(), getRole(), null, "allRoles", null, 0, -1, Realm.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getRealm_AllPermissions(), getPermission(), null, "allPermissions", null, 0, -1, Realm.class, //$NON-NLS-1$
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        IS_DERIVED, IS_ORDERED);
+    initEAttribute(getRealm_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Realm.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getRealm_DefaultAccess(), getAccessObject(), "defaultAccess", null, 0, 1, Realm.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRealm_DefaultUserDirectory(), getDirectory(), null, "defaultUserDirectory", null, 0, 1, //$NON-NLS-1$
+        Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRealm_DefaultGroupDirectory(), getDirectory(), null, "defaultGroupDirectory", null, 0, 1, //$NON-NLS-1$
+        Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRealm_DefaultRoleDirectory(), getDirectory(), null, "defaultRoleDirectory", null, 0, 1, //$NON-NLS-1$
+        Realm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(directoryEClass, Directory.class, "Directory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getDirectory_Items(),
-        getSecurityItem(),
-        null,
-        "items", null, 0, -1, Directory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getDirectory_Name(),
-        theEcorePackage.getEString(),
-        "name", null, 0, 1, Directory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+    initEReference(getDirectory_Items(), getSecurityItem(), null, "items", null, 0, -1, Directory.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getDirectory_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Directory.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(roleEClass, Role.class, "Role", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-        getRole_Id(),
-        theEcorePackage.getEString(),
-        "id", null, 0, 1, Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getRole_Permissions(),
-        getPermission(),
-        getPermission_Role(),
-        "permissions", null, 0, -1, Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getRole_Assignees(),
-        getAssignee(),
-        getAssignee_Roles(),
-        "assignees", null, 0, -1, Role.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+    initEAttribute(getRole_Id(), theEcorePackage.getEString(), "id", null, 0, 1, Role.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRole_Permissions(), getPermission(), getPermission_Role(), "permissions", null, 0, -1, Role.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getRole_Assignees(), getAssignee(), getAssignee_Roles(), "assignees", null, 0, -1, Role.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(assigneeEClass, Assignee.class, "Assignee", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-        getAssignee_Id(),
-        theEcorePackage.getEString(),
-        "id", null, 0, 1, Assignee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getAssignee_Roles(),
-        getRole(),
-        getRole_Assignees(),
-        "roles", null, 0, -1, Assignee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+    initEAttribute(getAssignee_Id(), theEcorePackage.getEString(), "id", null, 0, 1, Assignee.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAssignee_Roles(), getRole(), getRole_Assignees(), "roles", null, 0, -1, Assignee.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getGroup_Users(),
-        getUser(),
-        getUser_Groups(),
-        "users", null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getGroup_InheritedGroups(),
-        getGroup(),
-        getGroup_InheritingGroups(),
-        "inheritedGroups", null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getGroup_InheritingGroups(),
-        getGroup(),
-        getGroup_InheritedGroups(),
-        "inheritingGroups", null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getGroup_AllInheritedGroups(),
-        getGroup(),
-        null,
-        "allInheritedGroups", null, 0, -1, Group.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getGroup_AllInheritingGroups(),
-        getGroup(),
-        null,
-        "allInheritingGroups", null, 0, -1, Group.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getGroup_AllRoles(),
-        getRole(),
-        null,
-        "allRoles", null, 0, -1, Group.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+    initEReference(getGroup_Users(), getUser(), getUser_Groups(), "users", null, 0, -1, Group.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getGroup_InheritedGroups(), getGroup(), getGroup_InheritingGroups(), "inheritedGroups", null, 0, -1, //$NON-NLS-1$
+        Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getGroup_InheritingGroups(), getGroup(), getGroup_InheritedGroups(), "inheritingGroups", null, 0, -1, //$NON-NLS-1$
+        Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getGroup_AllInheritedGroups(), getGroup(), null, "allInheritedGroups", null, 0, -1, Group.class, //$NON-NLS-1$
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        IS_DERIVED, IS_ORDERED);
+    initEReference(getGroup_AllInheritingGroups(), getGroup(), null, "allInheritingGroups", null, 0, -1, Group.class, //$NON-NLS-1$
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        IS_DERIVED, IS_ORDERED);
+    initEReference(getGroup_AllRoles(), getRole(), null, "allRoles", null, 0, -1, Group.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getUser_Groups(),
-        getGroup(),
-        getGroup_Users(),
-        "groups", null, 0, -1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getUser_Label(),
-        theEcorePackage.getEString(),
-        "label", null, 0, 1, User.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getUser_FirstName(),
-        theEcorePackage.getEString(),
-        "firstName", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getUser_LastName(),
-        theEcorePackage.getEString(),
-        "lastName", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getUser_Email(),
-        theEcorePackage.getEString(),
-        "email", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getUser_DefaultAccessOverride(),
-        getAccessObject(),
-        "defaultAccessOverride", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getUser_DefaultAccess(),
-        getAccessObject(),
-        "defaultAccess", null, 0, 1, User.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getUser_Locked(),
-        theEcorePackage.getEBoolean(),
-        "locked", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getUser_Password(),
-        getUserPassword(),
-        null,
-        "password", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getUser_AllGroups(),
-        getGroup(),
-        null,
-        "allGroups", null, 0, -1, User.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getUser_AllRoles(),
-        getRole(),
-        null,
-        "allRoles", null, 0, -1, User.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getUser_AllPermissions(),
-        getPermission(),
-        null,
-        "allPermissions", null, 0, -1, User.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getUser_UnassignedRoles(),
-        getRole(),
-        null,
-        "unassignedRoles", null, 0, -1, User.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(userPasswordEClass, UserPassword.class,
-        "UserPassword", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-        getUserPassword_Encrypted(),
-        theEcorePackage.getEString(),
-        "encrypted", null, 0, 1, UserPassword.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(permissionEClass, Permission.class,
-        "Permission", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getPermission_Role(),
-        getRole(),
-        getRole_Permissions(),
-        "role", null, 1, 1, Permission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getPermission_Access(),
-        getAccess(),
-        "access", "WRITE", 1, 1, Permission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-    initEClass(classPermissionEClass, ClassPermission.class,
-        "ClassPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getClassPermission_ApplicableClass(),
-        theEcorePackage.getEClass(),
-        null,
-        "applicableClass", null, 1, 1, ClassPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(packagePermissionEClass, PackagePermission.class,
-        "PackagePermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getPackagePermission_ApplicablePackage(),
-        theEcorePackage.getEPackage(),
-        null,
-        "applicablePackage", null, 1, 1, PackagePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(resourcePermissionEClass, ResourcePermission.class,
-        "ResourcePermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-        getResourcePermission_Pattern(),
-        theEcorePackage.getEString(),
-        "pattern", null, 0, 1, ResourcePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(objectPermissionEClass, ObjectPermission.class,
-        "ObjectPermission", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(filterPermissionEClass, FilterPermission.class,
-        "FilterPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getFilterPermission_Filters(),
-        getPermissionFilter(),
-        null,
-        "filters", null, 1, -1, FilterPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(permissionFilterEClass, PermissionFilter.class,
-        "PermissionFilter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(linkedFilterEClass, LinkedFilter.class,
-        "LinkedFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getLinkedFilter_Filter(),
-        getPermissionFilter(),
-        null,
-        "filter", null, 1, 1, LinkedFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(packageFilterEClass, PackageFilter.class,
-        "PackageFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getPackageFilter_ApplicablePackage(),
-        theEcorePackage.getEPackage(),
-        null,
-        "applicablePackage", null, 1, 1, PackageFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(classFilterEClass, ClassFilter.class,
-        "ClassFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getClassFilter_ApplicableClass(),
-        theEcorePackage.getEClass(),
-        null,
-        "applicableClass", null, 1, 1, ClassFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getClassFilter_SubTypes(),
-        theEcorePackage.getEBoolean(),
-        "subTypes", "true", 0, 1, ClassFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-    initEClass(resourceFilterEClass, ResourceFilter.class,
-        "ResourceFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-        getResourceFilter_Path(),
-        theEcorePackage.getEString(),
-        "path", null, 0, 1, ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getResourceFilter_PatternStyle(),
-        getPatternStyle(),
-        "patternStyle", "TREE", 0, 1, ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-    initEAttribute(
-        getResourceFilter_Folders(),
-        theEcorePackage.getEBoolean(),
-        "folders", "true", 0, 1, ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-    initEAttribute(
-        getResourceFilter_TextResources(),
-        theEcorePackage.getEBoolean(),
-        "textResources", "true", 0, 1, ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-    initEAttribute(
-        getResourceFilter_BinaryResources(),
-        theEcorePackage.getEBoolean(),
-        "binaryResources", "true", 0, 1, ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-    initEAttribute(
-        getResourceFilter_ModelResources(),
-        theEcorePackage.getEBoolean(),
-        "modelResources", "true", 0, 1, ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-    initEAttribute(
-        getResourceFilter_ModelObjects(),
-        theEcorePackage.getEBoolean(),
-        "modelObjects", "true", 0, 1, ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-    initEAttribute(
-        getResourceFilter_IncludeParents(),
-        theEcorePackage.getEBoolean(),
-        "includeParents", "true", 0, 1, ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-    initEAttribute(
-        getResourceFilter_IncludeRoot(),
-        theEcorePackage.getEBoolean(),
-        "includeRoot", "true", 0, 1, ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-    initEClass(objectFilterEClass, ObjectFilter.class,
-        "ObjectFilter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(expressionFilterEClass, ExpressionFilter.class,
-        "ExpressionFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getExpressionFilter_Expression(),
-        theExpressionsPackage.getExpression(),
-        null,
-        "expression", null, 1, 1, ExpressionFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(combinedFilterEClass, CombinedFilter.class,
-        "CombinedFilter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getCombinedFilter_Operands(),
-        getPermissionFilter(),
-        null,
-        "operands", null, 1, -1, CombinedFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+    initEReference(getUser_Groups(), getGroup(), getGroup_Users(), "groups", null, 0, -1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getUser_Label(), theEcorePackage.getEString(), "label", null, 0, 1, User.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUser_FirstName(), theEcorePackage.getEString(), "firstName", null, 0, 1, User.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUser_LastName(), theEcorePackage.getEString(), "lastName", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUser_Email(), theEcorePackage.getEString(), "email", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUser_DefaultAccessOverride(), getAccessObject(), "defaultAccessOverride", null, 0, 1, User.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUser_DefaultAccess(), getAccessObject(), "defaultAccess", null, 0, 1, User.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUser_Locked(), theEcorePackage.getEBoolean(), "locked", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getUser_Password(), getUserPassword(), null, "password", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getUser_AllGroups(), getGroup(), null, "allGroups", null, 0, -1, User.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getUser_AllRoles(), getRole(), null, "allRoles", null, 0, -1, User.class, IS_TRANSIENT, IS_VOLATILE, //$NON-NLS-1$
+        !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEReference(getUser_AllPermissions(), getPermission(), null, "allPermissions", null, 0, -1, User.class, //$NON-NLS-1$
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        IS_DERIVED, IS_ORDERED);
+    initEReference(getUser_UnassignedRoles(), getRole(), null, "unassignedRoles", null, 0, -1, User.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
+        IS_ORDERED);
+
+    initEClass(userPasswordEClass, UserPassword.class, "UserPassword", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getUserPassword_Encrypted(), theEcorePackage.getEString(), "encrypted", null, 0, 1, //$NON-NLS-1$
+        UserPassword.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+
+    initEClass(permissionEClass, Permission.class, "Permission", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getPermission_Role(), getRole(), getRole_Permissions(), "role", null, 1, 1, Permission.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPermission_Access(), getAccess(), "access", "WRITE", 1, 1, Permission.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(classPermissionEClass, ClassPermission.class, "ClassPermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getClassPermission_ApplicableClass(), theEcorePackage.getEClass(), null, "applicableClass", null, 1, //$NON-NLS-1$
+        1, ClassPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(packagePermissionEClass, PackagePermission.class, "PackagePermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getPackagePermission_ApplicablePackage(), theEcorePackage.getEPackage(), null, "applicablePackage", //$NON-NLS-1$
+        null, 1, 1, PackagePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(resourcePermissionEClass, ResourcePermission.class, "ResourcePermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getResourcePermission_Pattern(), theEcorePackage.getEString(), "pattern", null, 0, 1, //$NON-NLS-1$
+        ResourcePermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(objectPermissionEClass, ObjectPermission.class, "ObjectPermission", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(filterPermissionEClass, FilterPermission.class, "FilterPermission", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getFilterPermission_Filters(), getPermissionFilter(), null, "filters", null, 1, -1, //$NON-NLS-1$
+        FilterPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(permissionFilterEClass, PermissionFilter.class, "PermissionFilter", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(linkedFilterEClass, LinkedFilter.class, "LinkedFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getLinkedFilter_Filter(), getPermissionFilter(), null, "filter", null, 1, 1, LinkedFilter.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(packageFilterEClass, PackageFilter.class, "PackageFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getPackageFilter_ApplicablePackage(), theEcorePackage.getEPackage(), null, "applicablePackage", null, //$NON-NLS-1$
+        1, 1, PackageFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(classFilterEClass, ClassFilter.class, "ClassFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getClassFilter_ApplicableClass(), theEcorePackage.getEClass(), null, "applicableClass", null, 1, 1, //$NON-NLS-1$
+        ClassFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getClassFilter_SubTypes(), theEcorePackage.getEBoolean(), "subTypes", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+        ClassFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+
+    initEClass(resourceFilterEClass, ResourceFilter.class, "ResourceFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getResourceFilter_Path(), theEcorePackage.getEString(), "path", null, 0, 1, ResourceFilter.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getResourceFilter_PatternStyle(), getPatternStyle(), "patternStyle", "TREE", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getResourceFilter_Folders(), theEcorePackage.getEBoolean(), "folders", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getResourceFilter_TextResources(), theEcorePackage.getEBoolean(), "textResources", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getResourceFilter_BinaryResources(), theEcorePackage.getEBoolean(), "binaryResources", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getResourceFilter_ModelResources(), theEcorePackage.getEBoolean(), "modelResources", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getResourceFilter_ModelObjects(), theEcorePackage.getEBoolean(), "modelObjects", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getResourceFilter_IncludeParents(), theEcorePackage.getEBoolean(), "includeParents", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getResourceFilter_IncludeRoot(), theEcorePackage.getEBoolean(), "includeRoot", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+        ResourceFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(objectFilterEClass, ObjectFilter.class, "ObjectFilter", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(expressionFilterEClass, ExpressionFilter.class, "ExpressionFilter", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getExpressionFilter_Expression(), theExpressionsPackage.getExpression(), null, "expression", null, 1, //$NON-NLS-1$
+        1, ExpressionFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(combinedFilterEClass, CombinedFilter.class, "CombinedFilter", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCombinedFilter_Operands(), getPermissionFilter(), null, "operands", null, 1, -1, //$NON-NLS-1$
+        CombinedFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(notFilterEClass, NotFilter.class, "NotFilter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
@@ -1832,7 +1727,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    */
   protected void createEcoreAnnotations()
   {
-    String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$	
+    String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$
     addAnnotation(realmEClass, source, new String[] { "constraints", "HasAdministrator" //$NON-NLS-1$ //$NON-NLS-2$
     });
     addAnnotation(groupEClass, source, new String[] { "constraints", "AcyclicInheritance" //$NON-NLS-1$ //$NON-NLS-2$
@@ -1847,7 +1742,7 @@ public class SecurityPackageImpl extends EPackageImpl implements SecurityPackage
    */
   protected void createExtendedMetaDataAnnotations()
   {
-    String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$	
+    String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
     addAnnotation(accessObjectEDataType, source, new String[] { "name", "Access:Object", //$NON-NLS-1$ //$NON-NLS-2$
         "baseType", "Access" //$NON-NLS-1$ //$NON-NLS-2$
     });
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/package-info.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/package-info.java
index 764ce3d855..c5e1fb7a83 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * The generated EMF implementation of the CDO security model.
- * 
+ *
  * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.security.impl;
-
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/package-info.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/package-info.java
index 10d5f5eefc..31f3acd4e9 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/package-info.java
@@ -1,19 +1,14 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * The generated EMF API of the CDO security model.
- * 
+ *
  * @apiviz.exclude .*\.EresourcePackage.*
  * @apiviz.exclude .*\.EresourceFactory.*
  */
 package org.eclipse.emf.cdo.security;
-
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java
index 225edf191e..df96fa4eb4 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecuritySwitch.java
@@ -132,9 +132,13 @@ public class SecuritySwitch<T>
       SecurityElement securityElement = (SecurityElement)theEObject;
       T result = caseSecurityElement(securityElement);
       if (result == null)
+      {
         result = caseModelElement(securityElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.SECURITY_ITEM:
@@ -142,11 +146,17 @@ public class SecuritySwitch<T>
       SecurityItem securityItem = (SecurityItem)theEObject;
       T result = caseSecurityItem(securityItem);
       if (result == null)
+      {
         result = caseSecurityElement(securityItem);
+      }
       if (result == null)
+      {
         result = caseModelElement(securityItem);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.REALM:
@@ -154,11 +164,17 @@ public class SecuritySwitch<T>
       Realm realm = (Realm)theEObject;
       T result = caseRealm(realm);
       if (result == null)
+      {
         result = caseSecurityElement(realm);
+      }
       if (result == null)
+      {
         result = caseModelElement(realm);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.DIRECTORY:
@@ -166,13 +182,21 @@ public class SecuritySwitch<T>
       Directory directory = (Directory)theEObject;
       T result = caseDirectory(directory);
       if (result == null)
+      {
         result = caseSecurityItem(directory);
+      }
       if (result == null)
+      {
         result = caseSecurityElement(directory);
+      }
       if (result == null)
+      {
         result = caseModelElement(directory);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.ROLE:
@@ -180,13 +204,21 @@ public class SecuritySwitch<T>
       Role role = (Role)theEObject;
       T result = caseRole(role);
       if (result == null)
+      {
         result = caseSecurityItem(role);
+      }
       if (result == null)
+      {
         result = caseSecurityElement(role);
+      }
       if (result == null)
+      {
         result = caseModelElement(role);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.ASSIGNEE:
@@ -194,13 +226,21 @@ public class SecuritySwitch<T>
       Assignee assignee = (Assignee)theEObject;
       T result = caseAssignee(assignee);
       if (result == null)
+      {
         result = caseSecurityItem(assignee);
+      }
       if (result == null)
+      {
         result = caseSecurityElement(assignee);
+      }
       if (result == null)
+      {
         result = caseModelElement(assignee);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.GROUP:
@@ -208,15 +248,25 @@ public class SecuritySwitch<T>
       Group group = (Group)theEObject;
       T result = caseGroup(group);
       if (result == null)
+      {
         result = caseAssignee(group);
+      }
       if (result == null)
+      {
         result = caseSecurityItem(group);
+      }
       if (result == null)
+      {
         result = caseSecurityElement(group);
+      }
       if (result == null)
+      {
         result = caseModelElement(group);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.USER:
@@ -224,15 +274,25 @@ public class SecuritySwitch<T>
       User user = (User)theEObject;
       T result = caseUser(user);
       if (result == null)
+      {
         result = caseAssignee(user);
+      }
       if (result == null)
+      {
         result = caseSecurityItem(user);
+      }
       if (result == null)
+      {
         result = caseSecurityElement(user);
+      }
       if (result == null)
+      {
         result = caseModelElement(user);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.USER_PASSWORD:
@@ -240,7 +300,9 @@ public class SecuritySwitch<T>
       UserPassword userPassword = (UserPassword)theEObject;
       T result = caseUserPassword(userPassword);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.PERMISSION:
@@ -248,7 +310,9 @@ public class SecuritySwitch<T>
       Permission permission = (Permission)theEObject;
       T result = casePermission(permission);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.CLASS_PERMISSION:
@@ -256,9 +320,13 @@ public class SecuritySwitch<T>
       ClassPermission classPermission = (ClassPermission)theEObject;
       T result = caseClassPermission(classPermission);
       if (result == null)
+      {
         result = casePermission(classPermission);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.PACKAGE_PERMISSION:
@@ -266,9 +334,13 @@ public class SecuritySwitch<T>
       PackagePermission packagePermission = (PackagePermission)theEObject;
       T result = casePackagePermission(packagePermission);
       if (result == null)
+      {
         result = casePermission(packagePermission);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.RESOURCE_PERMISSION:
@@ -276,9 +348,13 @@ public class SecuritySwitch<T>
       ResourcePermission resourcePermission = (ResourcePermission)theEObject;
       T result = caseResourcePermission(resourcePermission);
       if (result == null)
+      {
         result = casePermission(resourcePermission);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.OBJECT_PERMISSION:
@@ -286,9 +362,13 @@ public class SecuritySwitch<T>
       ObjectPermission objectPermission = (ObjectPermission)theEObject;
       T result = caseObjectPermission(objectPermission);
       if (result == null)
+      {
         result = casePermission(objectPermission);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.FILTER_PERMISSION:
@@ -296,9 +376,13 @@ public class SecuritySwitch<T>
       FilterPermission filterPermission = (FilterPermission)theEObject;
       T result = caseFilterPermission(filterPermission);
       if (result == null)
+      {
         result = casePermission(filterPermission);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.PERMISSION_FILTER:
@@ -306,7 +390,9 @@ public class SecuritySwitch<T>
       PermissionFilter permissionFilter = (PermissionFilter)theEObject;
       T result = casePermissionFilter(permissionFilter);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.LINKED_FILTER:
@@ -314,9 +400,13 @@ public class SecuritySwitch<T>
       LinkedFilter linkedFilter = (LinkedFilter)theEObject;
       T result = caseLinkedFilter(linkedFilter);
       if (result == null)
+      {
         result = casePermissionFilter(linkedFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.PACKAGE_FILTER:
@@ -324,9 +414,13 @@ public class SecuritySwitch<T>
       PackageFilter packageFilter = (PackageFilter)theEObject;
       T result = casePackageFilter(packageFilter);
       if (result == null)
+      {
         result = casePermissionFilter(packageFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.CLASS_FILTER:
@@ -334,9 +428,13 @@ public class SecuritySwitch<T>
       ClassFilter classFilter = (ClassFilter)theEObject;
       T result = caseClassFilter(classFilter);
       if (result == null)
+      {
         result = casePermissionFilter(classFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.RESOURCE_FILTER:
@@ -344,9 +442,13 @@ public class SecuritySwitch<T>
       ResourceFilter resourceFilter = (ResourceFilter)theEObject;
       T result = caseResourceFilter(resourceFilter);
       if (result == null)
+      {
         result = casePermissionFilter(resourceFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.OBJECT_FILTER:
@@ -354,9 +456,13 @@ public class SecuritySwitch<T>
       ObjectFilter objectFilter = (ObjectFilter)theEObject;
       T result = caseObjectFilter(objectFilter);
       if (result == null)
+      {
         result = casePermissionFilter(objectFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.EXPRESSION_FILTER:
@@ -364,11 +470,17 @@ public class SecuritySwitch<T>
       ExpressionFilter expressionFilter = (ExpressionFilter)theEObject;
       T result = caseExpressionFilter(expressionFilter);
       if (result == null)
+      {
         result = caseObjectFilter(expressionFilter);
+      }
       if (result == null)
+      {
         result = casePermissionFilter(expressionFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.COMBINED_FILTER:
@@ -376,9 +488,13 @@ public class SecuritySwitch<T>
       CombinedFilter combinedFilter = (CombinedFilter)theEObject;
       T result = caseCombinedFilter(combinedFilter);
       if (result == null)
+      {
         result = casePermissionFilter(combinedFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.NOT_FILTER:
@@ -386,11 +502,17 @@ public class SecuritySwitch<T>
       NotFilter notFilter = (NotFilter)theEObject;
       T result = caseNotFilter(notFilter);
       if (result == null)
+      {
         result = caseCombinedFilter(notFilter);
+      }
       if (result == null)
+      {
         result = casePermissionFilter(notFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.AND_FILTER:
@@ -398,11 +520,17 @@ public class SecuritySwitch<T>
       AndFilter andFilter = (AndFilter)theEObject;
       T result = caseAndFilter(andFilter);
       if (result == null)
+      {
         result = caseCombinedFilter(andFilter);
+      }
       if (result == null)
+      {
         result = casePermissionFilter(andFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case SecurityPackage.OR_FILTER:
@@ -410,11 +538,17 @@ public class SecuritySwitch<T>
       OrFilter orFilter = (OrFilter)theEObject;
       T result = caseOrFilter(orFilter);
       if (result == null)
+      {
         result = caseCombinedFilter(orFilter);
+      }
       if (result == null)
+      {
         result = casePermissionFilter(orFilter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java
index ecddf91c7f..da2f6a1b47 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/SecurityValidator.java
@@ -428,9 +428,9 @@ public class SecurityValidator extends EObjectValidator
         // Detected a cycle
         if (diagnostics != null)
         {
-          diagnostics.add(createDiagnostic(Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0,
-              "_UI_Group_acyclicInheritance_diagnostic", //$NON-NLS-1$
-              new Object[] { group.getId() }, new Object[] { group }, context));
+          diagnostics
+              .add(createDiagnostic(Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0, "_UI_Group_acyclicInheritance_diagnostic", //$NON-NLS-1$
+                  new Object[] { group.getId() }, new Object[] { group }, context));
         }
 
         return false;
diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/package-info.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/package-info.java
index 730cd95003..2f08be5059 100644
--- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/util/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * The generated EMF utilities of the CDO security model.
  */
 package org.eclipse.emf.cdo.security.util;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/admin/package-info.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/admin/package-info.java
index abcb42134c..5a09d8f976 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/admin/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/admin/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Server side of the protocol to administer CDO repositories remotely.
  */
 package org.eclipse.emf.cdo.server.admin;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java
index 4db24e0b3d..a7118afef5 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java
@@ -200,8 +200,8 @@ public class CDOAdminServer extends AbstractCDOAdmin
     if (authProtocol instanceof CDOAdminServerProtocol)
     {
       CDOAdminServerProtocol protocol = (CDOAdminServerProtocol)authProtocol;
-      String message = MessageFormat.format(
-          "The repository \"{0}\" has connected users. Proceed with deletion anyways?", delegate.getName());
+      String message = MessageFormat
+          .format("The repository \"{0}\" has connected users. Proceed with deletion anyways?", delegate.getName());
       try
       {
         if (protocol.sendConfirmationRequest("Repository In Use", message, Confirmation.NO, Confirmation.YES,
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DefaultCDORepositoryConfigurationManager.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DefaultCDORepositoryConfigurationManager.java
index 301bccb459..93e158b745 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DefaultCDORepositoryConfigurationManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DefaultCDORepositoryConfigurationManager.java
@@ -79,8 +79,8 @@ import java.util.Map;
  *
  * @author Christian W. Damus (CEA LIST)
  */
-public class DefaultCDORepositoryConfigurationManager extends Lifecycle implements
-    InternalCDORepositoryConfigurationManager, ContainerAware
+public class DefaultCDORepositoryConfigurationManager extends Lifecycle
+    implements InternalCDORepositoryConfigurationManager, ContainerAware
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG,
       DefaultCDORepositoryConfigurationManager.class);
@@ -344,8 +344,8 @@ public class DefaultCDORepositoryConfigurationManager extends Lifecycle implemen
 
     IExtensionRegistry registry = Platform.getExtensionRegistry();
     @SuppressWarnings("restriction")
-    IConfigurationElement[] elements = registry.getConfigurationElementsFor(
-        org.eclipse.emf.cdo.internal.server.bundle.OM.BUNDLE_ID, IAppExtension.EXT_POINT);
+    IConfigurationElement[] elements = registry
+        .getConfigurationElementsFor(org.eclipse.emf.cdo.internal.server.bundle.OM.BUNDLE_ID, IAppExtension.EXT_POINT);
     for (final IConfigurationElement element : elements)
     {
       if ("appExtension".equals(element.getName())) //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/CatalogPackageImpl.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/CatalogPackageImpl.java
index 9c38faf332..c998c5dc27 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/CatalogPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/CatalogPackageImpl.java
@@ -75,7 +75,7 @@ public class CatalogPackageImpl extends EPackageImpl implements CatalogPackage
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link CatalogPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -93,8 +93,9 @@ public class CatalogPackageImpl extends EPackageImpl implements CatalogPackage
     }
 
     // Obtain or create and register package
-    CatalogPackageImpl theCatalogPackage = (CatalogPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CatalogPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new CatalogPackageImpl());
+    CatalogPackageImpl theCatalogPackage = (CatalogPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof CatalogPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new CatalogPackageImpl());
 
     isInited = true;
 
@@ -257,8 +258,8 @@ public class CatalogPackageImpl extends EPackageImpl implements CatalogPackage
     // Initialize classes, features, and operations; add parameters
     initEClass(repositoryCatalogEClass, RepositoryCatalog.class, "RepositoryCatalog", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRepositoryCatalog_Repositories(), getRepositoryConfiguration(), null, "repositories", null, 0,
-        -1, RepositoryCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getRepositoryCatalog_Repositories(), getRepositoryConfiguration(), null, "repositories", null, 0, -1,
+        RepositoryCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     EOperation op = initEOperation(getRepositoryCatalog__GetRepository__String(), getRepositoryConfiguration(),
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/RepositoryCatalogImpl.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/RepositoryCatalogImpl.java
index f524bd4af8..71a54a59f2 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/RepositoryCatalogImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/RepositoryCatalogImpl.java
@@ -10,9 +10,9 @@
  */
 package org.eclipse.emf.cdo.server.internal.admin.catalog.impl;
 
-import org.eclipse.emf.cdo.server.internal.admin.catalog.RepositoryConfiguration;
 import org.eclipse.emf.cdo.server.internal.admin.catalog.CatalogPackage;
 import org.eclipse.emf.cdo.server.internal.admin.catalog.RepositoryCatalog;
+import org.eclipse.emf.cdo.server.internal.admin.catalog.RepositoryConfiguration;
 
 import org.eclipse.emf.internal.cdo.CDOObjectImpl;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/RepositoryConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/RepositoryConfigurationImpl.java
index 212c3f702f..f7d045a6e8 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/RepositoryConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/catalog/impl/RepositoryConfigurationImpl.java
@@ -11,8 +11,8 @@
 package org.eclipse.emf.cdo.server.internal.admin.catalog.impl;
 
 import org.eclipse.emf.cdo.common.lob.CDOClob;
-import org.eclipse.emf.cdo.server.internal.admin.catalog.RepositoryConfiguration;
 import org.eclipse.emf.cdo.server.internal.admin.catalog.CatalogPackage;
+import org.eclipse.emf.cdo.server.internal.admin.catalog.RepositoryConfiguration;
 
 import org.eclipse.emf.internal.cdo.CDOObjectImpl;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java
index ccd02827b6..d8425e8c8c 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java
@@ -36,7 +36,7 @@ import org.eclipse.spi.net4j.ServerProtocolFactory;
 /**
  * @author Eike Stepper
  */
-public class CDOAdminServerProtocol extends SignalProtocol<CDOAdminServer> implements IAuthenticationProtocol
+public class CDOAdminServerProtocol extends SignalProtocol<CDOAdminServer>implements IAuthenticationProtocol
 {
   public static final long DEFAULT_NEGOTIATION_TIMEOUT = 15 * 1000;
 
@@ -122,8 +122,8 @@ public class CDOAdminServerProtocol extends SignalProtocol<CDOAdminServer> imple
   public Confirmation sendConfirmationRequest(String subject, String message, Confirmation suggestion,
       Confirmation acceptable, Confirmation... more) throws Exception
   {
-    return new ConfirmationRequest(this, CDOAdminProtocolConstants.SIGNAL_CONFIRMATION, new ConfirmationPrompt(subject,
-        message, suggestion, acceptable, more)).send(negotiationTimeout);
+    return new ConfirmationRequest(this, CDOAdminProtocolConstants.SIGNAL_CONFIRMATION,
+        new ConfirmationPrompt(subject, message, suggestion, acceptable, more)).send(negotiationTimeout);
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/spi/admin/CDOAdminHandler2.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/spi/admin/CDOAdminHandler2.java
index ac03b4a6d2..928d59d8c1 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/spi/admin/CDOAdminHandler2.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/spi/admin/CDOAdminHandler2.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.server.IRepository;
  * An optional extension of the {@link CDOAdminHandler} interface that provides
  * additional queries and control functions, such as determination of whether
  * deletion of a particular repository is feasible even to attempt.
- * 
+ *
  * @author Christian W. Damus (CEA LIST)
  * @since 4.2
  */
@@ -31,7 +31,7 @@ public interface CDOAdminHandler2 extends CDOAdminHandler
 
   /**
    * Authenticates the user as a server administrator, if applicable.
-   * 
+   *
    * @throws SecurityException if authentication is required and fails
    */
   public void authenticateAdministrator() throws SecurityException;
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/spi/admin/package-info.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/spi/admin/package-info.java
index a6c7cd5414..7855bb7cff 100644
--- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/spi/admin/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/spi/admin/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Server provider interfaces (SPI) for the protocol to administer CDO repositories remotely.
  */
 package org.eclipse.emf.cdo.server.spi.admin;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java
index 8235bc1eb2..984ee3c184 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java
@@ -123,7 +123,8 @@ public final class CDODBUtil
   /**
    * @since 4.1
    */
-  public static IMappingStrategy createHorizontalMappingStrategy(boolean auditing, boolean branching, boolean withRanges)
+  public static IMappingStrategy createHorizontalMappingStrategy(boolean auditing, boolean branching,
+      boolean withRanges)
   {
     if (branching)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java
index b3a4b34e9f..c2ff4659a2 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java
@@ -198,8 +198,8 @@ public abstract class AbstractTypeMapping implements ITypeMapping
         {
           if (TRACER.isEnabled())
           {
-            TRACER.format(
-                "TypeMapping for {0}: read db.null - setting Revision.null, because of default", feature.getName()); //$NON-NLS-1$
+            TRACER.format("TypeMapping for {0}: read db.null - setting Revision.null, because of default", //$NON-NLS-1$
+                feature.getName());
           }
 
           value = null;
@@ -223,9 +223,8 @@ public abstract class AbstractTypeMapping implements ITypeMapping
   public String toString()
   {
     Object mappedElement = field != null ? field : dbType;
-    return MessageFormat
-        .format(
-            "{0}[{1}.{2} --> {3}]", getClass().getSimpleName(), feature.getEContainingClass().getName(), feature.getName(), mappedElement); //$NON-NLS-1$
+    return MessageFormat.format("{0}[{1}.{2} --> {3}]", getClass().getSimpleName(), //$NON-NLS-1$
+        feature.getEContainingClass().getName(), feature.getName(), mappedElement);
   }
 
   protected Object getDefaultValue()
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMappingFactory.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMappingFactory.java
index 63f443ba7f..61d9c075c9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMappingFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMappingFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,12 +19,12 @@ import org.eclipse.net4j.util.factory.ProductCreationException;
  * Abstract implementation for {@link ITypeMapping.Factory}. Implementors should implement their custom
  * {@link #create(String)} method and construct the factory using their custom descriptor. Subclasses must have a
  * default constructor!
- * 
+ *
  * @author Stefan Winkler
  * @since 4.0
  */
-public abstract class AbstractTypeMappingFactory extends Factory implements
-    org.eclipse.emf.cdo.server.db.mapping.ITypeMapping.Factory
+public abstract class AbstractTypeMappingFactory extends Factory
+    implements org.eclipse.emf.cdo.server.db.mapping.ITypeMapping.Factory
 {
   private ITypeMapping.Descriptor descriptor;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingAuditSupport.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingAuditSupport.java
index c744b5de8b..b37ff16580 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingAuditSupport.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingAuditSupport.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
 
 /**
  * Interface which complements {@link IClassMapping} with methods to facilitate audit support.
- * 
+ *
  * @see IMappingStrategy#hasAuditSupport()
  * @author Eike Stepper
  * @author Stefan Winkler
@@ -27,7 +27,7 @@ public interface IClassMappingAuditSupport
   /**
    * Read a specific version of a revision. If this method returns <code>true</code> it is guaranteed that
    * <code>revision.getVersion() == version</code>
-   * 
+   *
    * @param storeAccessor
    *          the accessor to use.
    * @param revision
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingDeltaSupport.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingDeltaSupport.java
index dad477c58b..dd4e62011b 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingDeltaSupport.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IClassMappingDeltaSupport.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.monitor.OMMonitor;
 
 /**
  * Interface which complements {@link IClassMapping} with methods to facilitate revision delta support.
- * 
+ *
  * @see IMappingStrategy#hasDeltaSupport()
  * @author Eike Stepper
  * @author Stefan Winkler
@@ -28,7 +28,7 @@ public interface IClassMappingDeltaSupport
 {
   /**
    * Write a revision delta.
-   * 
+   *
    * @param accessor
    *          the accessor to use.
    * @param delta
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java
index 46521fd176..a4dcdfb515 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java
@@ -4,7 +4,7 @@
  * 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
  *    Stefan Winkler - major refactoring
@@ -30,7 +30,7 @@ import java.util.List;
 
 /**
  * Interface for mapping features with <code>isMany() == true</code>.
- * 
+ *
  * @author Eike Stepper
  * @author Stefan Winkler
  * @since 2.0
@@ -39,21 +39,21 @@ public interface IListMapping
 {
   /**
    * Return the mapped feature.
-   * 
+   *
    * @return the mapped feature.
    */
   public EStructuralFeature getFeature();
 
   /**
    * Returns all DB tables which are used by this feature.
-   * 
+   *
    * @return a collection of all tables of this feature.
    */
   public Collection<IDBTable> getDBTables();
 
   /**
    * Write a complete list of values to the database.
-   * 
+   *
    * @param accessor
    *          the accessor to use.
    * @param revision
@@ -63,7 +63,7 @@ public interface IListMapping
 
   /**
    * Read the list size and the complete list or the first part of it.
-   * 
+   *
    * @param accessor
    *          the accessor to use.
    * @param revision
@@ -77,7 +77,7 @@ public interface IListMapping
 
   /**
    * Used to load-on-demand chunks of a list.
-   * 
+   *
    * @param dbStoreChunkReader
    *          the chunkReader to use
    * @param chunks
@@ -90,7 +90,7 @@ public interface IListMapping
   /**
    * Hook with which a list mapping is notified that a containing object has been revised. Can be implemented in order
    * to clean up lists of revised objects.
-   * 
+   *
    * @param accessor
    *          the accessor to use.
    * @param id
@@ -103,7 +103,7 @@ public interface IListMapping
 
   /**
    * Retrieve cross-references from DB.
-   * 
+   *
    * @see IClassMapping#queryXRefs(IDBStoreAccessor, IStoreAccessor.QueryXRefsContext, String)
    * @see IStoreAccessor#queryXRefs(IStoreAccessor.QueryXRefsContext)
    * @since 4.0
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping2.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping2.java
index 510d603c47..56595c2a58 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping2.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping2.java
@@ -4,7 +4,7 @@
  * 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,7 +15,7 @@ import org.eclipse.emf.cdo.server.db.IDBStoreAccessor;
 
 /**
  * Extension interface to {@link IListMapping}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.1
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingDeltaSupport.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingDeltaSupport.java
index 32874dcac1..9c5c5a9795 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingDeltaSupport.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMappingDeltaSupport.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.server.db.IDBStoreAccessor;
 
 /**
  * Interface to complement {@link IListMapping} in order to provide list delta processing support.
- * 
+ *
  * @author Eike Stepper
  * @author Stefan Winkler
  * @since 2.0
@@ -27,7 +27,7 @@ public interface IListMappingDeltaSupport
 {
   /**
    * Process a set of CDOFeatureDeltas for a many-valued feature.
-   * 
+   *
    * @param accessor
    *          the accessor to use
    * @param id
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/package-info.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/package-info.java
index 3eaecbc4d5..b3f734d4d8 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server concepts for dealing with mapping strategies and mappings for classes, lists and types.
  */
 package org.eclipse.emf.cdo.server.db.mapping;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/package-info.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/package-info.java
index 06c2be6a71..70147fc5ef 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server concepts for dealing with DB stores and accessors.
  */
 package org.eclipse.emf.cdo.server.db;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
index 0d61bf9fcd..1f3d73b054 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
@@ -35,13 +35,13 @@ public class CDODBSchema
   public static final IDBTable PROPERTIES = INSTANCE.addTable("cdo_properties"); //$NON-NLS-1$
 
   public static final IDBField PROPERTIES_NAME = //
-  PROPERTIES.addField("name", DBType.VARCHAR, 255, true); //$NON-NLS-1$
+      PROPERTIES.addField("name", DBType.VARCHAR, 255, true); //$NON-NLS-1$
 
   public static final IDBField PROPERTIES_VALUE = //
-  PROPERTIES.addField("value", DBType.LONGVARCHAR); //$NON-NLS-1$
+      PROPERTIES.addField("value", DBType.LONGVARCHAR); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_PROPERTIES_PK = //
-  PROPERTIES.addIndex(IDBIndex.Type.PRIMARY_KEY, PROPERTIES_NAME);
+      PROPERTIES.addIndex(IDBIndex.Type.PRIMARY_KEY, PROPERTIES_NAME);
 
   public static final String SQL_DELETE_PROPERTIES = "DELETE FROM " + PROPERTIES + " WHERE " + PROPERTIES_NAME + "=?"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
@@ -60,19 +60,19 @@ public class CDODBSchema
   public static final IDBTable PACKAGE_UNITS = INSTANCE.addTable("cdo_package_units"); //$NON-NLS-1$
 
   public static final IDBField PACKAGE_UNITS_ID = //
-  PACKAGE_UNITS.addField("id", DBType.VARCHAR, 255, true); //$NON-NLS-1$
+      PACKAGE_UNITS.addField("id", DBType.VARCHAR, 255, true); //$NON-NLS-1$
 
   public static final IDBField PACKAGE_UNITS_ORIGINAL_TYPE = //
-  PACKAGE_UNITS.addField("original_type", DBType.INTEGER); //$NON-NLS-1$
+      PACKAGE_UNITS.addField("original_type", DBType.INTEGER); //$NON-NLS-1$
 
   public static final IDBField PACKAGE_UNITS_TIME_STAMP = //
-  PACKAGE_UNITS.addField("time_stamp", DBType.BIGINT); //$NON-NLS-1$
+      PACKAGE_UNITS.addField("time_stamp", DBType.BIGINT); //$NON-NLS-1$
 
   public static final IDBField PACKAGE_UNITS_PACKAGE_DATA = //
-  PACKAGE_UNITS.addField("package_data", DBType.BLOB); //$NON-NLS-1$
+      PACKAGE_UNITS.addField("package_data", DBType.BLOB); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_PACKAGE_UNITS_PK = //
-  PACKAGE_UNITS.addIndex(IDBIndex.Type.PRIMARY_KEY, PACKAGE_UNITS_ID);
+      PACKAGE_UNITS.addIndex(IDBIndex.Type.PRIMARY_KEY, PACKAGE_UNITS_ID);
 
   /**
    * DBTable cdo_packages
@@ -80,22 +80,22 @@ public class CDODBSchema
   public static final IDBTable PACKAGE_INFOS = INSTANCE.addTable("cdo_package_infos"); //$NON-NLS-1$
 
   public static final IDBField PACKAGE_INFOS_URI = //
-  PACKAGE_INFOS.addField("uri", DBType.VARCHAR, 255, true); //$NON-NLS-1$
+      PACKAGE_INFOS.addField("uri", DBType.VARCHAR, 255, true); //$NON-NLS-1$
 
   public static final IDBField PACKAGE_INFOS_PARENT = //
-  PACKAGE_INFOS.addField("parent", DBType.VARCHAR, 255); //$NON-NLS-1$
+      PACKAGE_INFOS.addField("parent", DBType.VARCHAR, 255); //$NON-NLS-1$
 
   public static final IDBField PACKAGE_INFOS_UNIT = //
-  PACKAGE_INFOS.addField("unit", DBType.VARCHAR, 255); //$NON-NLS-1$
+      PACKAGE_INFOS.addField("unit", DBType.VARCHAR, 255); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_PACKAGE_INFOS_PK = //
-  PACKAGE_INFOS.addIndex(IDBIndex.Type.PRIMARY_KEY, PACKAGE_INFOS_URI);
+      PACKAGE_INFOS.addIndex(IDBIndex.Type.PRIMARY_KEY, PACKAGE_INFOS_URI);
 
   public static final IDBIndex INDEX_PACKAGE_INFOS_PARENT = //
-  PACKAGE_INFOS.addIndex(IDBIndex.Type.NON_UNIQUE, PACKAGE_INFOS_PARENT);
+      PACKAGE_INFOS.addIndex(IDBIndex.Type.NON_UNIQUE, PACKAGE_INFOS_PARENT);
 
   public static final IDBIndex INDEX_PACKAGE_INFOS_UNIT = //
-  PACKAGE_INFOS.addIndex(IDBIndex.Type.NON_UNIQUE, PACKAGE_INFOS_UNIT);
+      PACKAGE_INFOS.addIndex(IDBIndex.Type.NON_UNIQUE, PACKAGE_INFOS_UNIT);
 
   /**
    * DBTable cdo_branches
@@ -103,19 +103,19 @@ public class CDODBSchema
   public static final IDBTable BRANCHES = INSTANCE.addTable("cdo_branches"); //$NON-NLS-1$
 
   public static final IDBField BRANCHES_ID = //
-  BRANCHES.addField("id", DBType.INTEGER, true); //$NON-NLS-1$
+      BRANCHES.addField("id", DBType.INTEGER, true); //$NON-NLS-1$
 
   public static final IDBField BRANCHES_NAME = //
-  BRANCHES.addField("name", DBType.VARCHAR); //$NON-NLS-1$
+      BRANCHES.addField("name", DBType.VARCHAR); //$NON-NLS-1$
 
   public static final IDBField BRANCHES_BASE_BRANCH_ID = //
-  BRANCHES.addField("base_id", DBType.INTEGER); //$NON-NLS-1$
+      BRANCHES.addField("base_id", DBType.INTEGER); //$NON-NLS-1$
 
   public static final IDBField BRANCHES_BASE_TIMESTAMP = //
-  BRANCHES.addField("base_time", DBType.BIGINT); //$NON-NLS-1$
+      BRANCHES.addField("base_time", DBType.BIGINT); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_BRANCHES_ID = //
-  BRANCHES.addIndex(IDBIndex.Type.PRIMARY_KEY, BRANCHES_ID);
+      BRANCHES.addIndex(IDBIndex.Type.PRIMARY_KEY, BRANCHES_ID);
 
   public static final String SQL_CREATE_BRANCH = "INSERT INTO " + BRANCHES + " (" + BRANCHES_ID + ", " + BRANCHES_NAME //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
       + ", " + BRANCHES_BASE_BRANCH_ID + ", " + BRANCHES_BASE_TIMESTAMP + ") VALUES (?, ?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -124,7 +124,7 @@ public class CDODBSchema
       + BRANCHES_BASE_TIMESTAMP + " FROM " + BRANCHES + " WHERE " + BRANCHES_ID + "=?"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
   public static final String SQL_RENAME_BRANCH = "UPDATE " + BRANCHES + " SET " + BRANCHES_NAME + "=?" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      + " WHERE " + BRANCHES_ID + "=?"; //$NON-NLS-1$ //$NON-NLS-2$ 
+      + " WHERE " + BRANCHES_ID + "=?"; //$NON-NLS-1$ //$NON-NLS-2$
 
   public static final String SQL_LOAD_SUB_BRANCHES = "SELECT " + BRANCHES_ID + ", " + BRANCHES_NAME + ", " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
       + BRANCHES_BASE_TIMESTAMP + " FROM " + BRANCHES + " WHERE " + BRANCHES_BASE_BRANCH_ID + "=?"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -139,31 +139,32 @@ public class CDODBSchema
   public static final IDBTable COMMIT_INFOS = INSTANCE.addTable("cdo_commit_infos"); //$NON-NLS-1$
 
   public static final IDBField COMMIT_INFOS_TIMESTAMP = //
-  COMMIT_INFOS.addField("commit_time", DBType.BIGINT, true); //$NON-NLS-1$
+      COMMIT_INFOS.addField("commit_time", DBType.BIGINT, true); //$NON-NLS-1$
 
   public static final IDBField COMMIT_INFOS_PREVIOUS_TIMESTAMP = //
-  COMMIT_INFOS.addField("previous_time", DBType.BIGINT); //$NON-NLS-1$
+      COMMIT_INFOS.addField("previous_time", DBType.BIGINT); //$NON-NLS-1$
 
   public static final IDBField COMMIT_INFOS_BRANCH = //
-  COMMIT_INFOS.addField("branch_id", DBType.INTEGER); //$NON-NLS-1$
+      COMMIT_INFOS.addField("branch_id", DBType.INTEGER); //$NON-NLS-1$
 
   public static final IDBField COMMIT_INFOS_USER = //
-  COMMIT_INFOS.addField("user_id", DBType.VARCHAR); //$NON-NLS-1$
+      COMMIT_INFOS.addField("user_id", DBType.VARCHAR); //$NON-NLS-1$
 
   public static final IDBField COMMIT_INFOS_COMMENT = //
-  COMMIT_INFOS.addField("commit_comment", DBType.VARCHAR); //$NON-NLS-1$
+      COMMIT_INFOS.addField("commit_comment", DBType.VARCHAR); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_COMMIT_INFOS_PK = //
-  COMMIT_INFOS.addIndex(IDBIndex.Type.PRIMARY_KEY, COMMIT_INFOS_TIMESTAMP);
+      COMMIT_INFOS.addIndex(IDBIndex.Type.PRIMARY_KEY, COMMIT_INFOS_TIMESTAMP);
 
   public static final IDBIndex INDEX_COMMIT_INFOS_BRANCH = //
-  COMMIT_INFOS.addIndex(IDBIndex.Type.NON_UNIQUE, COMMIT_INFOS_BRANCH);
+      COMMIT_INFOS.addIndex(IDBIndex.Type.NON_UNIQUE, COMMIT_INFOS_BRANCH);
 
   public static final IDBIndex INDEX_COMMIT_INFOS_USER = //
-  COMMIT_INFOS.addIndex(IDBIndex.Type.NON_UNIQUE, COMMIT_INFOS_USER);
+      COMMIT_INFOS.addIndex(IDBIndex.Type.NON_UNIQUE, COMMIT_INFOS_USER);
 
   public static final String SQL_CREATE_COMMIT_INFO = "INSERT INTO " + COMMIT_INFOS + "(" + COMMIT_INFOS_TIMESTAMP //$NON-NLS-1$ //$NON-NLS-2$
-      + ", " + COMMIT_INFOS_PREVIOUS_TIMESTAMP + ", " + COMMIT_INFOS_BRANCH + ", " + COMMIT_INFOS_USER + ", " + COMMIT_INFOS_COMMENT + ") " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+      + ", " + COMMIT_INFOS_PREVIOUS_TIMESTAMP + ", " + COMMIT_INFOS_BRANCH + ", " + COMMIT_INFOS_USER + ", " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+      + COMMIT_INFOS_COMMENT + ") "
       + "VALUES (?, ?, ?, ?, ?)"; //$NON-NLS-1$
 
   /**
@@ -172,29 +173,34 @@ public class CDODBSchema
   public static final IDBTable LOBS = INSTANCE.addTable("cdo_lobs"); //$NON-NLS-1$
 
   public static final IDBField LOBS_ID = //
-  LOBS.addField("id", DBType.VARCHAR, 64, true); //$NON-NLS-1$
+      LOBS.addField("id", DBType.VARCHAR, 64, true); //$NON-NLS-1$
 
   public static final IDBField LOBS_SIZE = //
-  LOBS.addField("lsize", DBType.BIGINT); //$NON-NLS-1$
+      LOBS.addField("lsize", DBType.BIGINT); //$NON-NLS-1$
 
   public static final IDBField LOBS_BDATA = //
-  LOBS.addField("bdata", DBType.BLOB); //$NON-NLS-1$
+      LOBS.addField("bdata", DBType.BLOB); //$NON-NLS-1$
 
   public static final IDBField LOBS_CDATA = //
-  LOBS.addField("cdata", DBType.CLOB); //$NON-NLS-1$
+      LOBS.addField("cdata", DBType.CLOB); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_LOBS_ID = //
-  LOBS.addIndex(IDBIndex.Type.PRIMARY_KEY, LOBS_ID);
+      LOBS.addIndex(IDBIndex.Type.PRIMARY_KEY, LOBS_ID);
 
-  public static final String SQL_QUERY_LOBS = "SELECT 1 FROM " + CDODBSchema.LOBS + " WHERE " + CDODBSchema.LOBS_ID + "=?"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+  public static final String SQL_QUERY_LOBS = "SELECT 1 FROM " + CDODBSchema.LOBS + " WHERE " + CDODBSchema.LOBS_ID //$NON-NLS-1$ //$NON-NLS-2$
+      + "=?"; //$NON-NLS-1$
 
-  public static final String SQL_HANDLE_LOBS = "SELECT " + CDODBSchema.LOBS_ID + ", " + CDODBSchema.LOBS_SIZE + ", " + CDODBSchema.LOBS_BDATA + ", " + CDODBSchema.LOBS_CDATA + " FROM " + CDODBSchema.LOBS; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+  public static final String SQL_HANDLE_LOBS = "SELECT " + CDODBSchema.LOBS_ID + ", " + CDODBSchema.LOBS_SIZE + ", " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+      + CDODBSchema.LOBS_BDATA + ", " + CDODBSchema.LOBS_CDATA + " FROM " + CDODBSchema.LOBS; //$NON-NLS-1$ //$NON-NLS-2$
 
-  public static final String SQL_LOAD_LOB = "SELECT " + CDODBSchema.LOBS_SIZE + ", " + CDODBSchema.LOBS_BDATA + ", " + CDODBSchema.LOBS_CDATA + " FROM " + CDODBSchema.LOBS + " WHERE " + CDODBSchema.LOBS_ID + "=?"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+  public static final String SQL_LOAD_LOB = "SELECT " + CDODBSchema.LOBS_SIZE + ", " + CDODBSchema.LOBS_BDATA + ", " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+      + CDODBSchema.LOBS_CDATA + " FROM " + CDODBSchema.LOBS + " WHERE " + CDODBSchema.LOBS_ID + "=?"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
-  public static final String SQL_WRITE_BLOB = "INSERT INTO " + CDODBSchema.LOBS + "(" + CDODBSchema.LOBS_ID + ", " + CDODBSchema.LOBS_SIZE + ", " + CDODBSchema.LOBS_BDATA + ") VALUES(?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+  public static final String SQL_WRITE_BLOB = "INSERT INTO " + CDODBSchema.LOBS + "(" + CDODBSchema.LOBS_ID + ", " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+      + CDODBSchema.LOBS_SIZE + ", " + CDODBSchema.LOBS_BDATA + ") VALUES(?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$
 
-  public static final String SQL_WRITE_CLOB = "INSERT INTO " + CDODBSchema.LOBS + "(" + CDODBSchema.LOBS_ID + ", " + CDODBSchema.LOBS_SIZE + ", " + CDODBSchema.LOBS_CDATA + ") VALUES(?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+  public static final String SQL_WRITE_CLOB = "INSERT INTO " + CDODBSchema.LOBS + "(" + CDODBSchema.LOBS_ID + ", " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+      + CDODBSchema.LOBS_SIZE + ", " + CDODBSchema.LOBS_CDATA + ") VALUES(?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$
 
   /**
    * Name of object table
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBBrowserPage.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBBrowserPage.java
index 534b3bfa22..925364f192 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBBrowserPage.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBBrowserPage.java
@@ -116,8 +116,8 @@ public class DBBrowserPage extends AbstractPage
     try
     {
       String order = browser.getParam("order");
-      executeQuery(browser, pout, connection, "SELECT * FROM " + table
-          + (order == null ? "" : " ORDER BY " + order + " " + browser.getParam("direction")));
+      executeQuery(browser, pout, connection,
+          "SELECT * FROM " + table + (order == null ? "" : " ORDER BY " + order + " " + browser.getParam("direction")));
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index 7ff993f585..235bfd119c 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -641,8 +641,8 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
     LifecycleUtil.activate(mappingStrategy);
 
     setRevisionTemporality(mappingStrategy.hasAuditSupport() ? RevisionTemporality.AUDITING : RevisionTemporality.NONE);
-    setRevisionParallelism(mappingStrategy.hasBranchingSupport() ? RevisionParallelism.BRANCHING
-        : RevisionParallelism.NONE);
+    setRevisionParallelism(
+        mappingStrategy.hasBranchingSupport() ? RevisionParallelism.BRANCHING : RevisionParallelism.NONE);
 
     if (schemaVersion == FIRST_START)
     {
@@ -796,15 +796,13 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
 
       if (storeIDs)
       {
-        OM.LOG
-            .info(MessageFormat.format(
-                Messages.getString("DBStore.10"), name, lastObjectID, nextLocalObjectID, getLastBranchID(), getLastCommitTime(), getLastNonLocalCommitTime())); //$NON-NLS-1$
+        OM.LOG.info(MessageFormat.format(Messages.getString("DBStore.10"), name, lastObjectID, nextLocalObjectID, //$NON-NLS-1$
+            getLastBranchID(), getLastCommitTime(), getLastNonLocalCommitTime()));
       }
       else
       {
-        OM.LOG
-            .info(MessageFormat.format(
-                Messages.getString("DBStore.10b"), name, getLastBranchID(), getLastCommitTime(), getLastNonLocalCommitTime())); //$NON-NLS-1$
+        OM.LOG.info(MessageFormat.format(Messages.getString("DBStore.10b"), name, getLastBranchID(), //$NON-NLS-1$
+            getLastCommitTime(), getLastNonLocalCommitTime()));
       }
     }
     catch (SQLException e)
@@ -963,7 +961,7 @@ public class DBStore extends Store implements IDBStore, IMappingConstants, CDOAl
   };
 
   private static final SchemaMigrator[] SCHEMA_MIGRATORS = { NO_MIGRATION_NEEDED, NON_AUDIT_MIGRATION,
-      LOB_SIZE_MIGRATION, NO_MIGRATION_NEEDED };
+    LOB_SIZE_MIGRATION, NO_MIGRATION_NEEDED };
 
   static
   {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index ad855e6295..a7a330ba78 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -161,7 +161,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
       public IDBPreparedStatement getPreparedStatement(String sql, ReuseProbability reuseProbability)
       {
         org.eclipse.net4j.db.IDBPreparedStatement.ReuseProbability converted = //
-        org.eclipse.net4j.db.IDBPreparedStatement.ReuseProbability.values()[reuseProbability.ordinal()];
+            org.eclipse.net4j.db.IDBPreparedStatement.ReuseProbability.values()[reuseProbability.ordinal()];
 
         return connection.prepareStatement(sql, converted);
       }
@@ -554,8 +554,8 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
   {
     CDOID id = delta.getID();
     EClass eClass = getObjectType(id);
-    IClassMappingDeltaSupport mapping = (IClassMappingDeltaSupport)getStore().getMappingStrategy().getClassMapping(
-        eClass);
+    IClassMappingDeltaSupport mapping = (IClassMappingDeltaSupport)getStore().getMappingStrategy()
+        .getClassMapping(eClass);
     mapping.writeRevisionDelta(this, delta, created, monitor);
   }
 
@@ -1259,7 +1259,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
       Connection connection = getConnection();
 
       Collection<InternalCDOPackageUnit> imported = //
-      metaDataManager.rawImport(connection, in, fromCommitTime, toCommitTime, monitor.fork());
+          metaDataManager.rawImport(connection, in, fromCommitTime, toCommitTime, monitor.fork());
       packageUnits.addAll(imported);
 
       if (!packageUnits.isEmpty())
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java
index bfc45eabf5..a8ee41fa7f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreFactory.java
@@ -4,11 +4,11 @@
  * 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
  *    Stefan Winkler - 271444: [DB] Multiple refactorings bug 271444
- *    Caspar De Groot - maintenance  
+ *    Caspar De Groot - maintenance
  */
 package org.eclipse.emf.cdo.server.internal.db;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java
index 10ba222724..951909d887 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DurableLockingManager.java
@@ -368,14 +368,14 @@ public class DurableLockingManager extends Lifecycle
 
     sqlInsertLockArea = "INSERT INTO " + LOCK_AREAS + "(" + LOCK_AREAS_ID + "," + LOCK_AREAS_USER_ID + ","
         + LOCK_AREAS_VIEW_BRANCH + "," + LOCK_AREAS_VIEW_TIME + "," + LOCK_AREAS_READ_ONLY + ") VALUES (?, ?, ?, ?, ?)";
-    sqlSelectLockArea = "SELECT " + LOCK_AREAS_USER_ID + "," + LOCK_AREAS_VIEW_BRANCH + "," + LOCK_AREAS_VIEW_TIME
-        + "," + LOCK_AREAS_READ_ONLY + " FROM " + LOCK_AREAS + " WHERE " + LOCK_AREAS_ID + "=?";
+    sqlSelectLockArea = "SELECT " + LOCK_AREAS_USER_ID + "," + LOCK_AREAS_VIEW_BRANCH + "," + LOCK_AREAS_VIEW_TIME + ","
+        + LOCK_AREAS_READ_ONLY + " FROM " + LOCK_AREAS + " WHERE " + LOCK_AREAS_ID + "=?";
     sqlSelectAllLockAreas = "SELECT " + LOCK_AREAS_ID + "," + LOCK_AREAS_USER_ID + "," + LOCK_AREAS_VIEW_BRANCH + ","
         + LOCK_AREAS_VIEW_TIME + "," + LOCK_AREAS_READ_ONLY + " FROM " + LOCK_AREAS;
     sqlSelectLockAreas = sqlSelectAllLockAreas + " WHERE " + LOCK_AREAS_USER_ID + " LIKE ?";
     sqlDeleteLockArea = "DELETE FROM " + LOCK_AREAS + " WHERE " + LOCK_AREAS_ID + "=?";
-    sqlDeleteLockAreas = "DELETE FROM " + LOCK_AREAS + " WHERE EXISTS (SELECT * FROM " + LOCKS + " WHERE " + LOCKS
-        + "." + LOCKS_AREA_ID + "=" + LOCK_AREAS + "." + LOCK_AREAS_ID + ")";
+    sqlDeleteLockAreas = "DELETE FROM " + LOCK_AREAS + " WHERE EXISTS (SELECT * FROM " + LOCKS + " WHERE " + LOCKS + "."
+        + LOCKS_AREA_ID + "=" + LOCK_AREAS + "." + LOCK_AREAS_ID + ")";
 
     // Locks
     locksTable = database.getSchema().getTable(LOCKS);
@@ -395,8 +395,8 @@ public class DurableLockingManager extends Lifecycle
       });
     }
 
-    sqlSelectLocks = "SELECT " + LOCKS_OBJECT_ID + "," + LOCKS_LOCK_GRADE + " FROM " + LOCKS + " WHERE "
-        + LOCKS_AREA_ID + "=?";
+    sqlSelectLocks = "SELECT " + LOCKS_OBJECT_ID + "," + LOCKS_LOCK_GRADE + " FROM " + LOCKS + " WHERE " + LOCKS_AREA_ID
+        + "=?";
     sqlSelectLock = "SELECT " + LOCKS_LOCK_GRADE + " FROM " + LOCKS + " WHERE " + LOCKS_AREA_ID + "=? AND "
         + LOCKS_OBJECT_ID + "=?";
     sqlInsertLock = "INSERT INTO " + LOCKS + "(" + LOCKS_AREA_ID + "," + LOCKS_OBJECT_ID + "," + LOCKS_LOCK_GRADE
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java
index 9fa8768063..ea6398b6e6 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MetaDataManager.java
@@ -130,7 +130,8 @@ public class MetaDataManager extends Lifecycle implements IMetaDataManager
 
   public Collection<InternalCDOPackageUnit> readPackageUnits(Connection connection)
   {
-    return readPackageUnits(connection, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE, new Monitor());
+    return readPackageUnits(connection, CDOBranchPoint.UNSPECIFIED_DATE, CDOBranchPoint.UNSPECIFIED_DATE,
+        new Monitor());
   }
 
   public final void writePackageUnits(Connection connection, InternalCDOPackageUnit[] packageUnits, OMMonitor monitor)
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SQLQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SQLQueryHandler.java
index 7a7ee12bdc..9237c6914f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SQLQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/SQLQueryHandler.java
@@ -138,8 +138,8 @@ public class SQLQueryHandler implements IQueryHandler
             }
             catch (ClassCastException ex)
             {
-              throw new IllegalArgumentException("Parameter " + QUERY_STATEMENT + " must be an boolean but it is a "
-                  + o + " class " + o.getClass().getName(), ex);
+              throw new IllegalArgumentException("Parameter " + QUERY_STATEMENT + " must be an boolean but it is a " + o
+                  + " class " + o.getClass().getName(), ex);
             }
           }
         }
@@ -154,8 +154,8 @@ public class SQLQueryHandler implements IQueryHandler
             }
             catch (ClassCastException ex)
             {
-              throw new IllegalArgumentException("Parameter " + CDO_OBJECT_QUERY + " must be a boolean but it is a "
-                  + o + " class " + o.getClass().getName(), ex);
+              throw new IllegalArgumentException("Parameter " + CDO_OBJECT_QUERY + " must be a boolean but it is a " + o
+                  + " class " + o.getClass().getName(), ex);
             }
           }
         }
@@ -170,8 +170,9 @@ public class SQLQueryHandler implements IQueryHandler
             }
             catch (ClassCastException ex)
             {
-              throw new IllegalArgumentException("Parameter " + MAP_QUERY + " must be a boolean but it is a " + o
-                  + " class " + o.getClass().getName(), ex);
+              throw new IllegalArgumentException(
+                  "Parameter " + MAP_QUERY + " must be a boolean but it is a " + o + " class " + o.getClass().getName(),
+                  ex);
             }
           }
         }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
index df5666a701..0c3af8b528 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  *    Stefan Winkler - Bug 285426: [DB] Implement user-defined typeMapping support
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
index 1aa6b4889d..76e9e1ce1b 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
@@ -62,8 +62,8 @@ public class CoreTypeMappings
    */
   public static class TMEnum extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Enum",
-        EcorePackage.eINSTANCE.getEEnum(), DBType.INTEGER));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Enum", EcorePackage.eINSTANCE.getEEnum(), DBType.INTEGER));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -117,14 +117,14 @@ public class CoreTypeMappings
    */
   public static class TMString extends AbstractTypeMapping
   {
-    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".StringVarchar", EcorePackage.eINSTANCE.getEString(), DBType.VARCHAR));
+    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".StringVarchar", EcorePackage.eINSTANCE.getEString(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".StringLongVarchar", EcorePackage.eINSTANCE.getEString(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".StringLongVarchar", EcorePackage.eINSTANCE.getEString(), DBType.LONGVARCHAR));
 
-    public static final Factory FACTORY_CLOB = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".StringClob",
-        EcorePackage.eINSTANCE.getEString(), DBType.CLOB));
+    public static final Factory FACTORY_CLOB = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".StringClob", EcorePackage.eINSTANCE.getEString(), DBType.CLOB));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -155,11 +155,11 @@ public class CoreTypeMappings
    */
   public static class TMBlob extends AbstractTypeMapping
   {
-    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".BlobStream", EtypesPackage.eINSTANCE.getBlob(), DBType.VARCHAR));
+    public static final Factory FACTORY_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".BlobStream", EtypesPackage.eINSTANCE.getBlob(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".BlobStreamLongVarchar", EtypesPackage.eINSTANCE.getBlob(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".BlobStreamLongVarchar", EtypesPackage.eINSTANCE.getBlob(), DBType.LONGVARCHAR));
 
     @Override
     protected void doSetValue(PreparedStatement stmt, int index, Object value) throws SQLException
@@ -207,11 +207,11 @@ public class CoreTypeMappings
    */
   public static class TMClob extends AbstractTypeMapping
   {
-    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".ClobStream", EtypesPackage.eINSTANCE.getClob(), DBType.VARCHAR));
+    public static final Factory FACTORY_VARCHAR = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".ClobStream", EtypesPackage.eINSTANCE.getClob(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".ClobStreamLongVarchar", EtypesPackage.eINSTANCE.getClob(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".ClobStreamLongVarchar", EtypesPackage.eINSTANCE.getClob(), DBType.LONGVARCHAR));
 
     @Override
     protected void doSetValue(PreparedStatement stmt, int index, Object value) throws SQLException
@@ -259,11 +259,11 @@ public class CoreTypeMappings
    */
   public static class TMShort extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Short",
-        EcorePackage.eINSTANCE.getEShort(), DBType.SMALLINT));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Short", EcorePackage.eINSTANCE.getEShort(), DBType.SMALLINT));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".ShortObject", EcorePackage.eINSTANCE.getEShortObject(), DBType.SMALLINT));
+    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".ShortObject", EcorePackage.eINSTANCE.getEShortObject(), DBType.SMALLINT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -344,11 +344,11 @@ public class CoreTypeMappings
    */
   public static class TMLong extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Long",
-        EcorePackage.eINSTANCE.getELong(), DBType.BIGINT));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Long", EcorePackage.eINSTANCE.getELong(), DBType.BIGINT));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(
-        ID_PREFIX + ".LongObject", EcorePackage.eINSTANCE.getELongObject(), DBType.BIGINT));
+    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".LongObject",
+        EcorePackage.eINSTANCE.getELongObject(), DBType.BIGINT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -379,11 +379,11 @@ public class CoreTypeMappings
    */
   public static class TMInteger extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Integer",
-        EcorePackage.eINSTANCE.getEInt(), DBType.INTEGER));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Integer", EcorePackage.eINSTANCE.getEInt(), DBType.INTEGER));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".IntegerObject", EcorePackage.eINSTANCE.getEIntegerObject(), DBType.INTEGER));
+    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".IntegerObject", EcorePackage.eINSTANCE.getEIntegerObject(), DBType.INTEGER));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -414,11 +414,11 @@ public class CoreTypeMappings
    */
   public static class TMFloat extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Float",
-        EcorePackage.eINSTANCE.getEFloat(), DBType.FLOAT));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Float", EcorePackage.eINSTANCE.getEFloat(), DBType.FLOAT));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".FloatObject", EcorePackage.eINSTANCE.getEFloatObject(), DBType.FLOAT));
+    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".FloatObject", EcorePackage.eINSTANCE.getEFloatObject(), DBType.FLOAT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -449,11 +449,11 @@ public class CoreTypeMappings
    */
   public static class TMDouble extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Double",
-        EcorePackage.eINSTANCE.getEDouble(), DBType.DOUBLE));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Double", EcorePackage.eINSTANCE.getEDouble(), DBType.DOUBLE));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".DoubleObject", EcorePackage.eINSTANCE.getEDoubleObject(), DBType.DOUBLE));
+    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".DoubleObject", EcorePackage.eINSTANCE.getEDoubleObject(), DBType.DOUBLE));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -522,8 +522,8 @@ public class CoreTypeMappings
    */
   public static class TMDate2Date extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Date",
-        EcorePackage.eINSTANCE.getEDate(), DBType.DATE));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Date", EcorePackage.eINSTANCE.getEDate(), DBType.DATE));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -554,8 +554,8 @@ public class CoreTypeMappings
    */
   public static class TMDate2Time extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Time",
-        EcorePackage.eINSTANCE.getEDate(), DBType.TIME));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Time", EcorePackage.eINSTANCE.getEDate(), DBType.TIME));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -586,11 +586,11 @@ public class CoreTypeMappings
    */
   public static class TMCharacter extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Character",
-        EcorePackage.eINSTANCE.getEChar(), DBType.CHAR));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Character", EcorePackage.eINSTANCE.getEChar(), DBType.CHAR));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".CharacterObject", EcorePackage.eINSTANCE.getECharacterObject(), DBType.CHAR));
+    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".CharacterObject", EcorePackage.eINSTANCE.getECharacterObject(), DBType.CHAR));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -639,11 +639,11 @@ public class CoreTypeMappings
    */
   public static class TMCharacter2Integer extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(
-        ID_PREFIX + ".Character2Integer", EcorePackage.eINSTANCE.getEChar(), DBType.INTEGER));
+    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Character2Integer",
+        EcorePackage.eINSTANCE.getEChar(), DBType.INTEGER));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".CharacterObject2Integer", EcorePackage.eINSTANCE.getECharacterObject(), DBType.INTEGER));
+    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(
+        ID_PREFIX + ".CharacterObject2Integer", EcorePackage.eINSTANCE.getECharacterObject(), DBType.INTEGER));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -686,11 +686,11 @@ public class CoreTypeMappings
    */
   public static class TMByte extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Byte",
-        EcorePackage.eINSTANCE.getEByte(), DBType.SMALLINT));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Byte", EcorePackage.eINSTANCE.getEByte(), DBType.SMALLINT));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(
-        ID_PREFIX + ".ByteObject", EcorePackage.eINSTANCE.getEByteObject(), DBType.SMALLINT));
+    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".ByteObject",
+        EcorePackage.eINSTANCE.getEByteObject(), DBType.SMALLINT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -753,8 +753,8 @@ public class CoreTypeMappings
    */
   public static class TMBytesVarbinary extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".ByteArrayVarbinary", EcorePackage.eINSTANCE.getEByteArray(), DBType.VARBINARY));
+    public static final Factory FACTORY = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".ByteArrayVarbinary", EcorePackage.eINSTANCE.getEByteArray(), DBType.VARBINARY));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -785,17 +785,17 @@ public class CoreTypeMappings
    */
   public static class TMBoolean extends AbstractTypeMapping
   {
-    public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".Boolean",
-        EcorePackage.eINSTANCE.getEBoolean(), DBType.BOOLEAN));
+    public static final Factory FACTORY = new Factory(
+        TypeMappingUtil.createDescriptor(ID_PREFIX + ".Boolean", EcorePackage.eINSTANCE.getEBoolean(), DBType.BOOLEAN));
 
-    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".BooleanObject", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.BOOLEAN));
+    public static final Factory FACTORY_OBJECT = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".BooleanObject", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.BOOLEAN));
 
-    public static final Factory FACTORY_SMALLINT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".Boolean_SMALLINT", EcorePackage.eINSTANCE.getEBoolean(), DBType.SMALLINT));
+    public static final Factory FACTORY_SMALLINT = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".Boolean_SMALLINT", EcorePackage.eINSTANCE.getEBoolean(), DBType.SMALLINT));
 
-    public static final Factory FACTORY_OBJECT_SMALLINT = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".BooleanObject_SMALLINT", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.SMALLINT));
+    public static final Factory FACTORY_OBJECT_SMALLINT = new Factory(TypeMappingUtil.createDescriptor(
+        ID_PREFIX + ".BooleanObject_SMALLINT", EcorePackage.eINSTANCE.getEBooleanObject(), DBType.SMALLINT));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -829,8 +829,8 @@ public class CoreTypeMappings
     public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".BigInteger",
         EcorePackage.eINSTANCE.getEBigInteger(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".BigIntegerLongVarChar", EcorePackage.eINSTANCE.getEBigInteger(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(
+        ID_PREFIX + ".BigIntegerLongVarChar", EcorePackage.eINSTANCE.getEBigInteger(), DBType.LONGVARCHAR));
 
     @Override
     protected Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -877,8 +877,8 @@ public class CoreTypeMappings
     public static final Factory FACTORY = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".BigDecimal",
         EcorePackage.eINSTANCE.getEBigDecimal(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".BigDecimalLongVarchar", EcorePackage.eINSTANCE.getEBigDecimal(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(
+        ID_PREFIX + ".BigDecimalLongVarchar", EcorePackage.eINSTANCE.getEBigDecimal(), DBType.LONGVARCHAR));
 
     @Override
     protected Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -922,8 +922,8 @@ public class CoreTypeMappings
    */
   public static class TMJavaClass extends AbstractTypeMapping
   {
-    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".JavaClassVarchar", EcorePackage.eINSTANCE.getEJavaClass(), DBType.VARCHAR));
+    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".JavaClassVarchar", EcorePackage.eINSTANCE.getEJavaClass(), DBType.VARCHAR));
 
     @Override
     public Object getResultSetValue(ResultSet resultSet) throws SQLException
@@ -986,11 +986,11 @@ public class CoreTypeMappings
    */
   public static class TMCustom extends AbstractTypeMapping
   {
-    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".CustomVarchar", EcorePackage.eINSTANCE.getEDataType(), DBType.VARCHAR));
+    public static final Factory FACTORY_VARCHAR = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".CustomVarchar", EcorePackage.eINSTANCE.getEDataType(), DBType.VARCHAR));
 
-    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX
-        + ".CustomLongVarchar", EcorePackage.eINSTANCE.getEDataType(), DBType.LONGVARCHAR));
+    public static final Factory FACTORY_LONG_VARCHAR = new Factory(TypeMappingUtil
+        .createDescriptor(ID_PREFIX + ".CustomLongVarchar", EcorePackage.eINSTANCE.getEDataType(), DBType.LONGVARCHAR));
 
     public static final Factory FACTORY_CLOB = new Factory(TypeMappingUtil.createDescriptor(ID_PREFIX + ".CustomClob",
         EcorePackage.eINSTANCE.getEDataType(), DBType.CLOB));
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
index 44c9c64f52..7bc3b213bd 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingRegistry.java
@@ -306,8 +306,8 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
       if (descriptor == null)
       {
         EClassifier type = getEType(feature);
-        throw new IllegalStateException(MessageFormat.format(Messages.getString("TypeMappingRegistry.1"), feature
-            .getEContainingClass().getName() + "." + feature.getName(),
+        throw new IllegalStateException(MessageFormat.format(Messages.getString("TypeMappingRegistry.1"),
+            feature.getEContainingClass().getName() + "." + feature.getName(),
             type.getEPackage().getName() + "." + type.getName(), dbType.getKeyword()));
       }
 
@@ -359,8 +359,8 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
       dbType = DBType.getTypeByKeyword(typeKeyword);
       if (dbType == null)
       {
-        throw new IllegalArgumentException("Unsupported columnType (" + typeKeyword + ") annotation of feature "
-            + feature.getName());
+        throw new IllegalArgumentException(
+            "Unsupported columnType (" + typeKeyword + ") annotation of feature " + feature.getName());
       }
     }
     else
@@ -391,8 +391,8 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
 
     try
     {
-      columnTypeModifier = (ColumnTypeModifier)IPluginContainer.INSTANCE.getElement(
-          ColumnTypeModifier.Factory.PRODUCT_GROUP, factoryType, null);
+      columnTypeModifier = (ColumnTypeModifier)IPluginContainer.INSTANCE
+          .getElement(ColumnTypeModifier.Factory.PRODUCT_GROUP, factoryType, null);
     }
     catch (FactoryNotFoundException ex)
     {
@@ -515,7 +515,7 @@ public class TypeMappingRegistry implements ITypeMapping.Registry, ITypeMapping.
               registerFactoryType(factoryType);
             }
             else
-            // delta.getKind() == Kind.REMOVED
+              // delta.getKind() == Kind.REMOVED
             {
               // XXX Runtime removal of typeMappingFactories removal of type mappings is currently not supported.
               OM.LOG.warn(Messages.getString("TypeMappingRegistry.3"));
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingUtil.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingUtil.java
index 3745308f5d..e2dc6a5363 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/TypeMappingUtil.java
@@ -68,8 +68,8 @@ public class TypeMappingUtil
 
     if (!matcher.matches())
     {
-      throw new FactoryTypeParserException(MessageFormat.format(Messages.getString("FactoryTypeParserException.1"),
-          factoryType));
+      throw new FactoryTypeParserException(
+          MessageFormat.format(Messages.getString("FactoryTypeParserException.1"), factoryType));
     }
 
     String id = matcher.group(1);
@@ -80,22 +80,22 @@ public class TypeMappingUtil
     EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(packageUri);
     if (ePackage == null)
     {
-      throw new FactoryTypeParserException(MessageFormat.format(Messages.getString("FactoryTypeParserException.2"),
-          packageUri, factoryType));
+      throw new FactoryTypeParserException(
+          MessageFormat.format(Messages.getString("FactoryTypeParserException.2"), packageUri, factoryType));
     }
 
     EClassifier eClassifier = ePackage.getEClassifier(classifierName);
     if (eClassifier == null)
     {
-      throw new FactoryTypeParserException(MessageFormat.format(Messages.getString("FactoryTypeParserException.3"),
-          classifierName, factoryType));
+      throw new FactoryTypeParserException(
+          MessageFormat.format(Messages.getString("FactoryTypeParserException.3"), classifierName, factoryType));
     }
 
     DBType dbType = DBType.getTypeByKeyword(typeKeyword);
     if (dbType == null)
     {
-      throw new FactoryTypeParserException(MessageFormat.format(Messages.getString("FactoryTypeParserException.4"),
-          dbType, factoryType));
+      throw new FactoryTypeParserException(
+          MessageFormat.format(Messages.getString("FactoryTypeParserException.4"), dbType, factoryType));
     }
 
     return new TypeMappingDescriptor(id, factoryType, eClassifier, dbType);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java
index e5e87e5355..0e9d347646 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractFeatureMapTableMapping.java
@@ -313,8 +313,8 @@ public abstract class AbstractFeatureMapTableMapping extends AbstractBasicListTa
 
     if (TRACER.isEnabled())
     {
-      TRACER.format("Reading list values for feature {0}.{1} of {2}v{3}", getContainingClass().getName(), getFeature()
-          .getName(), revision.getID(), revision.getVersion());
+      TRACER.format("Reading list values for feature {0}.{1} of {2}v{3}", getContainingClass().getName(),
+          getFeature().getName(), revision.getID(), revision.getVersion());
     }
 
     String sql = sqlSelectChunksPrefix + sqlOrderByIndex;
@@ -477,9 +477,8 @@ public abstract class AbstractFeatureMapTableMapping extends AbstractBasicListTa
   {
     if (TRACER.isEnabled())
     {
-      TRACER
-          .format(
-              "Writing value for feature {0}.{1} index {2} of {3} : {4}", getContainingClass().getName(), getFeature(), idx, revision, value); //$NON-NLS-1$
+      TRACER.format("Writing value for feature {0}.{1} index {2} of {3} : {4}", getContainingClass().getName(), //$NON-NLS-1$
+          getFeature(), idx, revision, value);
     }
 
     FeatureMap.Entry entry = (FeatureMap.Entry)value;
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
index 5658d26d4f..1645618f60 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalClassMapping.java
@@ -627,8 +627,8 @@ public abstract class AbstractHorizontalClassMapping implements IClassMapping, I
 
         if (version >= CDOBranchVersion.FIRST_VERSION)
         {
-          InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion(id, branchManager
-              .getMainBranch().getVersion(version), CDORevision.UNCHUNKED, true);
+          InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion(id,
+              branchManager.getMainBranch().getVersion(version), CDORevision.UNCHUNKED, true);
 
           if (!handler.handleRevision(revision))
           {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java
index 8d8f12c657..07bce0f952 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditFeatureMapTableMappingWithRanges.java
@@ -85,8 +85,8 @@ import java.util.Map;
  * @author Lothar Werzinger
  * @since 3.0
  */
-public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTableMapping implements
-    IListMappingDeltaSupport
+public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTableMapping
+    implements IListMappingDeltaSupport
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, AuditFeatureMapTableMappingWithRanges.class);
 
@@ -571,9 +571,8 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
   {
     if (TRACER.isEnabled())
     {
-      TRACER
-          .format(
-              "Writing value for feature {0}.{1} index {2} of {3} : {4}", getContainingClass().getName(), getFeature(), idx, revision, value); //$NON-NLS-1$
+      TRACER.format("Writing value for feature {0}.{1} index {2} of {3} : {4}", getContainingClass().getName(), //$NON-NLS-1$
+          getFeature(), idx, revision, value);
     }
 
     addEntry(accessor, revision.getID(), revision.getVersion(), idx, value, revision.getTimeStamp());
@@ -694,8 +693,8 @@ public class AuditFeatureMapTableMappingWithRanges extends AbstractBasicListTabl
     CDOBranch main = getMappingStrategy().getStore().getRepository().getBranchManager().getMainBranch();
 
     // get revision from cache to find out version number
-    CDORevision revision = getMappingStrategy().getStore().getRepository().getRevisionManager()
-        .getRevision(id, main.getHead(), /* chunksize = */0, CDORevision.DEPTH_NONE, true);
+    CDORevision revision = getMappingStrategy().getStore().getRepository().getRevisionManager().getRevision(id,
+        main.getHead(), /* chunksize = */0, CDORevision.DEPTH_NONE, true);
 
     // set cdo_revision_removed for all list items (so we have no NULL values)
     clearList(accessor, id, revision.getVersion(), FINAL_VERSION);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditListTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditListTableMappingWithRanges.java
index ee64791c65..db56e8da10 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditListTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AuditListTableMappingWithRanges.java
@@ -334,8 +334,7 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
 
       if (TRACER.isEnabled())
       {
-        TRACER.format(
-            "Reading {4} list values done for feature {0}.{1} of {2}v{3}", //$NON-NLS-1$
+        TRACER.format("Reading {4} list values done for feature {0}.{1} of {2}v{3}", //$NON-NLS-1$
             getContainingClass().getName(), getFeature().getName(), revision.getID(), revision.getVersion(),
             list.size());
       }
@@ -423,8 +422,8 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
       if (TRACER.isEnabled())
       {
         TRACER.format("Reading list chunk values done for feature() {0}.{1} of {2}v{3}", //$NON-NLS-1$
-            getContainingClass().getName(), getFeature().getName(), chunkReader.getRevision().getID(), chunkReader
-                .getRevision().getVersion());
+            getContainingClass().getName(), getFeature().getName(), chunkReader.getRevision().getID(),
+            chunkReader.getRevision().getVersion());
       }
     }
     catch (SQLException ex)
@@ -458,11 +457,9 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
   {
     if (TRACER.isEnabled())
     {
-      TRACER
-          .format(
-              "Writing value for feature {0}.{1} index {2} of {3}v{4} : {5}", //$NON-NLS-1$
-              getContainingClass().getName(), getFeature().getName(), index, revision.getID(), revision.getVersion(),
-              value);
+      TRACER.format("Writing value for feature {0}.{1} index {2} of {3}v{4} : {5}", //$NON-NLS-1$
+          getContainingClass().getName(), getFeature().getName(), index, revision.getID(), revision.getVersion(),
+          value);
     }
 
     addEntry(accessor, revision.getID(), revision.getVersion(), index, value);
@@ -526,8 +523,8 @@ public class AuditListTableMappingWithRanges extends AbstractBasicListTableMappi
     CDOBranch main = getMappingStrategy().getStore().getRepository().getBranchManager().getMainBranch();
 
     // get revision from cache to find out version number
-    CDORevision revision = getMappingStrategy().getStore().getRepository().getRevisionManager()
-        .getRevision(id, main.getHead(), /* chunksize = */0, CDORevision.DEPTH_NONE, true);
+    CDORevision revision = getMappingStrategy().getStore().getRepository().getRevisionManager().getRevision(id,
+        main.getHead(), /* chunksize = */0, CDORevision.DEPTH_NONE, true);
 
     // set cdo_revision_removed for all list items (so we have no NULL values)
     clearList(accessor, id, revision.getVersion(), FINAL_VERSION);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
index 47efc5de4b..f64e7cfd0b 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingFeatureMapTableMappingWithRanges.java
@@ -83,8 +83,8 @@ import java.util.Map;
  * @author Lothar Werzinger
  * @since 3.0
  */
-public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicListTableMapping implements
-    IListMappingDeltaSupport
+public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicListTableMapping
+    implements IListMappingDeltaSupport
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG,
       BranchingFeatureMapTableMappingWithRanges.class);
@@ -578,8 +578,8 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
 
               if (TRACER.isEnabled())
               {
-                TRACER.format(
-                    "Scheduling range {0}-{1} to be read from base revision", missingValueStartIndex, nextListIndex); //$NON-NLS-1$
+                TRACER.format("Scheduling range {0}-{1} to be read from base revision", missingValueStartIndex, //$NON-NLS-1$
+                    nextListIndex);
               }
 
               baseReader.addRangedChunk(missingValueStartIndex, nextListIndex);
@@ -701,9 +701,8 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
   {
     if (TRACER.isEnabled())
     {
-      TRACER
-          .format(
-              "Writing value for feature {0}.{1} index {2} of {3} : {4}", getContainingClass().getName(), getFeature(), idx, revision, value); //$NON-NLS-1$
+      TRACER.format("Writing value for feature {0}.{1} index {2} of {3} : {4}", getContainingClass().getName(), //$NON-NLS-1$
+          getFeature(), idx, revision, value);
     }
 
     addEntry(accessor, revision.getID(), revision.getBranch().getID(), revision.getVersion(), idx, value,
@@ -1264,13 +1263,12 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
     }
   }
 
-  private void addHistoricEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int versionAdded,
-      int versionRemoved, int index, Object value, long timestamp)
+  private void addHistoricEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int versionAdded, int versionRemoved,
+      int index, Object value, long timestamp)
   {
     if (TRACER.isEnabled())
     {
-      TRACER.format(
-          "Adding historic value for feature {0}.{1} index {2} of {3}:{4}v{5}-v{6} : {7}", //$NON-NLS-1$
+      TRACER.format("Adding historic value for feature {0}.{1} index {2} of {3}:{4}v{5}-v{6} : {7}", //$NON-NLS-1$
           getContainingClass().getName(), getFeature().getName(), index, id, branchId, versionAdded, versionRemoved,
           value);
     }
@@ -1322,8 +1320,8 @@ public class BranchingFeatureMapTableMappingWithRanges extends AbstractBasicList
     }
   }
 
-  private void removeEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion,
-      int index, long timestamp)
+  private void removeEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int index,
+      long timestamp)
   {
     if (TRACER.isEnabled())
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
index 543c9e36f0..a6ba3196b3 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/BranchingListTableMappingWithRanges.java
@@ -81,8 +81,8 @@ import java.util.List;
  * @author Stefan Winkler
  * @author Lothar Werzinger
  */
-public class BranchingListTableMappingWithRanges extends AbstractBasicListTableMapping implements
-    IListMappingDeltaSupport
+public class BranchingListTableMappingWithRanges extends AbstractBasicListTableMapping
+    implements IListMappingDeltaSupport
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, BranchingListTableMappingWithRanges.class);
 
@@ -118,7 +118,8 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
 
   private String sqlClearList;
 
-  public BranchingListTableMappingWithRanges(IMappingStrategy mappingStrategy, EClass eClass, EStructuralFeature feature)
+  public BranchingListTableMappingWithRanges(IMappingStrategy mappingStrategy, EClass eClass,
+      EStructuralFeature feature)
   {
     super(mappingStrategy, eClass, feature);
     initTable();
@@ -497,8 +498,8 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
 
               if (TRACER.isEnabled())
               {
-                TRACER.format(
-                    "Scheduling range {0}-{1} to be read from base revision", missingValueStartIndex, nextListIndex); //$NON-NLS-1$
+                TRACER.format("Scheduling range {0}-{1} to be read from base revision", missingValueStartIndex, //$NON-NLS-1$
+                    nextListIndex);
               }
 
               baseReader.addRangedChunk(missingValueStartIndex, nextListIndex);
@@ -549,9 +550,8 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
 
           if (TRACER.isEnabled())
           {
-            TRACER
-                .format(
-                    "Scheduling range {0}-{1} to be read from base revision", missingValueStartIndex, chunk.getStartIndex() + chunk.size()); //$NON-NLS-1$
+            TRACER.format("Scheduling range {0}-{1} to be read from base revision", missingValueStartIndex, //$NON-NLS-1$
+                chunk.getStartIndex() + chunk.size());
           }
 
           baseReader.addRangedChunk(missingValueStartIndex, chunk.getStartIndex() + chunk.size());
@@ -647,7 +647,8 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
    *          the id of the revision from which to remove all items
    * @param lastIndex
    */
-  public void clearList(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion, int lastIndex)
+  public void clearList(IDBStoreAccessor accessor, CDOID id, int branchId, int oldVersion, int newVersion,
+      int lastIndex)
   {
     // check for each index if the value exists in the current branch
     for (int i = 0; i <= lastIndex; i++)
@@ -985,7 +986,7 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
             }
 
             break;
-          // no entry for current revision there.
+            // no entry for current revision there.
           case 0:
             Object value = getValue(accessor, id, branchId, index, false);
 
@@ -1157,13 +1158,12 @@ public class BranchingListTableMappingWithRanges extends AbstractBasicListTableM
     }
   }
 
-  private void addHistoricEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int versionAdded,
-      int versionRemoved, int index, Object value)
+  private void addHistoricEntry(IDBStoreAccessor accessor, CDOID id, int branchId, int versionAdded, int versionRemoved,
+      int index, Object value)
   {
     if (TRACER.isEnabled())
     {
-      TRACER.format(
-          "Adding historic value for feature {0}.{1} index {2} of {3}:{4}v{5}-v{6} : {7}", //$NON-NLS-1$
+      TRACER.format("Adding historic value for feature {0}.{1} index {2} of {3}:{4}v{5}-v{6} : {7}", //$NON-NLS-1$
           getContainingClass().getName(), getFeature().getName(), index, id, branchId, versionAdded, versionRemoved,
           value);
     }
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java
index 3780bec4d6..939da14a63 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java
@@ -61,8 +61,8 @@ import java.util.Map;
  * @author Eike Stepper
  * @since 2.0
  */
-public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping implements IClassMappingAuditSupport,
-    IClassMappingDeltaSupport
+public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
+    implements IClassMappingAuditSupport, IClassMappingDeltaSupport
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HorizontalAuditClassMapping.class);
 
@@ -324,8 +324,8 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
     }
 
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection()
-        .prepareStatement(builder.toString(), ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(builder.toString(),
+        ReuseProbability.MEDIUM);
 
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java
index 417a25d507..cc8e0cb6fe 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java
@@ -76,8 +76,8 @@ import java.util.Set;
  * @author Stefan Winkler
  * @since 3.0
  */
-public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapping implements
-    IClassMappingAuditSupport, IClassMappingDeltaSupport
+public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapping
+    implements IClassMappingAuditSupport, IClassMappingDeltaSupport
 {
   /**
    * @author Stefan Winkler
@@ -479,8 +479,8 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
     }
 
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection()
-        .prepareStatement(builder.toString(), ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(builder.toString(),
+        ReuseProbability.MEDIUM);
 
     try
     {
@@ -1039,7 +1039,8 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
     }
   }
 
-  private void doCopyOnBranch(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created, OMMonitor monitor)
+  private void doCopyOnBranch(IDBStoreAccessor accessor, InternalCDORevisionDelta delta, long created,
+      OMMonitor monitor)
   {
     monitor.begin(2);
     try
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
index 586c405e54..badde20562 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalNonAuditClassMapping.java
@@ -320,8 +320,8 @@ public class HorizontalNonAuditClassMapping extends AbstractHorizontalClassMappi
     }
 
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection()
-        .prepareStatement(builder.toString(), ReuseProbability.MEDIUM);
+    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(builder.toString(),
+        ReuseProbability.MEDIUM);
 
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java
index c04bcc8b6a..1e540a0e63 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/NonAuditFeatureMapTableMapping.java
@@ -382,8 +382,8 @@ public class NonAuditFeatureMapTableMapping extends AbstractFeatureMapTableMappi
   private void move1down(IDBStoreAccessor accessor, CDOID id, int index, int upperIndex)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(
-        upperIndex == UNBOUNDED_MOVE ? sqlMoveDown : sqlMoveDownWithLimit, ReuseProbability.HIGH);
+    IDBPreparedStatement stmt = accessor.getDBConnection()
+        .prepareStatement(upperIndex == UNBOUNDED_MOVE ? sqlMoveDown : sqlMoveDownWithLimit, ReuseProbability.HIGH);
 
     try
     {
@@ -413,8 +413,8 @@ public class NonAuditFeatureMapTableMapping extends AbstractFeatureMapTableMappi
   private void move1up(IDBStoreAccessor accessor, CDOID id, int index, int upperIndex)
   {
     IIDHandler idHandler = getMappingStrategy().getStore().getIDHandler();
-    IDBPreparedStatement stmt = accessor.getDBConnection().prepareStatement(
-        upperIndex == UNBOUNDED_MOVE ? sqlMoveUp : sqlMoveUpWithLimit, ReuseProbability.HIGH);
+    IDBPreparedStatement stmt = accessor.getDBConnection()
+        .prepareStatement(upperIndex == UNBOUNDED_MOVE ? sqlMoveUp : sqlMoveUpWithLimit, ReuseProbability.HIGH);
 
     try
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/messages/Messages.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/messages/Messages.java
index 0abdaf02ed..c8dc5d4ff9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/db4o/package-info.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/db4o/package-info.java
index 02cd8f71af..3a8c792cd2 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/db4o/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/db4o/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server concepts for dealing with DB4O stores and accessors.
  */
 package org.eclipse.emf.cdo.server.db4o;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStoreAccessor.java
index 11362c28e4..bb83df0f86 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStoreAccessor.java
@@ -115,8 +115,8 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
 
   public EPackage[] loadPackageUnit(InternalCDOPackageUnit packageUnit)
   {
-    DB4OPackageUnit db4OPackageUnit = getPrimitivePackageUnitMap().get(
-        packageUnit.getTopLevelPackageInfo().getPackageURI());
+    DB4OPackageUnit db4OPackageUnit = getPrimitivePackageUnitMap()
+        .get(packageUnit.getTopLevelPackageInfo().getPackageURI());
     return EMFUtil.getAllPackages(db4OPackageUnit.getEPackage());
   }
 
@@ -198,8 +198,8 @@ public class DB4OStoreAccessor extends LongIDStoreAccessor implements Raw, Durab
     final boolean exactMatch = context.exactMatch();
     // RootResource may not be initialized, as there may be queries during IStore activation
     CDOID rootResourceID = getStore().getRepository().getRootResourceID();
-    final Object rootResourceLongID = rootResourceID != null ? DB4ORevision.getDB4OID(getStore().getRepository()
-        .getRootResourceID()) : null;
+    final Object rootResourceLongID = rootResourceID != null
+        ? DB4ORevision.getDB4OID(getStore().getRepository().getRootResourceID()) : null;
 
     ObjectSet<DB4ORevision> revisionObjectSet = getObjectContainer().query(new Predicate<DB4ORevision>()
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/bundle/OM.java
index 7c9c65ceec..9b6dccf943 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/bundle/OM.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Victor Roldan Betancort
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
index 816bcc42e8..92def4f894 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.hibernate.teneo;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -27,8 +27,8 @@ Import-Package: org.eclipse.emf.cdo.security;version="[4.0.0,5.0.0)",
  org.eclipse.emf.teneo.hibernate.mapper;version="[2.0.1,3.0.0)",
  org.eclipse.emf.teneo.simpledom;version="[2.0.1,3.0.0)",
  org.eclipse.emf.teneo.util;version="[2.0.1,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.hibernate.internal.teneo;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
- org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
- org.eclipse.emf.cdo.server.hibernate.teneo;version="4.2.100"
+Export-Package: org.eclipse.emf.cdo.server.hibernate.internal.teneo;version="4.2.200";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
+ org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle;version="4.2.200";x-friends:="org.eclipse.emf.cdo.tests.hibernate",
+ org.eclipse.emf.cdo.server.hibernate.teneo;version="4.2.200"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java
index 68e91a1f33..9eb82a82f0 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java
@@ -45,7 +45,7 @@ import java.util.Properties;
 
 /**
  * Uses the ecore string in the ePackages of the store to generate a mapping.
- * 
+ *
  * @author Martin Taal
  * @author Eike Stepper
  * @since 3.0
@@ -104,8 +104,8 @@ public class TeneoHibernateMappingProvider extends HibernateMappingProvider
     properties.putAll(storeProperties);
     properties.putAll(mappingProviderProperties);
 
-    PackageRegistryProvider.getInstance().setThreadPackageRegistry(
-        getHibernateStore().getRepository().getPackageRegistry());
+    PackageRegistryProvider.getInstance()
+        .setThreadPackageRegistry(getHibernateStore().getRepository().getPackageRegistry());
 
     // translate the list of EPackages to an array
     boolean hasXMLTypePackage = false;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java
index 9710a9cbdd..1ea1952985 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java
@@ -20,7 +20,7 @@ import java.util.Properties;
 
 /**
  * Reads the hibernate mapping file from one or more resource locations and adds them to the configuration.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/ExportHbmCommand.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/ExportHbmCommand.java
index 4d5fd8eab6..0934964199 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/ExportHbmCommand.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/ExportHbmCommand.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/OM.java
index 2eeb9ebe30..86c054cf1d 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  *    Erdal Karaca - added HibernateCommandProvider
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOBasicMapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOBasicMapper.java
index 200edf1d5c..60a7f1b039 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOBasicMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOBasicMapper.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.teneo.simpledom.Element;
 
 /**
  * Extends enum mapping with parameters for epackage and eclass. This will be solved in the next build of Teneo.
- * 
+ *
  * @author <a href="mtaal@elver.org">Martin Taal</a>
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEDataTypeAnnotator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEDataTypeAnnotator.java
index 4ff407c1e0..f9c858d8a2 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEDataTypeAnnotator.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEDataTypeAnnotator.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.teneo.hibernate.annotations.HbEDataTypeAnnotator;
 
 /**
  * Makes sure that the default type is a String.
- * 
+ *
  * @author Martin Taal
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java
index 726c9b2779..64e6d871d6 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.teneo.annotations.pannotation.PannotationFactory;
 
 /**
  * Extends the Teneo EFeatureAnnotator to add an external annotation to each EReference to an EModelElement.
- * 
+ *
  * @author Martin Taal
  * @since 3.0
  */
@@ -38,12 +38,14 @@ public class CDOEFeatureAnnotator extends EFeatureAnnotator
     if (aStructuralFeature instanceof PAnnotatedEReference)
     {
       final PAnnotatedEReference paReference = (PAnnotatedEReference)aStructuralFeature;
-      final boolean refersToEcoreModelElement = paReference.getModelEReference().getEReferenceType().getEPackage() == EcorePackage.eINSTANCE;
+      final boolean refersToEcoreModelElement = paReference.getModelEReference().getEReferenceType()
+          .getEPackage() == EcorePackage.eINSTANCE;
 
       // these are done with a <any ..> mapping
       final boolean refersToEObject = paReference.getModelEReference().getEReferenceType() == EcorePackage.eINSTANCE
           .getEObject();
-      final boolean isPartOfEcoreModel = paReference.getModelEReference().getEContainingClass().getEPackage() == EcorePackage.eINSTANCE;
+      final boolean isPartOfEcoreModel = paReference.getModelEReference().getEContainingClass()
+          .getEPackage() == EcorePackage.eINSTANCE;
       if (refersToEcoreModelElement && !isPartOfEcoreModel && !refersToEObject)
       {
         paReference.setExternal(PannotationFactory.eINSTANCE.createExternal());
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEntityMapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEntityMapper.java
index de0b989dd1..9b72a8163b 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEntityMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEntityMapper.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 /**
  * Adds mapping for econtainer and eresource.
- * 
+ *
  * @author <a href="mtaal@elver.org">Martin Taal</a>
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOManyAttributeMapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOManyAttributeMapper.java
index d3e655cbc4..453624ff63 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOManyAttributeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOManyAttributeMapper.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.teneo.hibernate.mapper.ManyAttributeMapper;
 
 /**
  * Extends the Teneo ManyAttributeMapper to force eager load of all primitive type lists.
- * 
+ *
  * @author Martin Taal
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingContext.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingContext.java
index 4f005724a4..de64d22309 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingContext.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingContext.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.teneo.simpledom.Element;
 
 /**
  * Mapping context for CDO. It provides cdo classes as propertyhandler etc.
- * 
+ *
  * @author <a href="mtaal@elver.org">Martin Taal</a>
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java
index a713d5ae84..f571718fe2 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java
@@ -32,7 +32,7 @@ import java.util.Properties;
 
 /**
  * Generates a CDO enabled mapping for Hibernate.
- * 
+ *
  * @author <a href="mtaal@elver.org">Martin Taal</a>
  * @since 3.0
  */
@@ -75,7 +75,8 @@ public class CDOMappingGenerator
     }
   }
 
-  protected void addDefaultExtension(Class<?> extensionClass, Class<?> extendingClass, ExtensionManager extensionManager)
+  protected void addDefaultExtension(Class<?> extensionClass, Class<?> extendingClass,
+      ExtensionManager extensionManager)
   {
     if (extensions.containsKey(extensionClass.getName()))
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyMapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyMapper.java
index 422c94d554..7150752d69 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyMapper.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * Prevent delete-orphan.
- * 
+ *
  * @author <a href="mtaal@elver.org">Martin Taal</a>
  * @since 4.2
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyReferenceAnnotator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyReferenceAnnotator.java
index e86473bfdb..454918cfd8 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyReferenceAnnotator.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyReferenceAnnotator.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference;
 
 /**
  * Prevent automatically added delete-orphan.
- * 
+ *
  * @author Martin Taal
  * @since 4.2
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOXmlPersistenceContentHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOXmlPersistenceContentHandler.java
index ebd5711b4f..6707f04f8c 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOXmlPersistenceContentHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOXmlPersistenceContentHandler.java
@@ -23,7 +23,7 @@ import org.xml.sax.SAXException;
 
 /**
  * With cdo packages are registered at runtime so if the package in the xml is not yet present then be lenient about it.
- * 
+ *
  * @author <a href="mtaal@elver.org">Martin Taal</a>
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoUtil.java
index b5d1bcd3d8..4d82ac7d38 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
index b366181241..7d6dfea969 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.hibernate;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,11 +14,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.common;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.server.hibernate;version="4.2.100",
- org.eclipse.emf.cdo.server.internal.hibernate;version="4.2.100";x-friends:="org.eclipse.emf.cdo.server.hibernate.teneo,org.eclipse.emf.cdo.tests.hibernate",
- org.eclipse.emf.cdo.server.internal.hibernate.bundle;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.server.internal.hibernate.info;version="4.2.100";x-friends:="org.eclipse.emf.cdo.server.hibernate.teneo,org.eclipse.emf.cdo.tests.hibernate",
- org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;version="4.2.100";x-friends:="org.eclipse.emf.cdo.server.hibernate.teneo,org.eclipse.emf.cdo.tests.hibernate"
+Export-Package: org.eclipse.emf.cdo.server.hibernate;version="4.2.200",
+ org.eclipse.emf.cdo.server.internal.hibernate;version="4.2.200";x-friends:="org.eclipse.emf.cdo.server.hibernate.teneo,org.eclipse.emf.cdo.tests.hibernate",
+ org.eclipse.emf.cdo.server.internal.hibernate.bundle;version="4.2.200";x-internal:=true,
+ org.eclipse.emf.cdo.server.internal.hibernate.info;version="4.2.200";x-friends:="org.eclipse.emf.cdo.server.hibernate.teneo,org.eclipse.emf.cdo.tests.hibernate",
+ org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;version="4.2.200";x-friends:="org.eclipse.emf.cdo.server.hibernate.teneo,org.eclipse.emf.cdo.tests.hibernate"
 Import-Package: org.apache.log4j;version="[1.2.12,1.3.0)",
  org.eclipse.emf.teneo;version="[2.0.1,3.0.0)",
  org.eclipse.emf.teneo.annotations.mapper;version="[2.0.1,3.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java
index 6441db54ef..c533d54d54 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStore.java
@@ -23,7 +23,7 @@ import org.hibernate.cfg.Configuration;
 /**
  * The Hibernate store manages the Hibernate {@link SessionFactory} and the installed
  * {@link EPackage} instances.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  * @noextend This interface is not intended to be extended by clients.
@@ -43,7 +43,7 @@ public interface IHibernateStore extends IStore, IDBConnectionProvider, IStore.C
 
   /**
    * If results should be cached in the query cache, only needed if they are accessed directly as part of the query.
-   * 
+   *
    * @since 4.0
    */
   public static final String CACHE_RESULTS = "cacheResults"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java
index 295e530f87..62c77ac3e2 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreAccessor.java
@@ -19,9 +19,9 @@ import org.hibernate.Session;
 
 /**
  * The Hibernate store accessor works with Hibernate {@link Session} instances
- * to persist changes in the database, it obtains the {@link Session} from the 
+ * to persist changes in the database, it obtains the {@link Session} from the
  * {@link IHibernateStore}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java
index 4a3c458600..996ab5ad78 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/IHibernateStoreChunkReader.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.server.IStoreChunkReader;
 
 /**
  * Hibernate specific implementation of the {@link IStoreChunkReader}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/package-info.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/package-info.java
index f5ed30e02e..71f1f6bbed 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server concepts for dealing with Hibernate stores and accessors.
  */
 package org.eclipse.emf.cdo.server.hibernate;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java
index 958bd619af..f5a29cd6a3 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOAuditHandler.java
@@ -43,7 +43,7 @@ import java.util.Collection;
 /**
  * Overrides the {@link AuditHandler} to implement CDO
  * specific audit handling.
- * 
+ *
  * @author Martin Taal
  */
 public class CDOAuditHandler extends AuditHandler
@@ -55,8 +55,8 @@ public class CDOAuditHandler extends AuditHandler
     final InternalCDORevision cdoRevision = (InternalCDORevision)object;
 
     teneoAuditEntry.setTeneo_container_feature_id(cdoRevision.getContainingFeatureID());
-    teneoAuditEntry.setTeneo_container_id(HibernateUtil.getInstance().convertCDOIDToString(
-        (CDOID)cdoRevision.getContainerID()));
+    teneoAuditEntry
+        .setTeneo_container_id(HibernateUtil.getInstance().convertCDOIDToString((CDOID)cdoRevision.getContainerID()));
   }
 
   @Override
@@ -173,8 +173,8 @@ public class CDOAuditHandler extends AuditHandler
             {
               for (Object value : (Collection<?>)source.getList(sourceEFeature))
               {
-                ((Collection<Object>)auditEntry.eGet(targetEFeature)).add(convertValue(sourceEFeature, targetEFeature,
-                    value));
+                ((Collection<Object>)auditEntry.eGet(targetEFeature))
+                    .add(convertValue(sourceEFeature, targetEFeature, value));
               }
             }
           }
@@ -249,8 +249,8 @@ public class CDOAuditHandler extends AuditHandler
         cnt++;
         if (cnt > 1000)
         {
-          throw new IllegalStateException("Cycle detected in id mappings " + newID + " maps to "
-              + commitContext.getIDMappings().get(newID));
+          throw new IllegalStateException(
+              "Cycle detected in id mappings " + newID + " maps to " + commitContext.getIDMappings().get(newID));
         }
       }
       cdoID = newID;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java
index 032ddf21cc..3798dd8f8a 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateBranchPointImpl.java
@@ -26,7 +26,8 @@ public class CDOHibernateBranchPointImpl extends CDOBranchPointImpl
 
   public CDOHibernateBranchPointImpl(long timeStamp)
   {
-    super(HibernateThreadContext.getCurrentStoreAccessor().getStore().getRepository().getBranchManager()
-        .getMainBranch(), timeStamp);
+    super(
+        HibernateThreadContext.getCurrentStoreAccessor().getStore().getRepository().getBranchManager().getMainBranch(),
+        timeStamp);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateConstants.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateConstants.java
index 3b72524970..d39354807b 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateConstants.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/CDOHibernateConstants.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.server.internal.hibernate;
 
 /**
  * Maintains constants used in the CDO-Hibernate integration.
- * 
+ *
  * @author Martin Taal
  */
 public class CDOHibernateConstants
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/ContainerInfoConverter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/ContainerInfoConverter.java
index 7ee1fbb983..b1569188b3 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/ContainerInfoConverter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/ContainerInfoConverter.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 /**
  * Is responsible for converting container related information from and to a string representation.
- * 
+ *
  * @see InternalCDORevision#getContainerID()
  * @see InternalCDORevision#getContainingFeatureID()
  * @see InternalCDORevision#getContainingFeatureID()
@@ -57,7 +57,7 @@ public class ContainerInfoConverter
    * Converts the container information of a {@link InternalCDORevision} to a String representation. The container
    * information is the container id ({@link InternalCDORevision#getContainerID()} and the containingFeatureID (
    * {@link InternalCDORevision#getContainingFeatureID()}).
-   * 
+   *
    * @param cdoRevision
    *          the InternalCDORevision which has the container information
    * @return a String representation of the container information which can be stored in a single varchar in the
@@ -72,7 +72,7 @@ public class ContainerInfoConverter
    * Converts the container information of a {@link InternalCDORevision} to a String representation. The container
    * information is the container id ({@link InternalCDORevision#getContainerID()} and the containingFeatureID (
    * {@link InternalCDORevision#getContainingFeatureID()}).
-   * 
+   *
    * @param cdoRevision
    *          the InternalCDORevision which has the container information
    * @param containerID
@@ -113,7 +113,7 @@ public class ContainerInfoConverter
   /**
    * Converts the String generated by the method {@link #convertContainerRelationToString(InternalCDORevision)} back to
    * container information and sets this in the cdoRevision.
-   * 
+   *
    * @param cdoRevision
    *          the InternalCDORevision in which the container info is stored.
    * @param containerInfo
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProvider.java
index 2514499268..0e1d27784d 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProvider.java
@@ -26,7 +26,7 @@ import java.io.InputStreamReader;
 
 /**
  * Reads the hibernate mapping file from one or more resource locations and adds them to the configuration.
- * 
+ *
  * @author Martin Taal
  */
 public class FileHibernateMappingProvider extends HibernateMappingProvider
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java
index 705fe19295..cfeed9c798 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/FileHibernateMappingProviderFactory.java
@@ -20,7 +20,7 @@ import org.w3c.dom.NodeList;
 
 /**
  * Reads the hibernate mapping file from one or more resource locations and adds them to the configuration.
- * 
+ *
  * @author Martin Taal
  */
 public class FileHibernateMappingProviderFactory implements IHibernateMappingProvider.Factory
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java
index e672cb8eb3..b2542dd07a 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateAuditHandler.java
@@ -115,17 +115,18 @@ public class HibernateAuditHandler
     final InternalCDORevision revision;
     if (teneoAuditEntry.getTeneo_audit_kind() == TeneoAuditKind.DELETE)
     {
-      revision = new DetachedCDORevision(domainEClass, cdoID, hibernateStore.getRepository().getBranchManager()
-          .getMainBranch(), new Long(teneoAuditEntry.getTeneo_object_version()).intValue(),
-          teneoAuditEntry.getTeneo_start(), CDOBranchPoint.UNSPECIFIED_DATE);
+      revision = new DetachedCDORevision(domainEClass, cdoID,
+          hibernateStore.getRepository().getBranchManager().getMainBranch(),
+          new Long(teneoAuditEntry.getTeneo_object_version()).intValue(), teneoAuditEntry.getTeneo_start(),
+          CDOBranchPoint.UNSPECIFIED_DATE);
       revision.setRevised(CDOBranchPoint.UNSPECIFIED_DATE);
     }
     else
     {
       revision = hibernateStore.createRevision(domainEClass, cdoID);
       revision.setVersion(new Long(teneoAuditEntry.getTeneo_object_version()).intValue());
-      revision.setBranchPoint(storeAccessor.getStore().getMainBranchHead().getBranch()
-          .getPoint(teneoAuditEntry.getTeneo_start()));
+      revision.setBranchPoint(
+          storeAccessor.getStore().getMainBranchHead().getBranch().getPoint(teneoAuditEntry.getTeneo_start()));
       if (teneoAuditEntry.getTeneo_end() > 0)
       {
         revision.setRevised(teneoAuditEntry.getTeneo_end());
@@ -200,8 +201,8 @@ public class HibernateAuditHandler
     }
     if (targetEFeature instanceof EReference)
     {
-      final CDOID cdoID = value instanceof CDOID ? (CDOID)value : HibernateUtil.getInstance().convertStringToCDOID(
-          (String)value);
+      final CDOID cdoID = value instanceof CDOID ? (CDOID)value
+          : HibernateUtil.getInstance().convertStringToCDOID((String)value);
       return cdoID;
     }
     if (value instanceof Enumerator)
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateCDOPackageUnitDTO.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateCDOPackageUnitDTO.java
index 79610b0abb..23d4eee9ac 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateCDOPackageUnitDTO.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateCDOPackageUnitDTO.java
@@ -29,7 +29,7 @@ import java.sql.Blob;
 
 /**
  * A DTO for convenience of storing a CDOPackageUnit in the db.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateCDOPackageUnitDTO
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java
index d436bd1ec0..2cf0516216 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateQueryHandler.java
@@ -233,8 +233,8 @@ public class HibernateQueryHandler implements IQueryHandler
     final InternalCDORevisionManager cdoRevisionManager = hibernateStoreAccessor.getStore().getRepository()
         .getRevisionManager();
 
-    final CDOBranchVersion cdoBranchVersion = new CDOBranchVersionImpl(hibernateStoreAccessor.getStore()
-        .getMainBranchHead().getBranch(), internalCDORevision.getVersion() - 1);
+    final CDOBranchVersion cdoBranchVersion = new CDOBranchVersionImpl(
+        hibernateStoreAccessor.getStore().getMainBranchHead().getBranch(), internalCDORevision.getVersion() - 1);
     if (cdoRevisionManager.containsRevisionByVersion(internalCDORevision.getID(), cdoBranchVersion))
     {
       return cdoRevisionManager.getRevisionByVersion(internalCDORevision.getID(), cdoBranchVersion, -1, true);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
index 9a15b93aa8..c1b57e36e2 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
@@ -96,8 +96,8 @@ public class HibernateStore extends Store implements IHibernateStore
 
   public static final String ID_TYPE_EANNOTATION_KEY = "id_type";
 
-  public static final Set<ObjectType> OBJECT_ID_TYPES = new HashSet<ObjectType>(Arrays.asList(
-      CDOID.ObjectType.STRING_WITH_CLASSIFIER, CDOID.ObjectType.LONG_WITH_CLASSIFIER));
+  public static final Set<ObjectType> OBJECT_ID_TYPES = new HashSet<ObjectType>(
+      Arrays.asList(CDOID.ObjectType.STRING_WITH_CLASSIFIER, CDOID.ObjectType.LONG_WITH_CLASSIFIER));
 
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, HibernateStore.class);
 
@@ -201,7 +201,7 @@ public class HibernateStore extends Store implements IHibernateStore
   }
 
   /**
-   * Returns all model epackages, so no audit epackages or system 
+   * Returns all model epackages, so no audit epackages or system
    * epackages.
    */
   public List<EPackage> getModelEPackages()
@@ -240,7 +240,7 @@ public class HibernateStore extends Store implements IHibernateStore
     if (entityName == null)
     {
       throw new IllegalArgumentException("EClass " + eClass.getName() //$NON-NLS-1$
-          + " does not have an entity name, has it been mapped to Hibernate?"); //$NON-NLS-1$
+      + " does not have an entity name, has it been mapped to Hibernate?"); //$NON-NLS-1$
     }
 
     return entityName;
@@ -848,10 +848,10 @@ public class HibernateStore extends Store implements IHibernateStore
 
         if (HibernateThreadContext.isCommitContextSet())
         {
-          AuditProcessHandler.setCurrentUserName(HibernateThreadContext.getCommitContext().getCommitContext()
-              .getUserID());
-          AuditProcessHandler.setCurrentComment(HibernateThreadContext.getCommitContext().getCommitContext()
-              .getCommitComment());
+          AuditProcessHandler
+              .setCurrentUserName(HibernateThreadContext.getCommitContext().getCommitContext().getUserID());
+          AuditProcessHandler
+              .setCurrentComment(HibernateThreadContext.getCommitContext().getCommitContext().getCommitComment());
         }
         super.doAuditWorkInSession(session, auditWorks);
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
index ba7d44b13d..d2240dcf01 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreAccessor.java
@@ -489,9 +489,9 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
     for (Object o : qry.list())
     {
       final TeneoAuditCommitInfo teneoCommitInfo = (TeneoAuditCommitInfo)o;
-      final CDOCommitInfo cdoCommitInfo = commitInfoManager.createCommitInfo(getStore().getRepository()
-          .getBranchManager().getMainBranch(), teneoCommitInfo.getCommitTime(), teneoCommitInfo.getCommitTime() - 1,
-          teneoCommitInfo.getUser(), teneoCommitInfo.getComment(), null);
+      final CDOCommitInfo cdoCommitInfo = commitInfoManager.createCommitInfo(
+          getStore().getRepository().getBranchManager().getMainBranch(), teneoCommitInfo.getCommitTime(),
+          teneoCommitInfo.getCommitTime() - 1, teneoCommitInfo.getUser(), teneoCommitInfo.getComment(), null);
       handler.handleCommitInfo(cdoCommitInfo);
     }
   }
@@ -677,14 +677,14 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
         }
 
         final String revisionName = (String)value;
-        final boolean match = exactMatch || revisionName == null || name == null ? ObjectUtil
-            .equals(revisionName, name) : revisionName.startsWith(name);
+        final boolean match = exactMatch || revisionName == null || name == null ? ObjectUtil.equals(revisionName, name)
+            : revisionName.startsWith(name);
 
-        if (match && !context.addResource(HibernateUtil.getInstance().getCDOID(revision)))
-        {
-          // No more results allowed
-          break;
-        }
+            if (match && !context.addResource(HibernateUtil.getInstance().getCDOID(revision)))
+            {
+              // No more results allowed
+              break;
+            }
       }
     }
   }
@@ -769,11 +769,11 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       return true;
     }
     else
-    // not mapped
-    if (null != eref.getEAnnotation(TENEO_UNMAPPED_SOURCE))
-    {
-      return false;
-    }
+      // not mapped
+      if (null != eref.getEAnnotation(TENEO_UNMAPPED_SOURCE))
+      {
+        return false;
+      }
 
     // not computed yet
     for (String propName : session.getSessionFactory().getClassMetadata(entityName).getPropertyNames())
@@ -937,7 +937,8 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
           {
             if (cdoRevision.getVersion() != revision.getVersion())
             {
-              throw new IllegalStateException("Revision " + cdoRevision + " was already updated by another transaction");
+              throw new IllegalStateException(
+                  "Revision " + cdoRevision + " was already updated by another transaction");
             }
             existingRevisions.put(revision.getID(), cdoRevision);
           }
@@ -1080,7 +1081,7 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       final CDORevision container = HibernateUtil.getInstance().getCDORevision((CDOID)revision.getContainerID());
       final String entityName = getStore().getEntityName(revision.getEClass());
       final CDOID id = revision.getID();
-      final String hqlUpdate = "update " + entityName + " set " + CDOHibernateConstants.CONTAINER_PROPERTY //$NON-NLS-1$  //$NON-NLS-2$
+      final String hqlUpdate = "update " + entityName + " set " + CDOHibernateConstants.CONTAINER_PROPERTY //$NON-NLS-1$ //$NON-NLS-2$
           + " = :containerInfo where " + getStore().getIdentifierPropertyName(entityName) + " = :id"; //$NON-NLS-1$ //$NON-NLS-2$
       final Query qry = session.createQuery(hqlUpdate);
       qry.setParameter("containerInfo", ContainerInfoConverter.getInstance().convertContainerRelationToString(revision, //$NON-NLS-1$
@@ -1088,7 +1089,8 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       qry.setParameter("id", HibernateUtil.getInstance().getIdValue(id)); //$NON-NLS-1$
       if (qry.executeUpdate() != 1)
       {
-        //        OM.LOG.error("Not able to update container columns of " + entityName + " with id " + id); //$NON-NLS-1$ //$NON-NLS-2$
+        // OM.LOG.error("Not able to update container columns of " + entityName + " with id " + id); //$NON-NLS-1$
+        // //$NON-NLS-2$
         throw new IllegalStateException("Not able to update container columns of " + entityName + " with id " + id); //$NON-NLS-1$ //$NON-NLS-2$
       }
     }
@@ -1108,7 +1110,8 @@ public class HibernateStoreAccessor extends StoreAccessor implements IHibernateS
       qry.setParameter("id", HibernateUtil.getInstance().getIdValue(id)); //$NON-NLS-1$
       if (qry.executeUpdate() != 1)
       {
-        //        OM.LOG.error("Not able to update resource ids of " + entityName + " with id " + id); //$NON-NLS-1$ //$NON-NLS-2$
+        // OM.LOG.error("Not able to update resource ids of " + entityName + " with id " + id); //$NON-NLS-1$
+        // //$NON-NLS-2$
         throw new IllegalStateException("Not able to update resource ids of " + entityName + " with id " + id); //$NON-NLS-1$ //$NON-NLS-2$
       }
     }
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java
index 811f4837f0..720f548ef1 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreChunkReader.java
@@ -4,7 +4,7 @@
  * 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
  *    Martin Taal - Implementation
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java
index 355f1c4fdc..8563516d67 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -70,8 +70,8 @@ public class HibernateStoreFactory implements IStoreFactory
 
     Element mappingProviderConfig = (Element)mappingProviderConfigs.item(0);
     String mappingProviderType = mappingProviderConfig.getAttribute(TYPE_ATTRIBUTE);
-    IHibernateMappingProvider.Factory factory = HibernateUtil.getInstance().createMappingProviderFactory(
-        mappingProviderType);
+    IHibernateMappingProvider.Factory factory = HibernateUtil.getInstance()
+        .createMappingProviderFactory(mappingProviderType);
     if (factory == null)
     {
       throw new IllegalArgumentException("Unknown mapping provider type: " + mappingProviderType); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreLob.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreLob.java
index 95dc565059..1e64a56f62 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreLob.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreLob.java
@@ -16,7 +16,7 @@ import java.sql.Clob;
 
 /**
  * Object used to store clob and lob.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateStoreLob
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
index 2c7f0e8f35..661ce8025f 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
@@ -640,7 +640,7 @@ public class HibernateUtil
     }
 
     throw new IllegalArgumentException("The ID value type " + idValue.getClass() //$NON-NLS-1$
-        + " is not supported by this store. Method called with " + classifierRef); //$NON-NLS-1$
+    + " is not supported by this store. Method called with " + classifierRef); //$NON-NLS-1$
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemInformation.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemInformation.java
index 6ee9eba490..f9e82c9cd8 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemInformation.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemInformation.java
@@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.server.internal.hibernate;
 /**
  * Stores system related information, is used to keep track that CDO is started for the first time. There should only be
  * one SystemInformation object in the database.
- * 
+ *
  * @author Martin Taal
  */
 public class SystemInformation
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemProperty.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemProperty.java
index b1520647b4..4aee4e6d1d 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemProperty.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/SystemProperty.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.server.internal.hibernate;
 
 /**
  * Is used to store and retrieve properties in the database.
- * 
+ *
  * @author Martin Taal
  */
 public class SystemProperty
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java
index 45ac967c69..bf4d674b78 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java
index 3c16578dd0..02bda726a3 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ClassServerInfo.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java
index c0b6c68f57..6c53ce7eb0 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/FeatureServerInfo.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java
index c1d60be895..8dabd9d7d1 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/PackageServerInfo.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java
index 1602cd324a..c7fc767bb3 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/info/ServerInfo.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampGetter.java
index c16de81d06..5f447c7d38 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampGetter.java
@@ -17,7 +17,7 @@ import org.hibernate.HibernateException;
 
 /**
  * Gets the time stamp value to store in the database.
- * 
+ *
  * @see CDOHibernateBranchPointImpl
  * @author Martin Taal
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampSetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampSetter.java
index 2562cf5c50..73ba4053ba 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampSetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOBranchTimeStampSetter.java
@@ -18,7 +18,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
 
 /**
  * Sets the time stamp information in the revision.
- * 
+ *
  * @see CDOHibernateBranchPointImpl
  * @author Martin Taal
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerGetter.java
index 2879d49f19..9994a7a246 100755
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerGetter.java
@@ -18,7 +18,7 @@ import org.hibernate.HibernateException;
 
 /**
  * gets the container information as a String (to-be-stored in the db) from the CDORevision.
- * 
+ *
  * @see ContainerInfoConverter
  * @author Martin Taal
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerSetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerSetter.java
index 0f31d5860f..d86c4c66cb 100755
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerSetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOContainerSetter.java
@@ -18,7 +18,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
 
 /**
  * Sets the container information from the String (stored in the db) back into the CDORevision.
- * 
+ *
  * @see ContainerInfoConverter
  * @author Martin Taal
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java
index bf0caa1d7a..3299ad0aa7 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumIntegerType.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 
 /**
  * Implements the EMF UserType for an Enum in a dynamic model, for an integer field.
- * 
+ *
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  */
 public class CDOENumIntegerType extends CDOENumStringType
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java
index 36f27579b9..49f3622e83 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOENumStringType.java
@@ -35,7 +35,7 @@ import java.util.Properties;
 
 /**
  * Implements the EMF UserType for an Enum
- * 
+ *
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  */
 public class CDOENumStringType implements UserType, ParameterizedType
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java
index 883ea22711..3055e88b18 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDExternalUserType.java
@@ -29,7 +29,7 @@ import java.util.Properties;
 
 /**
  * A user type which can handle {@link CDOIDExternal}. It's stored in a single varchar field.
- * 
+ *
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  */
 public class CDOIDExternalUserType implements UserType, ParameterizedType
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
index f3a8b71159..4ce40a7805 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
@@ -107,8 +107,8 @@ public class CDOIDUserType implements UserType
       value = HibernateUtil.getInstance().getCDOIDHibernate((CDORevision)value);
     }
 
-    final String strValue = value instanceof String ? (String)value : HibernateUtil.getInstance().convertCDOIDToString(
-        (CDOID)value);
+    final String strValue = value instanceof String ? (String)value
+        : HibernateUtil.getInstance().convertCDOIDToString((CDOID)value);
     if (strValue == null)
     {
       statement.setNull(index, Types.VARCHAR);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java
index 4f3fa99b27..3c27e94ed8 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOInterceptor.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
 
 /**
  * Resolves entitynames, todo: use entityname strategy!
- * 
+ *
  * @author Martin Taal
  */
 public class CDOInterceptor extends EMFInterceptor
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java
index 9400af0930..1957fc51f8 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyAttributeGetter.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java
index b5b57859a9..b3c44f97ef 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOManyReferenceGetter.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java
index 00b417c754..026e2f6b10 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyGetter.java
@@ -30,7 +30,7 @@ import java.util.Map;
 
 /**
  * TODO How does this differ from {@link CDORevisionSetter}? Both needed?
- * 
+ *
  * @author Martin Taal
  */
 public class CDOPropertyGetter extends CDOPropertyHandler implements Getter
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
index 162030bb0c..e6d8fc8037 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertyHandler.java
@@ -39,9 +39,9 @@ public abstract class CDOPropertyHandler
     feature = tuplizer.getEClass().getEStructuralFeature(propertyName);
     if (getTracer().isEnabled())
     {
-      getTracer().trace(
-          "Created " + this.getClass().getName() + " for eClass/feature: " + tuplizer.getEClass().getName() + "." //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-              + propertyName);
+      getTracer()
+          .trace("Created " + this.getClass().getName() + " for eClass/feature: " + tuplizer.getEClass().getName() + "." //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+          + propertyName);
     }
 
     if (feature == null)
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java
index 740b428aef..67d1849538 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOPropertySetter.java
@@ -29,7 +29,7 @@ import java.lang.reflect.Method;
 
 /**
  * TODO How does this differ from {@link CDORevisionSetter}? Both needed?
- * 
+ *
  * @author Martin Taal
  */
 public class CDOPropertySetter extends CDOPropertyHandler implements Setter
@@ -141,8 +141,8 @@ public class CDOPropertySetter extends CDOPropertyHandler implements Setter
     }
     else
     {
-      boolean overwriteNilOrNull = currentValue == CDORevisionData.NIL && newValue == null || currentValue == null
-          && newValue != null && newValue.equals(defaultValue);
+      boolean overwriteNilOrNull = currentValue == CDORevisionData.NIL && newValue == null
+          || currentValue == null && newValue != null && newValue.equals(defaultValue);
       if (!revision.isFrozen() && !overwriteNilOrNull)
       {
         revision.setValue(getEStructuralFeature(), newValue);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
index 2dc30d0fbd..6f76e187ea 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionTuplizer.java
@@ -86,8 +86,8 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer
     if (ePackageURI == null || eClassName == null)
     {
       throw new IllegalArgumentException("The mapping for the persistentclass " + mappingInfo.getEntityName() //$NON-NLS-1$
-          + " is incorrect, there should be meta data tags for both epackage and " //$NON-NLS-1$
-          + "eclassname, one or both are missing."); //$NON-NLS-1$
+      + " is incorrect, there should be meta data tags for both epackage and " //$NON-NLS-1$
+      + "eclassname, one or both are missing."); //$NON-NLS-1$
     }
 
     if (TRACER.isEnabled())
@@ -135,7 +135,7 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer
     if (eClass == null)
     {
       throw new IllegalArgumentException("The mapped class " + mappingInfo.getEntityName() //$NON-NLS-1$
-          + " does not have a eClass equivalent"); //$NON-NLS-1$
+      + " does not have a eClass equivalent"); //$NON-NLS-1$
     }
   }
 
@@ -305,14 +305,14 @@ public class CDORevisionTuplizer extends AbstractEntityTuplizer
       }
       else
 
-      if (feature instanceof EReference)
-      {
-        setter = new CDOReferenceSetter(this, mappedProperty.getName());
-      }
-      else
-      {
-        setter = new CDOPropertySetter(this, mappedProperty.getName());
-      }
+        if (feature instanceof EReference)
+        {
+          setter = new CDOReferenceSetter(this, mappedProperty.getName());
+        }
+        else
+        {
+          setter = new CDOPropertySetter(this, mappedProperty.getName());
+        }
     }
 
     HibernateStore hbStore = HibernateStore.getCurrentHibernateStore();
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java
index 8416fa71ef..8e6c259d48 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticIdPropertyHandler.java
@@ -34,7 +34,7 @@ import java.util.Map;
 
 /**
  * Is only used for synthetic id's.
- * 
+ *
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  */
 public class CDOSyntheticIdPropertyHandler implements Getter, Setter, PropertyAccessor
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java
index 1152bafe4d..7413092e68 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOSyntheticVersionPropertyHandler.java
@@ -28,7 +28,7 @@ import java.util.Map;
 
 /**
  * Reads the version from the internal version cache.
- * 
+ *
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  */
 public class CDOSyntheticVersionPropertyHandler implements Getter, Setter, PropertyAccessor
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOUUIDHexGenerator.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOUUIDHexGenerator.java
index dce5f966f2..8efcf65bc9 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOUUIDHexGenerator.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOUUIDHexGenerator.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
 /**
  * An example of overriding the standard UUID generator of Hibernate to prevent it overwriting an already existing id in
  * an object.
- * 
+ *
  * @author mtaal
  */
 
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java
index edd50aaae0..c729308e96 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertyGetter.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java
index 876f0d83c0..193ceb69d4 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOVersionPropertySetter.java
@@ -4,7 +4,7 @@
  * 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:
  *    Martin Taal - copied from CDORevisionPropertyHandler and adapted
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java
index 09a5696bb8..997506c69e 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryFeatureURIPropertyHandler.java
@@ -34,7 +34,7 @@ import java.util.Map;
 
 /**
  * Handles the string representation of the feature of the feature map entry in the database.
- * 
+ *
  * @see CDOFeatureMapEntry#setEStructuralFeature(EStructuralFeature)
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  */
@@ -101,7 +101,7 @@ public class FeatureMapEntryFeatureURIPropertyHandler implements PropertyAccesso
 
   /**
    * Set the EStructuralFeature (see {@link #setEStructuralFeature(EStructuralFeature)}) from its String representation.
-   * 
+   *
    * @param eFeatureURI
    *          a String representation, must be created by the {@link #getEStructuralFeatureAsString()} method
    * @see #getEStructuralFeatureAsString()
@@ -131,7 +131,8 @@ public class FeatureMapEntryFeatureURIPropertyHandler implements PropertyAccesso
     }
     if (ePackage == null)
     {
-      throw new IllegalArgumentException("EPackage not found using " + eFeatureURI + " and EPackageURI: " + ePackageURI); //$NON-NLS-1$ //$NON-NLS-2$
+      throw new IllegalArgumentException(
+          "EPackage not found using " + eFeatureURI + " and EPackageURI: " + ePackageURI); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     final EClass eClass = (EClass)ePackage.getEClassifier(eClassName);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryInstantiator.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryInstantiator.java
index cbc0d0caf2..2880e936a4 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryInstantiator.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryInstantiator.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 
 /**
  * Instantiates {@link CDOFeatureMapEntry}.
- * 
+ *
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  */
 
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryPropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryPropertyHandler.java
index bd4484a80d..4d7409e5c7 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryPropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryPropertyHandler.java
@@ -35,7 +35,7 @@ import java.util.Map;
  * Implements the Hibernate accessor for mapped feature map properties. The owner object is always an instance of the
  * {@link CDOFeatureMapEntry}. Returns null if the mapped property has a different name then the current feature of the
  * owner (the CDOFeatureMapEntry), calls {@link CDOFeatureMapEntry#getValue()} in all other cases.
- * 
+ *
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  */
 public class FeatureMapEntryPropertyHandler implements PropertyAccessor, Getter, Setter
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryTuplizer.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryTuplizer.java
index 485f1b8c70..a1f9e4c201 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryTuplizer.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/FeatureMapEntryTuplizer.java
@@ -27,7 +27,7 @@ import org.hibernate.tuple.component.AbstractComponentTuplizer;
 
 /**
  * Tuplizer for feature map entries. These types are mapped using the dynamic capabilities of Hibernate.
- * 
+ *
  * @see CDOFeatureMapEntry
  * @see FeatureMapEntryPropertyHandler
  * @see FeatureMapEntryFeatureURIPropertyHandler
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java
index 4904f9c117..5196f00361 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/HibernateMoveableListWrapper.java
@@ -32,7 +32,7 @@ import java.util.ListIterator;
  * Wraps a moveable list so that hibernate always sees an object view while cdo always sees a cdoid view. The same for
  * EEnum: cdo wants to see an int (the ordinal), hibernate the real eenum value. This to support querying with EENum
  * parameters.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateMoveableListWrapper implements MoveableList<Object>
@@ -52,7 +52,7 @@ public class HibernateMoveableListWrapper implements MoveableList<Object>
     int size = size();
     if (sourceIndex >= size)
     {
-      throw new IndexOutOfBoundsException("sourceIndex=" + sourceIndex + ", size=" + size); //$NON-NLS-1$  //$NON-NLS-2$
+      throw new IndexOutOfBoundsException("sourceIndex=" + sourceIndex + ", size=" + size); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     if (targetIndex >= size)
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java
index ea8bc1dbbf..b925227b68 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/PersistableListHolder.java
@@ -21,7 +21,7 @@ import java.util.Map;
 /**
  * Keeps mappings from object/feature combinations to a hibernate persistable list. This works because the write action
  * is done in one thread.
- * 
+ *
  * @author Martin Taal
  */
 public class PersistableListHolder
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WildCardAttributePropertyHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WildCardAttributePropertyHandler.java
index d3351d66e5..333e92fc3b 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WildCardAttributePropertyHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/WildCardAttributePropertyHandler.java
@@ -26,7 +26,7 @@ import java.util.Map;
  * Implements the getter/setter for a wild card EAttribute property. This type of property is used in a feature map
  * created for wild cards. This class implements both the getter, setter and propertyaccessor interfaces. When the
  * getGetter and getSetter methods are called it returns itself.
- * 
+ *
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  */
 public class WildCardAttributePropertyHandler extends FeatureMapEntryPropertyHandler
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java
index df8e53a72e..91cf0a85b8 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/XMLUserType.java
@@ -36,7 +36,7 @@ import java.sql.Types;
  */
 public class XMLUserType implements UserType
 {
-  private final static java.lang.String XML_TYPE_PACKAGE_NSURI = "http://www.eclipse.org/emf/2003/XMLType"; //$NON-NLS-1$ 
+  private final static java.lang.String XML_TYPE_PACKAGE_NSURI = "http://www.eclipse.org/emf/2003/XMLType"; //$NON-NLS-1$
 
   private EDataType eDataType = null;
 
@@ -148,7 +148,7 @@ public class XMLUserType implements UserType
       return this.getClass().getSimpleName();
     }
 
-    return "String"; //$NON-NLS-1$ 
+    return "String"; //$NON-NLS-1$
   }
 
   public Object nullSafeGet(ResultSet arg0, java.lang.String[] arg1, SessionImplementor sessionImplementor, Object arg2)
@@ -274,15 +274,15 @@ public class XMLUserType implements UserType
       {
         return super.convertToString(value);
       }
-      return super.convertToString(HibernateUtil.getInstance()
-          .getXMLGregorianCalendarDate((java.util.Date)value, false));
+      return super.convertToString(
+          HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, false));
     }
 
     @Override
     protected Object convertToObject(java.lang.String value)
     {
-      return new java.sql.Date(((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime()
-          .getTime());
+      return new java.sql.Date(
+          ((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime().getTime());
     }
 
     @Override
@@ -301,15 +301,15 @@ public class XMLUserType implements UserType
       {
         return super.convertToString(value);
       }
-      return super
-          .convertToString(HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, true));
+      return super.convertToString(
+          HibernateUtil.getInstance().getXMLGregorianCalendarDate((java.util.Date)value, true));
     }
 
     @Override
     protected Object convertToObject(java.lang.String value)
     {
-      return new java.sql.Timestamp(((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar()
-          .getTime().getTime());
+      return new java.sql.Timestamp(
+          ((XMLGregorianCalendar)super.convertToObject(value)).toGregorianCalendar().getTime().getTime());
     }
 
     @Override
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java
index 455c325942..22ca4e4947 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java
@@ -70,8 +70,8 @@ import java.io.IOException;
 /**
  * @author Eike Stepper
  */
-public class LissomeFileHandle extends DataInputOutputFile implements CDODataInput, CDODataOutput,
-    LissomeFile.RevisionProvider
+public class LissomeFileHandle extends DataInputOutputFile
+    implements CDODataInput, CDODataOutput, LissomeFile.RevisionProvider
 {
   private LissomeFile file;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
index 95ec30d21f..be73b82a5d 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStore.java
@@ -65,7 +65,7 @@ import java.util.Set;
  * @author Eike Stepper
  */
 public class LissomeStore extends Store implements ILissomeStore, CDOAllRevisionsProvider, IDBConnectionProvider,
-    NoRawAccess, NoLargeObjects, NoQueryXRefs, NoChangeSets, NoDurableLocking
+NoRawAccess, NoLargeObjects, NoQueryXRefs, NoChangeSets, NoDurableLocking
 {
   public static final String TYPE = "lissome"; //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreChunkReader.java
index 4f522ac49e..22f242a075 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeStoreChunkReader.java
@@ -64,9 +64,9 @@ public class LissomeStoreChunkReader extends StoreChunkReader implements ILissom
     // else
     // {
     // builder.append(CDODBSchema.LIST_IDX);
-    //      builder.append(" BETWEEN "); //$NON-NLS-1$
+    // builder.append(" BETWEEN "); //$NON-NLS-1$
     // builder.append(fromIndex);
-    //      builder.append(" AND "); //$NON-NLS-1$
+    // builder.append(" AND "); //$NON-NLS-1$
     // builder.append(toIndex - 1);
     // }
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/LissomeBrowserPage.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/LissomeBrowserPage.java
index e82da3fc99..92feb676cb 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/LissomeBrowserPage.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/db/LissomeBrowserPage.java
@@ -115,8 +115,8 @@ public class LissomeBrowserPage extends AbstractPage
     try
     {
       String order = browser.getParam("order");
-      executeQuery(browser, pout, connection, "SELECT * FROM " + table
-          + (order == null ? "" : " ORDER BY " + order + " " + browser.getParam("direction")));
+      executeQuery(browser, pout, connection,
+          "SELECT * FROM " + table + (order == null ? "" : " ORDER BY " + order + " " + browser.getParam("direction")));
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/lissome/package-info.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/lissome/package-info.java
index 1a359bc50e..9f9901397d 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/lissome/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/lissome/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Server concepts for dealing with DB stores and accessors.
  */
 package org.eclipse.emf.cdo.server.lissome;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Classes.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Classes.java
index 8c0c28a410..6eca61a668 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Classes.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Classes.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Coll.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Coll.java
index 50530f97ab..be3e92606f 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Coll.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Coll.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/IDHandler.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/IDHandler.java
index 7ecda4a19a..8ea71e1e10 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/IDHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/IDHandler.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
index cdc8a585cc..18023387b5 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
@@ -66,7 +66,7 @@ import java.util.Set;
  * @author Eike Stepper
  */
 public class MongoDBStore extends Store implements IMongoDBStore, //
-    NoExternalReferences, NoQueryXRefs, NoLargeObjects, NoFeatureMaps, NoHandleRevisions, NoRawAccess
+NoExternalReferences, NoQueryXRefs, NoLargeObjects, NoFeatureMaps, NoHandleRevisions, NoRawAccess
 {
   public static final String TYPE = "mongodb"; //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java
index 85e1bd420b..87dbf01b44 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreFactory.java
index 079e20fb41..4eab3a1374 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Props.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Props.java
index 5b6745f730..a328086eef 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Props.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Props.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/bundle/OM.java
index e5cc616241..7e08fb3011 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  *    Stefan Winkler - Bug 285426: [DB] Implement user-defined typeMapping support
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/mongodb/package-info.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/mongodb/package-info.java
index 002238d5e5..7d88b39ca0 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/mongodb/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/mongodb/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server concepts for dealing with MongoDB stores and accessors.
  */
 package org.eclipse.emf.cdo.server.mongodb;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java
index a1e2e3af4d..91651ff090 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOPluginProtocolFactory.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOPluginProtocolFactory.java
index 82d125b22d..95e2e47849 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOPluginProtocolFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOPluginProtocolFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java
index 58ebd6abf1..152e9cdcca 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java
@@ -41,7 +41,7 @@ import org.eclipse.net4j.util.security.DiffieHellman.Server.Challenge;
 /**
  * @author Eike Stepper
  */
-public class CDOServerProtocol extends SignalProtocol<InternalSession> implements ISessionProtocol
+public class CDOServerProtocol extends SignalProtocol<InternalSession>implements ISessionProtocol
 {
   public static final long DEFAULT_NEGOTIATION_TIMEOUT = 15 * 1000;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocolFactory.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocolFactory.java
index 17004ede9b..b30b0995fe 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocolFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocolFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/EnableLockNotificationIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/EnableLockNotificationIndication.java
index e415431587..d119741a0e 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/EnableLockNotificationIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/EnableLockNotificationIndication.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPackagesIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPackagesIndication.java
index 6d14195e48..e39543bc72 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPackagesIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPackagesIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java
index 157fa2644b..65ede25b70 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java
@@ -46,7 +46,8 @@ public class LoadSubBranchesIndication extends CDOServerReadIndication
     out.writeInt(branches.length);
     for (InternalCDOBranch subBranch : branches)
     {
-      SubBranchInfo info = new SubBranchInfo(subBranch.getID(), subBranch.getName(), subBranch.getBase().getTimeStamp());
+      SubBranchInfo info = new SubBranchInfo(subBranch.getID(), subBranch.getName(),
+          subBranch.getBase().getTimeStamp());
       info.write(out);
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockDelegationIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockDelegationIndication.java
index ff9f1a18ab..fb558cd492 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockDelegationIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockDelegationIndication.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockNotificationRequest.java
index 3fbc59282d..a128d139c7 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockNotificationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockNotificationRequest.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockStateIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockStateIndication.java
index 364789d8c5..88723c7767 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockStateIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockStateIndication.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SetLockNotificationModeIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SetLockNotificationModeIndication.java
index 8f731b51e1..2c70dc7504 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SetLockNotificationModeIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SetLockNotificationModeIndication.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockDelegationIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockDelegationIndication.java
index e05ce6e373..67ac783431 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockDelegationIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockDelegationIndication.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
index 5248158dd6..c772f7c559 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/FailoverMonitor.java
@@ -243,8 +243,8 @@ public class FailoverMonitor extends Container<AgentProtocol>
    *
    * @author Eike Stepper
    */
-  public static abstract class AbstractServerProtocolFactory extends ServerProtocolFactory implements
-      FailoverMonitor.Provider
+  public static abstract class AbstractServerProtocolFactory extends ServerProtocolFactory
+      implements FailoverMonitor.Provider
   {
     private IManagedContainer container;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/package-info.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/package-info.java
index 68b5d19f47..da52a78a1d 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/net4j/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server concepts for dealing with Net4j-based repositories and fail-over infrastructure.
  */
 package org.eclipse.emf.cdo.server.net4j;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF
index 4b9c91c346..3b182d2a7d 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.objectivity;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM$Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
@@ -11,14 +11,14 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.server.internal.objectivity;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.internal.objectivity.bundle;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.internal.objectivity.clustering;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.internal.objectivity.db;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.internal.objectivity.mapper;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.internal.objectivity.schema;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.internal.objectivity.utils;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.objectivity;version="4.0.300"
+Export-Package: org.eclipse.emf.cdo.server.internal.objectivity;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.bundle;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.clustering;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.db;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.mapper;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.schema;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.internal.objectivity.utils;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests.objectivity",
+ org.eclipse.emf.cdo.server.objectivity;version="4.0.400"
 Import-Package: com.objy.as;version="[4.0.0,5.0.0)",
  com.objy.as.app;version="[4.0.0,5.0.0)",
  com.objy.db;version="[4.0.0,5.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityQueryHandler.java
index 6afbee72eb..734deb9599 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityQueryHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java
index 069b03f268..70c0abdbd1 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java
@@ -90,9 +90,9 @@ public class ObjectivityStore extends Store implements IObjectivityStore
     // RevisionTemporality.NONE, RevisionTemporality.AUDITING),
     // set(RevisionParallelism.NONE));
     // setRevisionTemporality(RevisionTemporality.AUDITING);
-    super(TYPE, LongIDStore.OBJECT_ID_TYPES, set(ChangeFormat.REVISION, ChangeFormat.DELTA), set(
-        RevisionTemporality.NONE, RevisionTemporality.AUDITING), set(RevisionParallelism.NONE,
-        RevisionParallelism.BRANCHING));
+    super(TYPE, LongIDStore.OBJECT_ID_TYPES, set(ChangeFormat.REVISION, ChangeFormat.DELTA),
+        set(RevisionTemporality.NONE, RevisionTemporality.AUDITING),
+        set(RevisionParallelism.NONE, RevisionParallelism.BRANCHING));
     storeConfig = config;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
index 9a146f7c6e..e8ede59f72 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
@@ -234,8 +234,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.trace("Detaching id " + id + " - OID: " + objyObject.ooId().getStoreString() + " verions: "
-          + version + " in Branch: " + branch.getID() + " and timeStamp: " + timeStamp);
+      TRACER_DEBUG.trace("Detaching id " + id + " - OID: " + objyObject.ooId().getStoreString() + " verions: " + version
+          + " in Branch: " + branch.getID() + " and timeStamp: " + timeStamp);
     }
 
     if (getStore().isRequiredToSupportAudits())
@@ -291,7 +291,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       if (TRACER_DEBUG.isEnabled())
       {
         TRACER_DEBUG
-            .trace("getObjySession() - context's transaction: " + (cdoTrx == null ? "null" : cdoTrx.toString()));
+        .trace("getObjySession() - context's transaction: " + (cdoTrx == null ? "null" : cdoTrx.toString()));
       }
       if (cdoTrx != null)
       {
@@ -469,8 +469,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     }
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.trace(" writeRevisionDeltas: " + revisionDeltas.length + " - time: " + (System.nanoTime() - start)
-          / 1000000.0);
+      TRACER_DEBUG.trace(
+          " writeRevisionDeltas: " + revisionDeltas.length + " - time: " + (System.nanoTime() - start) / 1000000.0);
     }
   }
 
@@ -512,11 +512,11 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
   // }
   // // System.out.println(">>>IS: Delta Writing: " + delta.getID() + " - oid: " + objyObject.ooId().getStoreString());
   // // System.out.println("\t - old version : " + delta.getVersion());
-  // // System.out.println("\t - created     : " + created);
+  // // System.out.println("\t - created : " + created);
   // // System.out.println("\t - delta.branch: " + delta.getBranch().toString());
-  // // System.out.println("\t - branch      : " + branch.toString());
-  // // System.out.println("\t - branch TS   : " + branch.getPoint(created).getTimeStamp());
-  // // System.out.println("\t - delta       : " + delta.toString());
+  // // System.out.println("\t - branch : " + branch.toString());
+  // // System.out.println("\t - branch TS : " + branch.getPoint(created).getTimeStamp());
+  // // System.out.println("\t - delta : " + delta.toString());
   // // for debugging...
   //
   // if (objyOriginalRevision.getVersion() != deltaVersion)
@@ -596,8 +596,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     int newVersion = CDOBranchVersion.FIRST_VERSION;
 
     ObjyObject objyObject = getObject(delta.getID());
-    TRACER_DEBUG.format("writingRevisionDelta getting Object: {0}, v:{1} - BranchId:{2}", objyObject.ooId()
-        .getStoreString(), deltaVersion, delta.getBranch().getID());
+    TRACER_DEBUG.format("writingRevisionDelta getting Object: {0}, v:{1} - BranchId:{2}",
+        objyObject.ooId().getStoreString(), deltaVersion, delta.getBranch().getID());
     ObjyObject objyOriginalRevision = objyObject.getRevisionByVersion(deltaVersion, delta.getBranch().getID(),
         objySession.getObjectManager());
 
@@ -616,11 +616,11 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     }
     // System.out.println(">>>IS: Delta Writing: " + delta.getID() + " - oid: " + objyObject.ooId().getStoreString());
     // System.out.println("\t - old version : " + delta.getVersion());
-    // System.out.println("\t - created     : " + created);
+    // System.out.println("\t - created : " + created);
     // System.out.println("\t - delta.branch: " + delta.getBranch().toString());
-    // System.out.println("\t - branch      : " + branch.toString());
-    // System.out.println("\t - branch TS   : " + branch.getPoint(created).getTimeStamp());
-    // System.out.println("\t - delta       : " + delta.toString());
+    // System.out.println("\t - branch : " + branch.toString());
+    // System.out.println("\t - branch TS : " + branch.getPoint(created).getTimeStamp());
+    // System.out.println("\t - delta : " + delta.toString());
     // for debugging...
 
     if (objyOriginalRevision.getVersion() != deltaVersion)
@@ -634,9 +634,9 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     {
 
       ObjyObject objyObjectCopy = objySession.getObjectManager().copyRevision(this, objyOriginalRevision);
-      TRACER_DEBUG.format("  created new object:{0} by copying object:{1} - v:{2} - newBranch:{3}", objyObjectCopy
-          .ooId().getStoreString(), objyOriginalRevision.ooId().getStoreString(), objyOriginalRevision.getVersion(),
-          branch.getID());
+      TRACER_DEBUG.format("  created new object:{0} by copying object:{1} - v:{2} - newBranch:{3}",
+          objyObjectCopy.ooId().getStoreString(), objyOriginalRevision.ooId().getStoreString(),
+          objyOriginalRevision.getVersion(), branch.getID());
 
       // // newObjyRevision = objySession.getObjectManager().copyRevision(this, objyRevision);
       // // objyRevision.setRevisedBranchId(branch.getID();
@@ -741,10 +741,10 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     if (TRACER_DEBUG.isEnabled())
     {
       TRACER_DEBUG
-          .trace(" writeRevisions: " + revisions.length + " - time: " + (System.nanoTime() - start) / 1000000.0);
-      // TRACER_DEBUG.trace("   getObjectTime: " + ObjyObjectManager.getObjectTime / 1000000.0);
-      // TRACER_DEBUG.trace("   updateObjectTime: " + ObjyObjectManager.updateObjectTime / 1000000.0);
-      // TRACER_DEBUG.trace("   resourceCheckAndUpdateTime: " + ObjyObjectManager.resourceCheckAndUpdateTime /
+      .trace(" writeRevisions: " + revisions.length + " - time: " + (System.nanoTime() - start) / 1000000.0);
+      // TRACER_DEBUG.trace(" getObjectTime: " + ObjyObjectManager.getObjectTime / 1000000.0);
+      // TRACER_DEBUG.trace(" updateObjectTime: " + ObjyObjectManager.updateObjectTime / 1000000.0);
+      // TRACER_DEBUG.trace(" resourceCheckAndUpdateTime: " + ObjyObjectManager.resourceCheckAndUpdateTime /
       // 1000000.0);
       // ObjyObjectManager.getObjectTime = 0;
       // ObjyObjectManager.updateObjectTime = 0;
@@ -794,21 +794,21 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       }
 
       // System.out.println(">>>IS: Writing: " + revision.getID() + " - oid: " + objyObject.ooId().getStoreString());
-      // System.out.println("\t - version    : " + revision.getVersion());
-      // System.out.println("\t - timestamp  : " + revision.getTimeStamp());
-      // System.out.println("\t - revised    : " + revision.getRevised());
+      // System.out.println("\t - version : " + revision.getVersion());
+      // System.out.println("\t - timestamp : " + revision.getTimeStamp());
+      // System.out.println("\t - revised : " + revision.getRevised());
       // System.out.println("\t - resourceId : " + revision.getResourceID());
       // System.out.println("\t - containerId: " + revision.getContainerID());
-      // System.out.println("\t - branch     : " + revision.getBranch().toString());
-      // System.out.println("\t - revision   : " + revision.toString());
+      // System.out.println("\t - branch : " + revision.getBranch().toString());
+      // System.out.println("\t - revision : " + revision.toString());
 
       ObjyObject newObjyRevision = objyObject;
 
       if (revision.getVersion() > CDOBranchVersion.FIRST_VERSION) // we're updating other versions...
       {
         // TRACER_DEBUG.format("...Updating other revisions using writeRevision()...");
-        ObjyObject oldObjyRevision = objyObject.getRevisionByVersion(revision.getVersion() - 1, revision.getBranch()
-            .getID(), objySession.getObjectManager());
+        ObjyObject oldObjyRevision = objyObject.getRevisionByVersion(revision.getVersion() - 1,
+            revision.getBranch().getID(), objySession.getObjectManager());
 
         if (oldObjyRevision == null)
         {
@@ -831,8 +831,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       if (getStore().isRequiredToSupportBranches())
       {
         // add the newObjyRevision to the proper branch.
-        ObjyBranch objyBranch = objySession.getBranchManager(getRepositoryName()).getBranch(
-            revision.getBranch().getID());
+        ObjyBranch objyBranch = objySession.getBranchManager(getRepositoryName())
+            .getBranch(revision.getBranch().getID());
         ooObj anObj = ooObj.create_ooObj(newObjyRevision.ooId());
         try
         {
@@ -1016,8 +1016,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG.format("queryResources() for : " + (pathPrefix == null ? "NULL" : pathPrefix) + " - exactMatch: "
-          + exactMatch);
+      TRACER_DEBUG.format(
+          "queryResources() for : " + (pathPrefix == null ? "NULL" : pathPrefix) + " - exactMatch: " + exactMatch);
     }
     ObjyResourceList resourceList = objySession.getResourceList(getRepositoryName());
     int size = resourceList.size();
@@ -1070,8 +1070,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
         String resourceName = ObjyResourceList.getResourceName(resourceRevision);
         CDOID resourceID = OBJYCDOIDUtil.getCDOID(resource.ooId());
-        if (exactMatch && pathPrefix != null && pathPrefix.equals(resourceName) || pathPrefix == null
-            && resourceName == null)
+        if (exactMatch && pathPrefix != null && pathPrefix.equals(resourceName)
+            || pathPrefix == null && resourceName == null)
         {
           if (!context.addResource(resourceID))
           {
@@ -1253,7 +1253,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     }
     // else
     // {
-    //      TRACER_DEBUG.format("RR - objyObject is ID:" + id + ", :" + objyObject.ooId().getStoreString()); //$NON-NLS-1$
+    // TRACER_DEBUG.format("RR - objyObject is ID:" + id + ", :" + objyObject.ooId().getStoreString()); //$NON-NLS-1$
     // }
 
     InternalCDORevision revision = createRevision(objyObject, id);
@@ -1269,9 +1269,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
             objySession.getObjectManager());
         if (objyRevision == null)
         {
-          TRACER_DEBUG
-              .format(
-                  "RR - branches ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), branchPoint.getBranch().getID(), branchPoint.getTimeStamp()); //$NON-NLS-1$
+          TRACER_DEBUG.format("RR - branches ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), //$NON-NLS-1$
+              branchPoint.getBranch().getID(), branchPoint.getTimeStamp());
         }
       }
       catch (RuntimeException ex)
@@ -1287,9 +1286,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
             objySession.getObjectManager());
         if (objyRevision == null)
         {
-          TRACER_DEBUG
-              .format(
-                  "RR - audit ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), branchPoint.getBranch().getID(), branchPoint.getTimeStamp()); //$NON-NLS-1$
+          TRACER_DEBUG.format("RR - audit ID:{0}, OB:{1}, BPB:{2}, BPTS:{3}", id, objyObject.getBranchId(), //$NON-NLS-1$
+              branchPoint.getBranch().getID(), branchPoint.getTimeStamp());
         }
       }
       catch (RuntimeException ex)
@@ -1313,8 +1311,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     {
       if (TRACER_DEBUG.isEnabled())
       {
-        TRACER_DEBUG
-            .format("RR - ...revision for: {0} - OID: {1} is detached.", id, objyObject.ooId().getStoreString()); //$NON-NLS-1$
+        TRACER_DEBUG.format("RR - ...revision for: {0} - OID: {1} is detached.", id, //$NON-NLS-1$
+            objyObject.ooId().getStoreString());
       }
       EClass eClass = ObjySchema.getEClass(getStore(), objyObject.objyClass());
       return new DetachedCDORevision(eClass, id, branchPoint.getBranch(), -objyRevision.getVersion(),
@@ -1326,8 +1324,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG
-          .format("RR - Fetching revision details for: {0} - OID:{1}", id, objyRevision.ooId().getStoreString()); //$NON-NLS-1$
+      TRACER_DEBUG.format("RR - Fetching revision details for: {0} - OID:{1}", id, //$NON-NLS-1$
+          objyRevision.ooId().getStoreString());
     }
 
     boolean ok = objyRevision.fetch(this, revision, listChunk);
@@ -1370,7 +1368,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     }
 
     // {
-    //      TRACER_DEBUG.format("RRBV - objyObject 4 ID: " + id + ", :" + objyObject.ooId().getStoreString()); //$NON-NLS-1$
+    // TRACER_DEBUG.format("RRBV - objyObject 4 ID: " + id + ", :" + objyObject.ooId().getStoreString()); //$NON-NLS-1$
     // }
 
     ObjyObject objyRevision = null;
@@ -1381,9 +1379,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     // objyRevision = objyObject.getRevisionByVersion(branchVersion.getVersion());
     if (TRACER_DEBUG.isEnabled())
     {
-      TRACER_DEBUG
-          .format(
-              "Reading revision by version {0} for: {1} - OID: {2}", branchVersion.getVersion(), id, objyObject.ooId().getStoreString()); //$NON-NLS-1$
+      TRACER_DEBUG.format("Reading revision by version {0} for: {1} - OID: {2}", branchVersion.getVersion(), id, //$NON-NLS-1$
+          objyObject.ooId().getStoreString());
     }
 
     // }
@@ -1394,7 +1391,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     // if (TRACER_DEBUG.isEnabled())
     // {
     // TRACER_DEBUG.format(
-    //            "(None-Audit) Reading revision by version for: {0} - OID: {1}", id, objyObject.ooId().getStoreString()); //$NON-NLS-1$
+    // "(None-Audit) Reading revision by version for: {0} - OID: {1}", id, objyObject.ooId().getStoreString());
+    // //$NON-NLS-1$
     // }
     // }
 
@@ -1428,7 +1426,7 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
     // if (!ok)
     // {
-    //      TRACER_DEBUG.format("RRBV - Fetch rev failed 4: {0}, :", id, objyRevision.ooId().getStoreString()); //$NON-NLS-1$
+    // TRACER_DEBUG.format("RRBV - Fetch rev failed 4: {0}, :", id, objyRevision.ooId().getStoreString()); //$NON-NLS-1$
     // }
 
     readRevisionTime += System.nanoTime() - __start;
@@ -1508,8 +1506,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
           }
           catch (com.objy.db.ObjyRuntimeException ex)
           {
-            System.out.println(">>>>IS: Exception<<<< Session: " + objySession + " open status: "
-                + objySession.isOpen());
+            System.out
+                .println(">>>>IS: Exception<<<< Session: " + objySession + " open status: " + objySession.isOpen());
             ex.printStackTrace();
           }
           monitor.worked();
@@ -1524,8 +1522,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     {
       TRACER_DEBUG.trace(" addIDMappings for " + commitContext.getNewObjects().length + " - time: "
           + (System.nanoTime() - __start) / 1000000.0);
-      TRACER_DEBUG.trace("  createObjects : " + ObjyObject.createObjectCount + " - time: "
-          + ObjyObject.createObjectTime / 1000000.0);
+      TRACER_DEBUG.trace(
+          "  createObjects : " + ObjyObject.createObjectCount + " - time: " + ObjyObject.createObjectTime / 1000000.0);
       ObjyObject.createObjectTime = 0;
       ObjyObject.createObjectCount = 0;
     }
@@ -1689,9 +1687,8 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
 
     for (ObjyBranch objyBranch : branches)
     {
-      InternalCDOBranch branch = branchManager
-          .getBranch(objyBranch.getBranchId(), new BranchInfo(objyBranch.getBranchName(), objyBranch.getBaseBranchId(),
-              objyBranch.getBaseBranchTimeStamp()));
+      InternalCDOBranch branch = branchManager.getBranch(objyBranch.getBranchId(), new BranchInfo(
+          objyBranch.getBranchName(), objyBranch.getBaseBranchId(), objyBranch.getBaseBranchTimeStamp()));
       branchHandler.handleBranch(branch);
       count++;
     }
@@ -1775,10 +1772,10 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
       }
     }
 
-    CDOBranchVersion branchVersion = branchManager.getBranch((int)objyObject.getBranchId()).getVersion(
-        Math.abs(objyObject.getVersion()));
-    InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion(
-        OBJYCDOIDUtil.getCDOID(objyObject.ooId()), branchVersion, CDORevision.UNCHUNKED, true);
+    CDOBranchVersion branchVersion = branchManager.getBranch((int)objyObject.getBranchId())
+        .getVersion(Math.abs(objyObject.getVersion()));
+    InternalCDORevision revision = (InternalCDORevision)revisionManager
+        .getRevisionByVersion(OBJYCDOIDUtil.getCDOID(objyObject.ooId()), branchVersion, CDORevision.UNCHUNKED, true);
 
     return handler.handleRevision(revision);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java
index aaf254ea94..07d196555d 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreChunkReader.java
@@ -41,8 +41,8 @@ public class ObjectivityStoreChunkReader extends StoreChunkReader implements IOb
     CDOID id = getRevision().getID();
     getAccessor().ensureActiveSession();
     ObjyObject objyObject = getAccessor().getObject(id);
-    ObjyObject objyRevision = objyObject.getRevisionByVersion(getRevision().getVersion(), getRevision().getBranch()
-        .getID(), getAccessor().getObjySession().getObjectManager());
+    ObjyObject objyRevision = objyObject.getRevisionByVersion(getRevision().getVersion(),
+        getRevision().getBranch().getID(), getAccessor().getObjySession().getObjectManager());
 
     List<Chunk> chunks = getChunks();
 
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java
index 86d6afb38f..2c1e679ab3 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/bundle/OM.java
index 5bd7bf4019..c617b0028f 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/bundle/OM.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Ibrahim Sallam
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManager.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManager.java
index 808a808e27..1b7f9283fa 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManager.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerImpl.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerImpl.java
index 04be133f2c..9d5a093ab2 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java
index 89d85c923f..3b42d55a78 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/clustering/ObjyPlacementManagerLocal.java
@@ -156,8 +156,8 @@ public class ObjyPlacementManagerLocal
     {
       // we have to put it somewhere.
       // call the global placement manager.
-      nearObject = objySession.getObjectManager().getGlobalPlacementManager()
-          .getNearObject(null, null, revision.getEClass());
+      nearObject = objySession.getObjectManager().getGlobalPlacementManager().getNearObject(null, null,
+          revision.getEClass());
     }
 
     ObjyObject objyObject = objySession.getObjectManager().newObject(eClass, nearObject);
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/FdManager.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/FdManager.java
index 71c8ed638b..cc817a131c 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/FdManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/FdManager.java
@@ -485,7 +485,7 @@ public class FdManager
 
   /**
    * TODO
-   * 
+   *
    * @param storeConfig
    */
   public void configure(Element storeConfig)
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClass.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClass.java
index a3aedc6fd5..aab1a9608e 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClass.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClass.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
@@ -18,7 +18,7 @@ import java.util.HashMap;
 
 /**
  * Wrapper around the AS class to be able to cache attributes.
- * 
+ *
  * @author ibrahim
  */
 public class ObjyClass
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java
index ca108351bf..9ac72d9ab2 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyClassProposed.java
@@ -208,7 +208,7 @@ public class ObjyClassProposed
         {
           TRACER_DEBUG.trace("Attribut Changed for " + eClass.getName() + " name : " + feature.getName());
           TRACER_DEBUG.trace("... attribute change is not supported in this release... for " + eClass.getName()
-              + " name : " + feature.getName());
+          + " name : " + feature.getName());
         }
 
         // TODO - enable the rest of attribute type evolution...
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java
index af9ab94675..4497731fd7 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyConnection.java
@@ -127,7 +127,7 @@ public class ObjyConnection
                 true, // boolean appendLogFiles,
                 logDirPath, // String logDirPath,
                 "MainLog.txt"// String mainLogFileName
-            );
+                );
           }
           if (TRACER_DEBUG.isEnabled())
           {
@@ -399,7 +399,7 @@ public class ObjyConnection
         try
         {
           objySession.terminate();
-          // TRACER_DEBUG.trace("ObjyConnection.cleanupSessionPool() --   end terminating session. " +
+          // TRACER_DEBUG.trace("ObjyConnection.cleanupSessionPool() -- end terminating session. " +
           // objySession.toString());
         }
         catch (ObjyRuntimeException ex)
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
index 1cdb68a987..2916bf6c10 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
@@ -211,8 +211,8 @@ public class ObjyObject
   }
 
   /**
-  	 *
-  	 */
+   *
+   */
   public ooId ooId()
   {
     return objectId;
@@ -541,8 +541,8 @@ public class ObjyObject
       if (TRACER_DEBUG.isEnabled())
       {
         checkSession();
-        TRACER_DEBUG.trace("ObjyObject.update() - oid:" + ooId().getStoreString() + " - version:"
-            + revision.getVersion());
+        TRACER_DEBUG
+            .trace("ObjyObject.update() - oid:" + ooId().getStoreString() + " - version:" + revision.getVersion());
       }
 
       // this is done in the updateDate()
@@ -597,8 +597,8 @@ public class ObjyObject
         {
           if (TRACER_DEBUG.isEnabled())
           {
-            TRACER_DEBUG.trace("In " + ooId().getStoreString() + " - Can't find mapper for feature "
-                + feature.getName());
+            TRACER_DEBUG
+                .trace("In " + ooId().getStoreString() + " - Can't find mapper for feature " + feature.getName());
           }
           continue;
         }
@@ -627,7 +627,7 @@ public class ObjyObject
             else if (value instanceof CDOIDExternal)
             {
               TRACER_DEBUG
-                  .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)value).getURI());
+              .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)value).getURI());
               // System.out.println("value is a proxy object - it should be handled by the mapper.");
               // create an ObjyProxy object to hold the the value.
               ObjyProxy proxyObject = ObjyProxy.createObject(ooId());
@@ -648,8 +648,8 @@ public class ObjyObject
               ooId oid = null;
               if (entryValue instanceof CDOIDExternal)
               {
-                TRACER_DEBUG.trace("... CDOIDExternal inserted, at:" + i + ", content:"
-                    + ((CDOIDExternal)entryValue).getURI());
+                TRACER_DEBUG
+                    .trace("... CDOIDExternal inserted, at:" + i + ", content:" + ((CDOIDExternal)entryValue).getURI());
                 // System.out.println("value is a proxy object - it should be handled by the mapper.");
                 // create an ObjyProxy object to hold the the value.
                 ObjyProxy proxyObject = ObjyProxy.createObject(ooId());
@@ -1065,8 +1065,8 @@ public class ObjyObject
       if (TRACER_DEBUG.isEnabled())
       {
         // TODO - verify the message.
-        TRACER_DEBUG.trace("Size of object " + ooId().getStoreString() + " - is: " + size + " - feature: "
-            + feature.getName());
+        TRACER_DEBUG
+            .trace("Size of object " + ooId().getStoreString() + " - is: " + size + " - feature: " + feature.getName());
       }
     }
     catch (RuntimeException ex)
@@ -1147,8 +1147,8 @@ public class ObjyObject
       checkSession();
       // TODO - verify the message.
       TRACER_DEBUG.trace("Get All objects for ID: " + ooId().getStoreString() + " <feature ' " + feature/*
-                                                                                                         * .getName( )
-                                                                                                         */
+       * .getName( )
+       */
           + "':" + feature.getEType() + "> from " + this);
     }
 
@@ -1441,7 +1441,7 @@ public class ObjyObject
         if (TRACER_DEBUG.isEnabled())
         {
           TRACER_DEBUG.trace("-->> No process to delete() feature (" + i + ") -> feature:" + feature.getName()
-              + " - value:" + objects[i] + " ... nothing to do here.");
+          + " - value:" + objects[i] + " ... nothing to do here.");
         }
       }
     }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPropertyMapHandler.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPropertyMapHandler.java
index 4e2c6927da..8c59781ddc 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPropertyMapHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPropertyMapHandler.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySchema.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySchema.java
index a04043c96e..d462be94ba 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySchema.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySchema.java
@@ -43,7 +43,7 @@ import java.util.Map;
 /**
  * Wrapper for the AS schema code with caching of the wrapped classes. This class need to be reseted by the
  * ObjectivityStore doDeactivate().
- * 
+ *
  * @author ibrahim
  */
 public class ObjySchema
@@ -152,7 +152,7 @@ public class ObjySchema
 
   /**
    * Originally in EProposedManager
-   * 
+   *
    * @param ePackage
    */
   static public void registerEPackage(EPackage ePackage)
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyScope.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyScope.java
index 9549ec5c4b..8d03075a4f 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyScope.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyScope.java
@@ -177,7 +177,7 @@ public class ObjyScope
 
   /**
    * TODO - verify need.
-   * 
+   *
    * @return
    */
   private ooContObj createNewContainer(String name)
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySession.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySession.java
index 28575adcea..fcd9391b9d 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySession.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjySession.java
@@ -27,7 +27,7 @@ import com.objy.db.app.ooId;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-/* 
+/*
  * @author ibrahim
  */
 public class ObjySession extends Session
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BasicTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BasicTypeMapper.java
index 786e7e7c0c..a4cc1eb4ca 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BasicTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BasicTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 
 /**
  * mapping between Objy AS class/type and EMF types.
- * 
+ *
  * @author ibrahim
  */
 public abstract class BasicTypeMapper
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigDecimalTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigDecimalTypeMapper.java
index b4332d42c1..e262ab6286 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigDecimalTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigDecimalTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigIntegerTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigIntegerTypeMapper.java
index ade387c4fa..341564aebb 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigIntegerTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/BigIntegerTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ByteArrayTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ByteArrayTypeMapper.java
index 071d7904b4..fe8a0e9744 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ByteArrayTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ByteArrayTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -106,7 +106,7 @@ public class ByteArrayTypeMapper extends BasicTypeMapper implements ISingleTypeM
   }
 
   /**
-   * 
+   *
    */
   public boolean createSchema(Proposed_Class proposedClass, EStructuralFeature feature)
   {
@@ -124,7 +124,7 @@ public class ByteArrayTypeMapper extends BasicTypeMapper implements ISingleTypeM
         getNullAttributeName(feature), // Attribute name
         1, // # elements in fixed-size array
         ooBaseType.ooBOOLEAN // Default value
-        );
+    );
 
     return false;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataManyTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataManyTypeMapper.java
index 2496a5ecb0..b4aac12fc9 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataManyTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataManyTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 
 /***
  * Overrides StringManyTypeMapper, and implement the two functions to convert a string to an object and vice versa.
- * 
+ *
  * @author Ibrahim Sallam
  */
 public class CustomDataManyTypeMapper extends StringManyTypeMapper
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataTypeMapper.java
index c8cdd45add..80e675e3cf 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/CustomDataTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java
index 8ea85adbae..ebfb6f45b5 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/FeatureMapTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -103,8 +103,8 @@ public class FeatureMapTypeMapper extends BasicTypeMapper implements IManyTypeMa
   public void initialize(Class_Object classObject, EStructuralFeature feature)
   {
     // create the reference.
-    Class_Object newClassObject = Class_Object
-        .new_persistent_object(getArrayListClass(), classObject.objectID(), false);
+    Class_Object newClassObject = Class_Object.new_persistent_object(getArrayListClass(), classObject.objectID(),
+        false);
     // {
     // ObjyObjectManager.newInternalObjCount++;
     // }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/IManyTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/IManyTypeMapper.java
index ab57f69a33..d226f2abd5 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/IManyTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/IManyTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 
 /**
  * Mapper for composite types (featureMap, manyReference, Multiple...)
- * 
+ *
  * @author ibrahim
  */
 public interface IManyTypeMapper extends ITypeMapper
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ISingleTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ISingleTypeMapper.java
index 7ac1cd2d1a..aae65b4e88 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ISingleTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ISingleTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ITypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ITypeMapper.java
index 7d5d3dd000..23d02b5a44 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ITypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/ITypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -22,7 +22,7 @@ import com.objy.as.app.d_Attribute;
 
 /**
  * Maps between Objy types (classes and objects), and EMF types.
- * 
+ *
  * @author ibrahim
  */
 public interface ITypeMapper
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/MultipleTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/MultipleTypeMapper.java
index c3ccf0e061..880f457995 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/MultipleTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/MultipleTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -21,7 +21,7 @@ import com.objy.as.app.d_Attribute;
 
 import java.util.ArrayList;
 
-// TODO - verify the need for this, and perhaps extend the implementation to the 
+// TODO - verify the need for this, and perhaps extend the implementation to the
 //        colletion of mappers.
 public class MultipleTypeMapper extends BasicTypeMapper implements IManyTypeMapper
 {
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericManyTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericManyTypeMapper.java
index fd9da9740a..4cb9d4072f 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericManyTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericManyTypeMapper.java
@@ -94,13 +94,13 @@ public abstract class NumericManyTypeMapper extends BasicTypeMapper implements I
         embeddedAttributeName, // Attribute name
         1, // # elements in fixed-size array
         getObjyBaseType() // Type of numeric data
-        ); // Default value
+    ); // Default value
 
     propClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
         embeddedAttributeNull, // Attribute name
         1, // # elements in fixed-size array
         ooBaseType.ooBOOLEAN// Type of numeric data
-        ); // Default value
+    ); // Default value
 
     // System.out.println("OBJY: Propose Creating new class: " + embeddedClassName());
 
@@ -143,7 +143,7 @@ public abstract class NumericManyTypeMapper extends BasicTypeMapper implements I
   /**
    * TODO - this is a simple change to the attribute, make it handle more complex cases. I also don't think it does
    * handle the arrays.
-   * 
+   *
    * @param proposedooClass
    * @param feature
    */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java
index 8d9ff6c468..4f8317ce42 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/NumericTypeMapper.java
@@ -80,19 +80,19 @@ public abstract class NumericTypeMapper extends BasicTypeMapper implements ISing
         getAttributeName(feature), // Attribute name
         1, // # elements in fixed-size array
         getObjyBaseType() // Default value
-        );
+    );
 
     proposedClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
         getNullAttributeName(feature), // Attribute name
         1, // # elements in fixed-size array
         ooBaseType.ooBOOLEAN // Default value
-        );
+    );
     return false;
   }
 
   /**
    * TODO - this is a simple change to the attribute, make it handle more complex cases.
-   * 
+   *
    * @param proposedooClass
    * @param feature
    */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleContainementReferenceMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleContainementReferenceMapper.java
index 9ff65da23e..5c73f11015 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleContainementReferenceMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleContainementReferenceMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring comments for CDO 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleReferenceMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleReferenceMapper.java
index b24823010a..7e13d0fa7c 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleReferenceMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/SingleReferenceMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringTypeMapper.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringTypeMapper.java
index fb6239758d..441f9b767b 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringTypeMapper.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/mapper/StringTypeMapper.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -53,7 +53,7 @@ public class StringTypeMapper extends BasicTypeMapper implements ISingleTypeMapp
           getNullAttributeName(feature), // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooBOOLEAN // Default value
-          );
+      );
     }
     catch (ObjyRuntimeException ex)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListId.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListId.java
index 68a1e501ba..aef0b06eea 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListId.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListId.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -115,7 +115,7 @@ public class ObjyArrayListId
   protected ooId getOidValue(long index)
   {
     // System.out.println(" - ooArrayListId.getValue() at index: " + index +
-    // "  for classObject: " + classObject.objectID().getStoreString() );
+    // " for classObject: " + classObject.objectID().getStoreString() );
     return getValue(index).getOid();
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java
index 97b903a965..3a63098a0f 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListLong.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -54,7 +54,7 @@ public class ObjyArrayListLong extends ObjyArrayList<Long>
           ObjyArrayList.sizeName, // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooINT32 // Type of numeric data
-      ); // Default value
+          ); // Default value
 
       A.add_varray_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
           ObjyArrayList.arrayName, // Attribute name
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java
index 7f1b22adfd..9f309f306e 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyArrayListString.java
@@ -87,13 +87,13 @@ public class ObjyArrayListString
           embeddedAttributeName, // Attribute name
           1, // # elements in fixed-size array
           "ooUtf8String" // Type of numeric data
-      ); // Default value
+          ); // Default value
 
       embeddedClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
           embeddedAttributeNull, // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooBOOLEAN // Type of numeric data
-          ); // Default value
+      ); // Default value
 
       // top_mod.propose_new_class(embeddedClass);
 
@@ -107,7 +107,7 @@ public class ObjyArrayListString
           ObjyArrayListString.FixedElementsName, // Attribute name
           ObjyArrayListString.FixedElementsSize, // # elements in fixed-size array
           embeddedClassName // Type of numeric data
-          ); // Default value
+      ); // Default value
 
       // top_mod.propose_new_class(fixedArrayClass);
 
@@ -120,7 +120,7 @@ public class ObjyArrayListString
           ObjyArrayList.sizeName, // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooINT32 // Type of numeric data
-          ); // Default value
+      ); // Default value
 
       StringArrayClass.add_varray_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
           ObjyArrayList.arrayName, // Attribute name
@@ -179,7 +179,7 @@ public class ObjyArrayListString
     Class_Object chunkObject = getVArray().get_class_obj(chunkItem);
     // String_Value value = chunkObject.nget_string(FixedElementsName, chunkIndex);
     Class_Object embeddedElement = chunkObject.nget_class_obj(FixedElementsName, chunkIndex); // TODO - I don't like
-                                                                                              // using magic numbers!!!
+    // using magic numbers!!!
     String_Value value = embeddedElement.nget_string(embeddedAttributeName);
     Numeric_Value isNull = embeddedElement.get_numeric(1);
     return isNull == ITypeMapper.numericTrue ? null : value.toString();
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java
index 433c52a7df..144f5036c8 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBase.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -27,7 +27,7 @@ import com.objy.as.app.ooBaseType;
 /**
  * EMF Classes in Objectivity are enhanced with this base class. This class is use for the revision data as a base for
  * other classes created.
- * 
+ *
  * @author ibrahim
  */
 public class ObjyBase
@@ -93,7 +93,7 @@ public class ObjyBase
           ObjyBase.ATT_CONTAINER_FEATUERID, // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooINT32 // Type of numeric data
-          ); // Default value
+      ); // Default value
 
       propClass.add_ref_attribute(com.objy.as.app.d_Module.LAST, // Access kind
           d_Access_Kind.d_PUBLIC, // Access kind
@@ -111,25 +111,25 @@ public class ObjyBase
           ObjyBase.ATT_VERSION, // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooINT32 // Type of numeric data
-          ); // Default value
+      ); // Default value
 
       propClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
           ObjyBase.ATT_BRANCHID, // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooINT32 // Type of numeric data
-          ); // Default value
+      ); // Default value
 
       propClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
           ObjyBase.ATT_CREATION_TIME, // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooINT64 // Type of numeric data
-          ); // Default value
+      ); // Default value
 
       propClass.add_basic_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
           ObjyBase.ATT_REVISED_TIME, // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooINT64 // Type of numeric data
-          ); // Default value
+      ); // Default value
 
       if (!inProcess)
       {
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranch.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranch.java
index b62e06890e..ec468deb65 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranch.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyBranch.java
@@ -20,6 +20,7 @@ import java.util.SortedSet;
 /**
  * @author Ibrahim Sallam
  */
+
 /**
  * @author Ibrahim Sallam
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java
index 610afb6df6..fc6c5d34b4 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapArrayList.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -80,7 +80,7 @@ public class ObjyFeatureMapArrayList extends ObjyArrayList<ObjyFeatureMapEntry>
           ObjyArrayList.sizeName, // Attribute name
           1, // # elements in fixed-size array
           ooBaseType.ooINT32 // Type of numeric data
-      ); // Default value
+          ); // Default value
       A.add_varray_attribute(com.objy.as.app.d_Module.LAST, d_Access_Kind.d_PUBLIC, // Access kind
           ObjyArrayList.arrayName, // Attribute name
           1, false, ObjyFeatureMapEntry.MapEntryClassName);
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java
index 940b24f576..75891c05dd 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java
@@ -61,7 +61,7 @@ public class ObjyFeatureMapEntry
 
   /****
    * Factory.
-   * 
+   *
    * @param tagId
    * @param oid
    */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java
index f19d10d233..c3999afef8 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyLockArea.java
@@ -158,10 +158,9 @@ public class ObjyLockArea extends ooObj
   public String toString()
   {
     fetch();
-    return MessageFormat
-        .format(
-            "ObjyLockArea[id={0}, user={1}, branchPoint={2}, readOnly={3}, readlocks={4}, writeLocks{5}, readWriteLocks{6}",
-            durableLockingID, userID, branchPoint, readOnly, readLockSet.size(), writeLockSet.size(),
-            readWriteLockSet.size());
+    return MessageFormat.format(
+        "ObjyLockArea[id={0}, user={1}, branchPoint={2}, readOnly={3}, readlocks={4}, writeLocks{5}, readWriteLocks{6}",
+        durableLockingID, userID, branchPoint, readOnly, readLockSet.size(), writeLockSet.size(),
+        readWriteLockSet.size());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java
index bf30b2061d..b4842aa4fa 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java
@@ -35,7 +35,7 @@ public class ObjyPackageInfo extends ooObj
         "org.eclipse.emf.cdo.server.internal.objectivity.schema.ObjyPackageUnit", // name of related class
         "packageInfos", // inverse relationship field name
         Relationship.COPY_DELETE, Relationship.VERSION_DELETE, false, false, Relationship.INLINE_NONE); // none-inline
-                                                                                                        // association
+    // association
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageUnit.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageUnit.java
index d0205b50a5..3a4f737ce4 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageUnit.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageUnit.java
@@ -43,12 +43,12 @@ public class ObjyPackageUnit extends ooObj
         "org.eclipse.emf.cdo.server.internal.objectivity.schema.ObjyPackageInfo", // name of related class
         "packageUnit", // inverse relationship field name
         Relationship.COPY_DELETE, Relationship.VERSION_DELETE, false, false, Relationship.INLINE_NONE); // none-inline
-                                                                                                        // association
+    // association
   }
 
   /**
    * get all related children
-   * 
+   *
    * @return list of ObjyPackageInfo objects.
    */
   public List<ObjyPackageInfo> getPackageInfos()
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProperty.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProperty.java
index 9b6f146761..c7fa1f3a96 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProperty.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProperty.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java
index 3b57f09c0d..7b25ee9fd8 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyProxy.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
@@ -61,7 +61,7 @@ public class ObjyProxy
           ObjyProxy.uriAttributeName, // Attribute name
           1, // # elements in fixed-size array
           "ooUtf8String" // name of embedded class
-      );
+          );
 
       // top_mod.propose_new_class(propClass);
       if (!inProcess)
@@ -80,8 +80,8 @@ public class ObjyProxy
   // factory.
   public static ObjyProxy createObject(ooId nearObject)
   {
-    Class_Object newClassObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(ObjyProxy.className)
-        .getASClass(), nearObject, false);
+    Class_Object newClassObject = Class_Object
+        .new_persistent_object(ObjySchema.getObjyClass(ObjyProxy.className).getASClass(), nearObject, false);
     ObjyProxy proxyObject = new ObjyProxy(newClassObject);
     return proxyObject;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java
index c58d4bc8b1..2ab57249c7 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyResourceList.java
@@ -37,7 +37,7 @@ import com.objy.db.util.ooTreeListX;
 /***
  * OoResouceList is a specialized ooArrayListId, where all elements are of type Resourc(Node|Folder). The class will
  * allow adding, validating and removing resources From the list.
- * 
+ *
  * @author ibrahim
  */
 public class ObjyResourceList
@@ -165,7 +165,8 @@ public class ObjyResourceList
   // CDOID existingID = storeAccessor.readResourceID(folderID, name, revision.getBranch().getHead());
   // if (existingID != CDOID.NULL && !existingID.equals(revision.getID()))
   // {
-  //      throw new IllegalStateException("Duplicate resource or folder: " + name + " in folder " + folderID); //$NON-NLS-1$ //$NON-NLS-2$
+  // throw new IllegalStateException("Duplicate resource or folder: " + name + " in folder " + folderID); //$NON-NLS-1$
+  // //$NON-NLS-2$
   // }
   // }
 
@@ -240,8 +241,8 @@ public class ObjyResourceList
 
   public static ObjyObject create(ooId nearOid)
   {
-    Class_Object classObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(ObjyResourceList.className)
-        .getASClass(), nearOid, false);
+    Class_Object classObject = Class_Object
+        .new_persistent_object(ObjySchema.getObjyClass(ObjyResourceList.className).getASClass(), nearOid, false);
     // ObjyObjectManager.newInternalObjCount++;
     // Class_Position position = classObject.position_in_class(ObjyResourceList.Attribute_arrayName);
     // Class_Object arrayClassObject = Class_Object.new_persistent_object(
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyStoreInfo.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyStoreInfo.java
index 7c820eba38..8ec3e4f62a 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyStoreInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyStoreInfo.java
@@ -4,7 +4,7 @@
  * 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:
  *    Ibrahim Sallam - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/SmartLock.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/SmartLock.java
index de7e4213c4..4c8e87b416 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/SmartLock.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/SmartLock.java
@@ -118,7 +118,7 @@ public class SmartLock
    * This should replace ooObj.activate. We do not need to call super.activate because we implemented the code in
    * ooObj.activate in here. This safeActivate will refresh container in case of errors. >> ... Msg: objref member: test
    * with oid: #26-387-1-2 not found or accessible
-   * 
+   *
    * @param object
    * @param fcweEx
    */
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/TypeConvert.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/TypeConvert.java
index ac33b43655..498201c795 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/TypeConvert.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/TypeConvert.java
@@ -20,7 +20,7 @@ import com.objy.db.app.ooObj;
 
 /**
  * Originally EOOUtil TBD: verify if we really need this class...
- * 
+ *
  * @author ibrahim
  */
 public class TypeConvert
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/package-info.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/package-info.java
index 74dbfcf185..4d1508ddd2 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/objectivity/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server concepts for dealing with Objectivity/DB stores and accessors.
  */
 package org.eclipse.emf.cdo.server.objectivity;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF
index d0708b73e9..d2df7ca9f8 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.ocl;singleton:=true
 Bundle-Name: %pluginName
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 4.2.100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,4 +10,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.ocl;version="4.2.0"
+Export-Package: org.eclipse.emf.cdo.server.ocl;version="4.2.100"
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOAdditionalOperation.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOAdditionalOperation.java
index 64a4874e3b..deba6529a5 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOAdditionalOperation.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOAdditionalOperation.java
@@ -231,8 +231,8 @@ abstract class CDOAdditionalOperation extends AdapterImpl
         List<? extends TypedElement<EClassifier>> args)
     {
       // The result type of the type-filtered variant is a collection of the filter type
-      EClassifier elementType = args.isEmpty() ? getEnv().getOCLStandardLibrary().getOclAny() : ((TypeType)args.get(0)
-          .getType()).getReferredType();
+      EClassifier elementType = args.isEmpty() ? getEnv().getOCLStandardLibrary().getOclAny()
+          : ((TypeType)args.get(0).getType()).getReferredType();
       return collectionType(CollectionKind.COLLECTION_LITERAL, elementType);
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironment.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironment.java
index 80ece950cf..3ae9ead021 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironment.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironment.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -33,7 +33,7 @@ import java.util.List;
 
 /**
  * CDO-specific Ecore environment implementation.  It adds operations that assist in building efficient OCL queries.
- * 
+ *
  * @author Christian W. Damus
  * @since 4.2
  */
@@ -171,8 +171,8 @@ class CDOEnvironment extends EcoreEnvironment
   /**
    * @author Christian W. Damus
    */
-  private static class DelegatingCachedTypeChecker extends DelegatingTypeChecker implements
-      TypeChecker.Cached<EClassifier, EOperation, EStructuralFeature>
+  private static class DelegatingCachedTypeChecker extends DelegatingTypeChecker
+      implements TypeChecker.Cached<EClassifier, EOperation, EStructuralFeature>
   {
     private final TypeChecker.Cached<EClassifier, EOperation, EStructuralFeature> delegate;
 
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironmentFactory.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironmentFactory.java
index 71c58d5a8d..4f170d6d4f 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironmentFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEnvironmentFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -28,7 +28,7 @@ import org.eclipse.ocl.ecore.SendSignalAction;
 
 /**
  * The factory of CDO-specific Ecore environments.
- * 
+ *
  * @author Christian W. Damus
  * @since 4.2
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEvaluationEnvironment.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEvaluationEnvironment.java
index 814227e07d..79ce6821a7 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEvaluationEnvironment.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/CDOEvaluationEnvironment.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -22,7 +22,7 @@ import org.eclipse.ocl.ecore.EcoreEvaluationEnvironment;
 
 /**
  * A CDO-specific specialization of the OCL evaluation environment.
- * 
+ *
  * @author Christian W. Damus
  * @since 4.2
  */
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
index 1db1eb6fc0..5e23bda3f6 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
@@ -91,8 +91,8 @@ public class OCLQueryHandler implements IQueryHandler
    */
   public static final String IMPLICIT_ROOT_CLASS_PARAMETER = "cdoImplicitRootClass";
 
-  private static final Set<String> SERVER_QUERY_PARAMETERS = Collections.unmodifiableSet(new java.util.HashSet<String>(
-      Arrays.asList(LAZY_EXTENTS_PARAMETER, IMPLICIT_ROOT_CLASS_PARAMETER)));
+  private static final Set<String> SERVER_QUERY_PARAMETERS = Collections.unmodifiableSet(
+      new java.util.HashSet<String>(Arrays.asList(LAZY_EXTENTS_PARAMETER, IMPLICIT_ROOT_CLASS_PARAMETER)));
 
   private static final EcoreFactory FACTORY = EcoreFactory.eINSTANCE;
 
@@ -219,7 +219,7 @@ public class OCLQueryHandler implements IQueryHandler
    */
   protected Query<EClassifier, EClass, EObject> createQuery(CDOView view, CDOQueryInfo info,
       ContextParameter contextParameter, OCL<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, Constraint, EClass, EObject> ocl)
-      throws ParserException, DiagnosticException
+          throws ParserException, DiagnosticException
   {
     Map<String, Object> parameters = new HashMap<String, Object>(info.getParameters());
     initEnvironment(ocl.getEnvironment(), view.getSession().getPackageRegistry(), parameters);
diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/package-info.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/package-info.java
index 8d7a55149b..cc8a5eb835 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server implementation of a generic OCL query handler.
  */
 package org.eclipse.emf.cdo.server.ocl;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF
index c85ea4a003..04d3066cb9 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.security/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.security;singleton:=true
 Bundle-Name: %pluginName
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,15 +12,15 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.security;bundle-version="[4.1.0,5.0.0)",
  org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",
  org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.internal.security;version="4.3.0";
+Export-Package: org.eclipse.emf.cdo.server.internal.security;version="4.3.100";
   x-friends:="org.eclipse.emf.cdo.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
    org.eclipse.emf.cdo.tests.hibernate,
    org.eclipse.emf.cdo.tests.mongodb,
    org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.cdo.server.internal.security.bundle;version="4.3.0";x-internal:=true,
- org.eclipse.emf.cdo.server.security;version="4.3.0",
- org.eclipse.emf.cdo.server.spi.security;version="4.3.0"
+ org.eclipse.emf.cdo.server.internal.security.bundle;version="4.3.100";x-internal:=true,
+ org.eclipse.emf.cdo.server.security;version="4.3.100",
+ org.eclipse.emf.cdo.server.spi.security;version="4.3.100"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.cdo.server.internal.security.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
index 2fbaad71ab..8cac8ecdf3 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManager.java
@@ -620,26 +620,26 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
     // Create roles
 
     Role allReaderRole = realm.addRole(Role.ALL_OBJECTS_READER);
-    allReaderRole.getPermissions().add(
-        SF.createFilterPermission(Access.READ, SF.createResourceFilter(".*", PatternStyle.REGEX)));
+    allReaderRole.getPermissions()
+        .add(SF.createFilterPermission(Access.READ, SF.createResourceFilter(".*", PatternStyle.REGEX)));
 
     Role allWriterRole = realm.addRole(Role.ALL_OBJECTS_WRITER);
-    allWriterRole.getPermissions().add(
-        SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(".*", PatternStyle.REGEX)));
+    allWriterRole.getPermissions()
+        .add(SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(".*", PatternStyle.REGEX)));
 
     Role treeReaderRole = realm.addRole(Role.RESOURCE_TREE_READER);
-    treeReaderRole.getPermissions().add(
-        SF.createFilterPermission(Access.READ, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
+    treeReaderRole.getPermissions()
+        .add(SF.createFilterPermission(Access.READ, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
 
     Role treeWriterRole = realm.addRole(Role.RESOURCE_TREE_WRITER);
-    treeWriterRole.getPermissions().add(
-        SF.createFilterPermission(Access.WRITE, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
+    treeWriterRole.getPermissions()
+        .add(SF.createFilterPermission(Access.WRITE, SF.createPackageFilter(EresourcePackage.eINSTANCE)));
 
     Role adminRole = realm.addRole(Role.ADMINISTRATION);
-    adminRole.getPermissions().add(
-        SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(realmPath, PatternStyle.EXACT, false)));
-    adminRole.getPermissions().add(
-        SF.createFilterPermission(Access.READ, SF.createResourceFilter(realmPath, PatternStyle.EXACT, true)));
+    adminRole.getPermissions()
+        .add(SF.createFilterPermission(Access.WRITE, SF.createResourceFilter(realmPath, PatternStyle.EXACT, false)));
+    adminRole.getPermissions()
+        .add(SF.createFilterPermission(Access.READ, SF.createResourceFilter(realmPath, PatternStyle.EXACT, true)));
 
     // Create groups
 
@@ -1091,7 +1091,8 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
 
           if (permission != CDOPermission.WRITE)
           {
-            throw new SecurityException("User " + commitContext.getUserID() + " is not allowed to write to " + revision);
+            throw new SecurityException(
+                "User " + commitContext.getUserID() + " is not allowed to write to " + revision);
           }
 
           if (securityImpact != CommitNotificationInfo.IMPACT_REALM)
@@ -1180,7 +1181,7 @@ public class SecurityManager extends Lifecycle implements InternalSecurityManage
    * A write-access handler that checks changes about to be committed to the security realm
    * against its well-formedness rules, and rejects the commit if there are any integrity
    * errors.
-   * 
+   *
    * @author Christian W. Damus (CEA LIST)
    */
   private final class RealmValidationHandler extends ObjectWriteAccessHandler
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java
index 8d997c3252..e41e2e5b9f 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/internal/security/SecurityManagerCommand.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -51,7 +51,8 @@ public abstract class SecurityManagerCommand extends CDOCommand.WithRepository
   {
     public AddUser()
     {
-      super("adduser", "adds a user to the security realm of a repository", parameter("username"), optional("password"));
+      super("adduser", "adds a user to the security realm of a repository", parameter("username"),
+          optional("password"));
     }
 
     @Override
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/security/package-info.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/security/package-info.java
index 7b4d6abb61..1c66bfa044 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/security/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/security/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Server integration of the {@link org.eclipse.emf.cdo.security.Realm Security} model.
  */
 package org.eclipse.emf.cdo.server.security;
-
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java
index 1f80c9d46b..889d589426 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/SecurityManagerFactory.java
@@ -87,8 +87,8 @@ public abstract class SecurityManagerFactory extends Factory
 
       if (securityManager instanceof InternalSecurityManager)
       {
-        ((InternalSecurityManager)securityManager).setRepository((InternalRepository)RepositoryFactory.get(container,
-            repositoryName));
+        ((InternalSecurityManager)securityManager)
+            .setRepository((InternalRepository)RepositoryFactory.get(container, repositoryName));
       }
 
       return securityManager;
@@ -137,8 +137,8 @@ public abstract class SecurityManagerFactory extends Factory
     @Override
     public ISecurityManager create(String realmPath) throws ProductCreationException
     {
-      OM.LOG
-          .warn("SecurityManagerFactory.Annotation is deprecated. As of 4.3 use SecurityManagerFactory.Default with a description like \"realmPath:annotation\"");
+      OM.LOG.warn(
+          "SecurityManagerFactory.Annotation is deprecated. As of 4.3 use SecurityManagerFactory.Default with a description like \"realmPath:annotation\"");
 
       InternalSecurityManager securityManager = (InternalSecurityManager)SecurityManagerUtil
           .createSecurityManager(realmPath);
diff --git a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/package-info.java b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/package-info.java
index e877501940..14b1bd395f 100644
--- a/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server.security/src/org/eclipse/emf/cdo/server/spi/security/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Server provider interfaces (SPI) for the server integration of the {@link org.eclipse.emf.cdo.security.Realm Security} model.
  */
 package org.eclipse.emf.cdo.server.spi.security;
-
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
index 186883b680..782caee0c1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LockingManager.java
@@ -68,7 +68,7 @@ import java.util.Set;
  * @author Simon McDuff
  * @since 3.0
  */
-public class LockingManager extends RWOLockManager<Object, IView> implements InternalLockManager
+public class LockingManager extends RWOLockManager<Object, IView>implements InternalLockManager
 {
   private InternalRepository repository;
 
@@ -185,8 +185,8 @@ public class LockingManager extends RWOLockManager<Object, IView> implements Int
   }
 
   @Deprecated
-  public void lock(boolean explicit, LockType type, IView view, Collection<? extends Object> objectsToLock, long timeout)
-      throws InterruptedException
+  public void lock(boolean explicit, LockType type, IView view, Collection<? extends Object> objectsToLock,
+      long timeout) throws InterruptedException
   {
     lock2(explicit, type, view, objectsToLock, false, timeout);
   }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java
index 1553bc0504..eefddfd596 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryResult.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.spi.server.InternalView;
  * @author Simon McDuff
  * @since 2.0
  */
-public class QueryResult extends AbstractQueryResult<Object> implements InternalQueryResult
+public class QueryResult extends AbstractQueryResult<Object>implements InternalQueryResult
 {
   public QueryResult(InternalView view, CDOQueryInfo queryInfo, int queryID)
   {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
index 712c5a3a1e..28111aae08 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
@@ -144,7 +144,7 @@ import java.util.concurrent.Semaphore;
  * @author Eike Stepper
  * @since 2.0
  */
-public class Repository extends Container<Object> implements InternalRepository
+public class Repository extends Container<Object>implements InternalRepository
 {
   private static final int UNCHUNKED = CDORevision.UNCHUNKED;
 
@@ -527,8 +527,8 @@ public class Repository extends Container<Object> implements InternalRepository
         {
           CDOBranchVersion targetBranchVersion = pointerInfo.getTargetBranchVersion();
           InternalCDORevision target = loadRevisionByVersion(id, targetBranchVersion, referenceChunk);
-          PointerCDORevision pointer = new PointerCDORevision(target.getEClass(), id, pointerInfo
-              .getAvailableBranchVersion().getBranch(), CDORevision.UNSPECIFIED_DATE, target);
+          PointerCDORevision pointer = new PointerCDORevision(target.getEClass(), id,
+              pointerInfo.getAvailableBranchVersion().getBranch(), CDORevision.UNSPECIFIED_DATE, target);
 
           info.setResult(target);
           info.setSynthetic(pointer);
@@ -1296,19 +1296,15 @@ public class Repository extends Container<Object> implements InternalRepository
     long creationTimeStamp = getCreationTime();
     if (timeStamp < creationTimeStamp)
     {
-      throw new IllegalArgumentException(
-          MessageFormat
-              .format(
-                  "timeStamp ({0}) < repository creation time ({1})", CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(creationTimeStamp))); //$NON-NLS-1$
+      throw new IllegalArgumentException(MessageFormat.format("timeStamp ({0}) < repository creation time ({1})", //$NON-NLS-1$
+          CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(creationTimeStamp)));
     }
 
     long currentTimeStamp = getTimeStamp();
     if (timeStamp > currentTimeStamp)
     {
-      throw new IllegalArgumentException(
-          MessageFormat
-              .format(
-                  "timeStamp ({0}) > current time ({1})", CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(currentTimeStamp))); //$NON-NLS-1$
+      throw new IllegalArgumentException(MessageFormat.format("timeStamp ({0}) > current time ({1})", //$NON-NLS-1$
+          CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(currentTimeStamp)));
     }
   }
 
@@ -1778,8 +1774,8 @@ public class Repository extends Container<Object> implements InternalRepository
 
         if (rev == null)
         {
-          throw new IllegalArgumentException(String.format("Object %s not found in branch %s (possibly detached)", id,
-              viewedBranch));
+          throw new IllegalArgumentException(
+              String.format("Object %s not found in branch %s (possibly detached)", id, viewedBranch));
         }
 
         if (!revKey.equals(rev))
@@ -2167,10 +2163,10 @@ public class Repository extends Container<Object> implements InternalRepository
       throw new IllegalStateException("Store can not handle client assigned IDs: " + store);
     }
 
-    store.setRevisionTemporality(supportingAudits ? IStore.RevisionTemporality.AUDITING
-        : IStore.RevisionTemporality.NONE);
-    store.setRevisionParallelism(supportingBranches ? IStore.RevisionParallelism.BRANCHING
-        : IStore.RevisionParallelism.NONE);
+    store.setRevisionTemporality(
+        supportingAudits ? IStore.RevisionTemporality.AUDITING : IStore.RevisionTemporality.NONE);
+    store.setRevisionParallelism(
+        supportingBranches ? IStore.RevisionParallelism.BRANCHING : IStore.RevisionParallelism.NONE);
     revisionManager.setSupportingAudits(supportingAudits);
     revisionManager.setSupportingBranches(supportingBranches);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
index cb1f58ba9f..0550b76cf4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
@@ -977,7 +977,8 @@ public class ServerCDOView extends AbstractCDOView implements org.eclipse.emf.cd
       throw new UnsupportedOperationException();
     }
 
-    public Object resolveElementProxy(CDORevision revision, EStructuralFeature feature, int accessIndex, int serverIndex)
+    public Object resolveElementProxy(CDORevision revision, EStructuralFeature feature, int accessIndex,
+        int serverIndex)
     {
       throw new UnsupportedOperationException();
     }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
index e045edaf14..c9f95eb6e2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
@@ -74,7 +74,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 /**
  * @author Eike Stepper
  */
-public class Session extends Container<IView> implements InternalSession
+public class Session extends Container<IView>implements InternalSession
 {
   private InternalSessionManager manager;
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
index 42957e4e44..48132235c3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
@@ -58,7 +58,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 /**
  * @author Eike Stepper
  */
-public class SessionManager extends Container<ISession> implements InternalSessionManager
+public class SessionManager extends Container<ISession>implements InternalSessionManager
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SESSION, SessionManager.class);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
index 3c31053c0c..505d59d2f1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
@@ -902,8 +902,8 @@ public class TransactionCommitContext implements InternalCommitContext
       }
     };
 
-    return CDOCommitInfoUtil.createCommitData(newPackageUnitsCollection, newObjectsCollection,
-        changedObjectsCollection, detachedObjectsCollection);
+    return CDOCommitInfoUtil.createCommitData(newPackageUnitsCollection, newObjectsCollection, changedObjectsCollection,
+        detachedObjectsCollection);
   }
 
   protected void adjustForCommit()
@@ -1019,8 +1019,8 @@ public class TransactionCommitContext implements InternalCommitContext
             CDORevision revision = transaction.getRevision(id);
             if (revision == null || revision instanceof DetachedCDORevision)
             {
-              throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_REFERENTIAL_INTEGRITY, "Attempt by "
-                  + transaction + " to introduce a stale reference");
+              throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_REFERENTIAL_INTEGRITY,
+                  "Attempt by " + transaction + " to introduce a stale reference");
             }
           }
         }
@@ -1154,8 +1154,8 @@ public class TransactionCommitContext implements InternalCommitContext
     if (oldRevision == null)
     {
       // If the object is logically locked (see lockObjects) but has a wrong (newer) version, someone else modified it
-      throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_COMMIT_CONFLICT, "Attempt by " + transaction
-          + " to modify historical revision: " + delta);
+      throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_COMMIT_CONFLICT,
+          "Attempt by " + transaction + " to modify historical revision: " + delta);
     }
 
     // Make sure all chunks are loaded
@@ -1198,8 +1198,8 @@ public class TransactionCommitContext implements InternalCommitContext
         InternalCDORevision revision = dirtyObjects[i];
         if (!isTheRootReachable(revision, objectsThatReachTheRoot, new HashSet<CDOID>()))
         {
-          throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_CONTAINMENT_CYCLE, "Attempt by "
-              + transaction + " to introduce a containment cycle");
+          throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_CONTAINMENT_CYCLE,
+              "Attempt by " + transaction + " to introduce a containment cycle");
         }
       }
     }
@@ -1244,8 +1244,8 @@ public class TransactionCommitContext implements InternalCommitContext
       xRefs = context.getXRefs(accessor);
       if (!xRefs.isEmpty())
       {
-        throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_REFERENTIAL_INTEGRITY, "Attempt by "
-            + transaction + " to introduce a stale reference");
+        throw new RollbackException(CDOProtocolConstants.ROLLBACK_REASON_REFERENTIAL_INTEGRITY,
+            "Attempt by " + transaction + " to introduce a stale reference");
       }
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java
index 83ae0478e5..f961d51bf8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/View.java
@@ -48,7 +48,7 @@ public class View extends Lifecycle implements InternalView, CDOCommonView.Optio
   private final int viewID;
 
   private final int sessionID; // Needed here so we can compute the hashCode even after session becomes null due to
-                               // deactivation!
+  // deactivation!
 
   private CDOBranchPoint branchPoint;
 
@@ -168,8 +168,8 @@ public class View extends Lifecycle implements InternalView, CDOCommonView.Optio
 
   private List<CDORevision> getRevisions(List<CDOID> ids)
   {
-    return repository.getRevisionManager().getRevisions(ids, branchPoint, CDORevision.UNCHUNKED,
-        CDORevision.DEPTH_NONE, true);
+    return repository.getRevisionManager().getRevisions(ids, branchPoint, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE,
+        true);
   }
 
   public void setBranchPoint(CDOBranchPoint branchPoint)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
index 06e3878564..88e23fe52a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java
@@ -70,8 +70,8 @@ public class XRefsQueryHandler implements IQueryHandler
 
       CDOBranchPoint branchPoint = context;
       CDOBranch branch = branchPoint.getBranch();
-      while (!branch.isMainBranch()
-          && (info.getMaxResults() == CDOQueryInfo.UNLIMITED_RESULTS || context.getResultCount() < info.getMaxResults()))
+      while (!branch.isMainBranch() && (info.getMaxResults() == CDOQueryInfo.UNLIMITED_RESULTS
+          || context.getResultCount() < info.getMaxResults()))
       {
         branchPoint = branch.getBase();
         branch = branchPoint.getBranch();
@@ -103,7 +103,7 @@ public class XRefsQueryHandler implements IQueryHandler
       // System.out.println(" ---> " + entry.getKey().getName());
       // for (EReference eReference : entry.getValue())
       // {
-      // System.out.println("      ---> " + eReference.getName());
+      // System.out.println(" ---> " + eReference.getName());
       // }
       // }
       //
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
index 85eaac6f83..464b7df32b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java
index 9c36851137..69fa8dfde4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSession.java
@@ -70,7 +70,7 @@ public class EmbeddedClientSession extends CDOSessionImpl implements CDOSession
   /**
    * Changing the user's password in an embedded client session is not supported:
    * it must be done interactively with the user in a client session.
-   * 
+   *
    * @since 4.3
    */
   public void changeCredentials()
@@ -81,7 +81,7 @@ public class EmbeddedClientSession extends CDOSessionImpl implements CDOSession
   /**
    * Resetting a user's password in an embedded client session is not supported:
    * it must be done interactively in a client session.
-   * 
+   *
    * @since 4.3
    */
   public void resetCredentials(String userID)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
index fe260e22d4..6051c9dc99 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
@@ -459,8 +459,8 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
       CDOCommitData commitData = context.getCommitData();
 
       int transactionID = transaction.getViewID();
-      InternalTransaction serverTransaction = (InternalTransaction)serverSessionProtocol.getSession().getView(
-          transactionID);
+      InternalTransaction serverTransaction = (InternalTransaction)serverSessionProtocol.getSession()
+          .getView(transactionID);
       serverCommitContext = serverTransaction.createCommitContext();
       serverCommitContext.preWrite();
       serverCommitContext.setAutoReleaseLocksEnabled(transaction.options().isAutoReleaseLocksEnabled());
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
index 06aabd86ba..53b50ebcb1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
@@ -132,8 +132,9 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader3, D
    */
   public MEMStore(int listLimit)
   {
-    super(TYPE, set(ChangeFormat.REVISION, ChangeFormat.DELTA), set(RevisionTemporality.NONE,
-        RevisionTemporality.AUDITING), set(RevisionParallelism.NONE, RevisionParallelism.BRANCHING));
+    super(TYPE, set(ChangeFormat.REVISION, ChangeFormat.DELTA),
+        set(RevisionTemporality.NONE, RevisionTemporality.AUDITING),
+        set(RevisionParallelism.NONE, RevisionParallelism.BRANCHING));
     setRevisionTemporality(RevisionTemporality.AUDITING);
     setRevisionParallelism(RevisionParallelism.BRANCHING);
     this.listLimit = listLimit;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreFactory.java
index d1ec43ba6e..56c96b7ff5 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java
index b83a164728..2d76d07a5c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java
index f403c74303..9c14fb820a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/OfflineClone.java
@@ -73,8 +73,8 @@ public class OfflineClone extends SynchronizableRepository
     {
       StoreThreadLocal.setSession(getReplicatorSession());
       InternalCDOBranchManager branchManager = getBranchManager();
-      return branchManager.createBranch(NEW_LOCAL_BRANCH,
-          "Offline-" + baseTimeStamp, (InternalCDOBranch)baseBranch, baseTimeStamp); //$NON-NLS-1$
+      return branchManager.createBranch(NEW_LOCAL_BRANCH, "Offline-" + baseTimeStamp, (InternalCDOBranch)baseBranch, //$NON-NLS-1$
+          baseTimeStamp);
     }
     finally
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
index 033ac8fe4f..92d6bc7cba 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
@@ -723,8 +723,8 @@ public abstract class SynchronizableRepository extends Repository.Default implem
       throw new IllegalStateException("Durable locking is not enabled for view " + view);
     }
 
-    LockObjectsResult masterLockingResult = sessionProtocol.delegateLockObjects(areaID, revKeys, view.getBranch(),
-        type, recursive, timeout);
+    LockObjectsResult masterLockingResult = sessionProtocol.delegateLockObjects(areaID, revKeys, view.getBranch(), type,
+        recursive, timeout);
 
     if (masterLockingResult.isSuccessful() && masterLockingResult.isWaitForUpdate())
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
index 4e5b34c36a..2b91c206ec 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
@@ -1229,7 +1229,8 @@ public class CDOServerBrowser extends Worker
       out.print("</table>\r\n");
     }
 
-    protected boolean showLob(PrintStream out, String type, byte[] id, long size, CDOServerBrowser browser, String param)
+    protected boolean showLob(PrintStream out, String type, byte[] id, long size, CDOServerBrowser browser,
+        String param)
     {
       String hex = HexUtil.bytesToHex(id);
       boolean selected = hex.equals(param);
@@ -1366,9 +1367,8 @@ public class CDOServerBrowser extends Worker
       for (CDOIDAndVersion key : commitInfo.getNewObjects())
       {
         CDORevision newObject = (CDORevision)key;
-        out.print("<li>"
-            + browser.href(newObject.toString(), RevisionsPage.FromStore.NAME, "revision",
-                CDORevisionUtil.formatRevisionKey(newObject)) + "<br>\r\n");
+        out.print("<li>" + browser.href(newObject.toString(), RevisionsPage.FromStore.NAME, "revision",
+            CDORevisionUtil.formatRevisionKey(newObject)) + "<br>\r\n");
       }
 
       out.print("</ul>\r\n");
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java
index dec715ce73..a0edd49d00 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerExporter.java
@@ -377,7 +377,7 @@ public abstract class CDOServerExporter<OUT>
    *
    * @author Eike Stepper
    */
-  public static class XML extends CDOServerExporter<XMLOutput> implements XMLConstants
+  public static class XML extends CDOServerExporter<XMLOutput>implements XMLConstants
   {
     public XML(IRepository repository)
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
index 93f0b17b06..9544182221 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
@@ -269,7 +269,8 @@ public final class CDOServerUtil
   /**
    * @since 4.0
    */
-  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store, Map<String, String> props)
+  public static ISynchronizableRepository createFailoverParticipant(String name, IStore store,
+      Map<String, String> props)
   {
     return createFailoverParticipant(name, store, props, null);
   }
@@ -296,8 +297,8 @@ public final class CDOServerUtil
     return RepositoryFactory.get(container, name);
   }
 
-  public static Element getRepositoryConfig(String repositoryName) throws ParserConfigurationException, SAXException,
-      IOException
+  public static Element getRepositoryConfig(String repositoryName)
+      throws ParserConfigurationException, SAXException, IOException
   {
     File configFile = OMPlatform.INSTANCE.getConfigFile("cdo-server.xml"); //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ILockingManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ILockingManager.java
index fcb660c9be..470b6f08b2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ILockingManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ILockingManager.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.common.lock.IDurableLockingManager;
  * Manages all persistent aspects of durable CDO views and provides for vetoable
  * {@link #addDurableViewHandler(ILockingManager.DurableViewHandler) interception} of the durable view resumption
  * process.
- * 
+ *
  * @author Caspar De Groot
  * @since 4.1
  */
@@ -32,7 +32,7 @@ public interface ILockingManager extends IDurableLockingManager
   /**
    * A call-back interface primarily intended to allow implementers to prevent the view from being opened by throwing an
    * exception. See {@link ILockingManager#addDurableViewHandler(DurableViewHandler)}.
-   * 
+   *
    * @author Caspar De Groot
    * @since 4.1
    */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java
index b7c23c21e0..b0c43cc594 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IMEMStore.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.server;
 
 /**
  * A simple in-memory store.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java
index e078687d95..65a7a17aa6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryContext.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.view.CDOQuery;
 /**
  * Represents the execution state of a {@link CDOQuery query} in the server towards a {@link IQueryHandler query
  * handler}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
@@ -34,7 +34,7 @@ public interface IQueryContext extends CDOBranchPoint
 
   /**
    * Adds the given object to the results of the associated query.
-   * 
+   *
    * @param object
    *          Support many primitives, CDOID and CDORevision. CDORevision are converted in CDOID and only CDOID are
    *          transfered to the client.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java
index 7e2a4df087..d35c4df318 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandler.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.view.CDOQuery;
 
 /**
  * A query language handler that is capable of executing a {@link CDOQuery query}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
@@ -25,7 +25,7 @@ public interface IQueryHandler
    * Executes the {@link CDOQuery query} represented by the specified {@link CDOQueryInfo query info} by
    * {@link IQueryContext#addResult(Object) passing} the query results to the query execution engine represented by the
    * specified {@link IQueryContext execution context}.
-   * 
+   *
    * @since 3.0
    */
   public void executeQuery(CDOQueryInfo info, IQueryContext context);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java
index 7cad582687..ce322b4e6a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IQueryHandlerProvider.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.view.CDOQuery;
 /**
  * Provides the consumer with {@link IQueryHandler query handlers} that are capable of executing {@link CDOQuery
  * queries} represented by specific {@link CDOQueryInfo query infos}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @apiviz.uses {@link IQueryHandler} - - provides
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
index 34db6f611d..c9a081c6ae 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
@@ -259,9 +259,9 @@ public interface IRepository extends CDOCommonRepository, IQueryHandlerProvider,
      * An exception that a {@link WriteAccessHandler} may throw to indicate that a
      * {@linkplain WriteAccessHandler#handleTransactionBeforeCommitting(ITransaction, org.eclipse.emf.cdo.server.IStoreAccessor.CommitContext, OMMonitor) transaction commit}
      * was rejected because one or more semantic validation checks reported errors.
-     * 
+     *
      * @author Christian W. Damus (CEA LIST)
-     * 
+     *
      * @since 4.3
      */
     public static final class TransactionValidationException extends RuntimeException
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java
index eb09a703c4..5c4b102f5d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepositoryProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.server;
 
 /**
  * Provides the consumer with CDO {@link IRepository repositories} specified by their name.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.uses {@link IRepository} - - provides
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
index d94ec3e653..17e10e3704 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
@@ -26,7 +26,7 @@ import java.util.Set;
 /**
  * Represents the physical data storage back-end of a CDO {@link IRepository repository}, such as a database or a file
  * system folder.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.landmark
  * @apiviz.has {@link IStore.ChangeFormat}
@@ -83,42 +83,42 @@ public interface IStore
 
   /**
    * Returns <code>true</code>if this store was activated for the first time, <code>false</code> otherwise.
-   * 
+   *
    * @since 4.0
    */
   public boolean isFirstStart();
 
   /**
    * Returns the store creation time.
-   * 
+   *
    * @since 2.0
    */
   public long getCreationTime();
 
   /**
    * Returns the id of the last branch that has been created in this store.
-   * 
+   *
    * @since 3.0
    */
   public int getLastBranchID();
 
   /**
    * Returns the id of the last local branch that has been created in this store.
-   * 
+   *
    * @since 3.0
    */
   public int getLastLocalBranchID();
 
   /**
    * Returns the time stamp of the last successful commit operation.
-   * 
+   *
    * @since 3.0
    */
   public long getLastCommitTime();
 
   /**
    * Returns the time stamp of the last successful commit operation to a non-local {@link CDOBranch branch}.
-   * 
+   *
    * @since 3.0
    */
   public long getLastNonLocalCommitTime();
@@ -126,7 +126,7 @@ public interface IStore
   /**
    * Returns a map filled with the property entries for the requested property <code>names</code> if names is not
    * <code>null</code> and not {@link Collection#isEmpty() empty}, all existing property entries otherwise.
-   * 
+   *
    * @since 4.0
    */
   public Map<String, String> getPersistentProperties(Set<String> names);
@@ -143,7 +143,7 @@ public interface IStore
 
   /**
    * Returns a reader that can be used to read from this store in the context of the given session.
-   * 
+   *
    * @param session
    *          The session that should be used as a context for read access or <code>null</code>. The store implementor
    *          is free to interpret and use the session in a manner suitable for him or ignore it at all. It is meant
@@ -160,7 +160,7 @@ public interface IStore
   /**
    * Returns a writer that can be used to write to this store in the context of the given view. The given view is always
    * marked as a transaction.
-   * 
+   *
    * @param transaction
    *          The view that must be used as a context for write access. The store implementor is free to interpret and
    *          use the view in a manner suitable for him or ignore it at all. It is meant only as a hint. Implementor can
@@ -179,7 +179,7 @@ public interface IStore
 
   /**
    * Enumerates the possible data formats a {@link IStore store} can accept for commit operations.
-   * 
+   *
    * @author Eike Stepper
    * @since 2.0
    */
@@ -198,7 +198,7 @@ public interface IStore
 
   /**
    * Enumerates the possible history recording options a {@link IStore store} can accept.
-   * 
+   *
    * @author Eike Stepper
    * @since 2.0
    */
@@ -217,7 +217,7 @@ public interface IStore
 
   /**
    * Enumerates the possible branching options a {@link IStore store} can accept.
-   * 
+   *
    * @author Eike Stepper
    * @since 2.0
    */
@@ -237,7 +237,7 @@ public interface IStore
   /**
    * A marker interface for {@link IStore stores} that can handle {@link CDOID IDs} assigned by a
    * {@link IDGenerationLocation#CLIENT client}, typically {@link ObjectType#UUID UUIDs}.
-   * 
+   *
    * @author Eike Stepper
    * @since 4.1
    * @apiviz.exclude
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java
index 20eceee43e..5f745765b9 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreChunkReader.java
@@ -22,7 +22,7 @@ import java.util.List;
  * Reads {@link Chunk chunks} of
  * {@link org.eclipse.emf.cdo.session.CDOSession.Options#setCollectionLoadingPolicy(CDOCollectionLoadingPolicy)
  * partially loaded} lists from a physical data storage backend.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.uses {@link IStoreChunkReader.Chunk} - - reads
  */
@@ -55,7 +55,7 @@ public interface IStoreChunkReader
   /**
    * Represents a {@link List#subList(int, int) sublist} of consecutive elements that are subject to <i>partial
    * collection loading</i>.
-   * 
+   *
    * @author Eike Stepper
    */
   public static class Chunk
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java
index 024ff1d9f1..7e74aa45c6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import java.util.Map;
 
 /**
  * Creates {@link IStore stores}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.uses {@link IStore} - - creates
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java
index 96d035d1d0..8be22976d4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITransaction.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 /**
  * The server-side representation of a client {@link CDOTransaction transaction}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java
index 547139563c..bc6912a5ea 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IView.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.view.CDOView;
 
 /**
  * The server-side representation of a client {@link CDOView view}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java
index 5a6dae0d81..3bd7a078d8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/RepositoryNotFoundException.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.session.CDOSession;
 /**
  * An unchecked exception being thrown when opening a {@link CDOSession session} to a named {@link IRepository
  * repository} that cannot be found.
- * 
+ *
  * @author Eike Stepper
  */
 public class RepositoryNotFoundException extends CDOException
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java
index e7faed1fc7..b278f7f689 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSession.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.server.embedded;
 
 /**
  * Deprecated, not yet supported.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java
index 64ff466c2d..50106c1488 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.server.IRepository;
 
 /**
  * Deprecated, not yet supported.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java
index 70725a0883..a5e52fba14 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/embedded/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server concepts for dealing with embedded sessions.
  */
 package org.eclipse.emf.cdo.server.embedded;
-
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/IMEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/IMEMStore.java
index d375fb5240..f72b4f6a26 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/IMEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/IMEMStore.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EClass;
 
 /**
  * A simple in-memory {@link IStore store}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/MEMStoreUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/MEMStoreUtil.java
index 24b510491c..28dca1344f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/MEMStoreUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/MEMStoreUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.internal.server.mem.MEMStore;
 
 /**
  * Creates {@link IMEMStore} instances.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
@@ -26,7 +26,7 @@ public final class MEMStoreUtil
 
   /**
    * Creates a {@link IMEMStore} instance.
-   * 
+   *
    * @since 4.0
    */
   public static IMEMStore createMEMStore()
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/package-info.java
index d360bb5b40..fcaaad373b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/mem/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server concepts for dealing with in-memory stores.
  */
 package org.eclipse.emf.cdo.server.mem;
-
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java
index f8236f8db8..6a09c91532 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/package-info.java
@@ -1,17 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Server concepts for dealing with repositories and stores.
- * 
+ *
  * @apiviz.exclude .*\.CDOServerBrowser.*
  * @apiviz.exclude .*\.CommitInfoLoader
  * @apiviz.exclude .*\.BranchLoader
@@ -20,4 +16,3 @@
  * @apiviz.exclude .*Exception
  */
 package org.eclipse.emf.cdo.server;
-
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java
index 07db389c4c..a06696b6f3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/AuthenticationUtil.java
@@ -44,16 +44,16 @@ public final class AuthenticationUtil
    */
   public static <V> Callable<V> authenticatingOperation(IAuthenticationProtocol authenticationProtocol,
       final Callable<V> operation)
-      {
+  {
     return new AuthenticatingOperation<V>(authenticationProtocol)
-        {
+    {
       @Override
       protected V doCall() throws Exception
       {
         return operation.call();
       }
-        };
-      }
+    };
+  }
 
   /**
    * Encapsulation of an administrative operation requiring (potentially) client
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java
index 2e5d08f845..ddc9593cae 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/CDOCommand.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension2.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension2.java
index 0c3245a08f..93291f8ab8 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension2.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/IAppExtension2.java
@@ -17,7 +17,7 @@ import java.io.Reader;
  * on the XML configurations of dynamically-managed repositories.  These may be instantiated multiple
  * times, will only be given repository configurations (not Net4j acceptors etc.) and are stopped if and
  * when their associated repositories are deleted.
- * 
+ *
  * @author Christian W. Damus (CEA LIST)
  * @since 4.3
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java
index 2c077f96af..a92a163687 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalCommitContext.java
@@ -49,20 +49,20 @@ public interface InternalCommitContext extends IStoreAccessor.CommitContext, CDO
         }
       }, //
 
-      new ProgressDistributable.Default<InternalCommitContext>()
+  new ProgressDistributable.Default<InternalCommitContext>()
+  {
+    public void runLoop(int index, InternalCommitContext commitContext, OMMonitor monitor) throws Exception
+    {
+      if (commitContext.getRollbackMessage() == null)
       {
-        public void runLoop(int index, InternalCommitContext commitContext, OMMonitor monitor) throws Exception
-        {
-          if (commitContext.getRollbackMessage() == null)
-          {
-            commitContext.commit(monitor.fork());
-          }
-          else
-          {
-            monitor.worked();
-          }
-        }
-      });
+        commitContext.commit(monitor.fork());
+      }
+      else
+      {
+        monitor.worked();
+      }
+    }
+  });
 
   public InternalTransaction getTransaction();
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java
index 1fede4bc47..64c4094b63 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalLockManager.java
@@ -27,7 +27,7 @@ import java.util.Map;
 /**
  * The type of the to-be-locked objects is either {@link CDOIDAndBranch} or {@link CDOID}, depending on whether
  * branching is supported by the repository or not.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  * @noextend This interface is not intended to be extended by clients.
@@ -74,7 +74,7 @@ public interface InternalLockManager extends IRWOLockManager<Object, IView>, ILo
 
   /**
    * Attempts to release for a given locktype, view and objects.
-   * 
+   *
    * @throws IllegalMonitorStateException
    *           Unlocking objects without lock.
    * @since 4.0
@@ -90,7 +90,7 @@ public interface InternalLockManager extends IRWOLockManager<Object, IView>, ILo
 
   /**
    * Attempts to release all locks(read and write) for a given view.
-   * 
+   *
    * @since 4.0
    */
   @Deprecated
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
index 4584ac1e07..f59e5490e2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
@@ -65,7 +65,7 @@ import java.util.concurrent.Semaphore;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalRepository extends IRepository, PackageProcessor, PackageLoader, BranchLoader3,
-    RevisionLoader2, CommitInfoLoader, CDORevisionUnchunker
+RevisionLoader2, CommitInfoLoader, CDORevisionUnchunker
 {
   public void setName(String name);
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
index f977da9674..68b1816e3b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalSynchronizableRepository.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.cdo.spi.common.CDOReplicationContext;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface InternalSynchronizableRepository extends ISynchronizableRepository, InternalRepository,
-    CDOReplicationContext, CDORawReplicationContext, CDOLockChangeInfoHandler
+CDOReplicationContext, CDORawReplicationContext, CDOLockChangeInfoHandler
 {
   public InternalRepositorySynchronizer getSynchronizer();
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
index 05d40b315b..9efc648363 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/RepositoryConfigurator.java
@@ -97,8 +97,8 @@ public class RepositoryConfigurator
     return storeFactories;
   }
 
-  public IRepository[] configure(File configFile) throws ParserConfigurationException, SAXException, IOException,
-      CoreException
+  public IRepository[] configure(File configFile)
+      throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     if (TRACER.isEnabled())
     {
@@ -111,8 +111,8 @@ public class RepositoryConfigurator
   /**
    * @since 4.3
    */
-  public IRepository[] configure(Reader configReader) throws ParserConfigurationException, SAXException, IOException,
-      CoreException
+  public IRepository[] configure(Reader configReader)
+      throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     if (TRACER.isEnabled())
     {
@@ -125,8 +125,8 @@ public class RepositoryConfigurator
   /**
    * @since 4.3
    */
-  protected IRepository[] configure(Document document) throws ParserConfigurationException, SAXException, IOException,
-      CoreException
+  protected IRepository[] configure(Document document)
+      throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     List<IRepository> repositories = new ArrayList<IRepository>();
     NodeList elements = document.getElementsByTagName("repository"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
index 09a2078681..ab3ff0408b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
@@ -174,8 +174,8 @@ public abstract class StoreAccessor extends StoreAccessorBase
   /**
    * @since 3.0
    */
-  protected abstract void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch,
-      long created, OMMonitor monitor);
+  protected abstract void writeRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas, CDOBranch branch, long created,
+      OMMonitor monitor);
 
   /**
    * @since 3.0
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java
index 28a7253f5b..4092fd42ec 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessorBase.java
@@ -341,8 +341,8 @@ public abstract class StoreAccessorBase extends Lifecycle implements IStoreAcces
     {
       if (rev.getTimeStamp() != timeStamp)
       {
-        throw new IllegalArgumentException("Invalid revision time stamp: "
-            + CDOCommonUtil.formatTimeStamp(rev.getTimeStamp()));
+        throw new IllegalArgumentException(
+            "Invalid revision time stamp: " + CDOCommonUtil.formatTimeStamp(rev.getTimeStamp()));
       }
 
       if (rev instanceof DetachedCDORevision)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java
index fc4d11605c..6ea1216e6f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/SyncingUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.CheckUtil;
 
 /**
  * Static methods that may help with classes related to repository synchronization.
- * 
+ *
  * @author Eike Stepper
  * @since 4.1
  */
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java
index 6b9f1cd8bf..b927854c75 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Server service provider interfaces and useful base implementations.
- * 
+ *
  * @apiviz.exclude .*
  */
 package org.eclipse.emf.cdo.spi.server;
-
diff --git a/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/bundle/OM.java b/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/bundle/OM.java
index df2c1d21a7..dd06693f46 100644
--- a/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java
index b544ab4db0..a910f0b06a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java
@@ -27,7 +27,8 @@ public class AllTestsDBH2Audit extends DBConfigs
     return new AllTestsDBH2Audit().getTestSuite();
   }
 
-  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation)
+  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent,
+      IDGenerationLocation idGenerationLocation)
   {
     // Without ranges
     suite.addScenario(parent, new H2Config(true, false, false, false, idGenerationLocation), JVM, NATIVE);
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
index 38ea22dd55..96878f42f8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
@@ -26,7 +26,8 @@ public class AllTestsDBH2Branching extends DBConfigs
     return new AllTestsDBH2Branching().getTestSuite();
   }
 
-  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation)
+  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent,
+      IDGenerationLocation idGenerationLocation)
   {
     // Without ranges
     suite.addScenario(parent, new H2Config(true, true, false, false, idGenerationLocation), JVM, NATIVE);
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java
index 6c3299973e..4d3761cd89 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java
@@ -26,7 +26,8 @@ public class AllTestsDBH2NonAudit extends DBConfigs
     return new AllTestsDBH2NonAudit().getTestSuite();
   }
 
-  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation)
+  public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent,
+      IDGenerationLocation idGenerationLocation)
   {
     suite.addScenario(parent, new H2Config(false, false, false, false, idGenerationLocation), JVM, NATIVE);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java
index 2a16a02628..4a743b4065 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java
@@ -4,7 +4,7 @@
  * 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:
  *    Stefan Winkler - initial API and implementation
  *    Stefan Winkler - Bug 285426: [DB] Implement user-defined typeMapping support
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java
index 2532c71196..be626c8a4f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java
@@ -35,7 +35,7 @@ import java.sql.ResultSet;
 
 /**
  * Test different DB annotations.
- * 
+ *
  * @author Kai Schlamp
  */
 // XXX PSQL fails, too - need to investigate
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreTest.java
index bf9cdda15b..36eb94907c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreTest.java
@@ -11,8 +11,6 @@
  */
 package org.eclipse.emf.cdo.tests.db;
 
-import oracle.jdbc.pool.OracleDataSource;
-
 import org.eclipse.emf.cdo.common.model.EMFUtil;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
@@ -43,6 +41,8 @@ import java.sql.Connection;
 import java.util.GregorianCalendar;
 import java.util.List;
 
+import oracle.jdbc.pool.OracleDataSource;
+
 /**
  * @author Stefan Winkler
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java
index e0a3303344..724ec6b2b8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java
index e50fdf308f..de40fe4091 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/OracleConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/OracleConfig.java
index 1d007e6906..2c11a5a94c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/OracleConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/OracleConfig.java
@@ -10,8 +10,6 @@
  */
 package org.eclipse.emf.cdo.tests.db;
 
-import oracle.jdbc.pool.OracleDataSource;
-
 import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
 import org.eclipse.emf.cdo.server.db.IDBStore;
 import org.eclipse.emf.cdo.tests.db.bundle.OM;
@@ -28,6 +26,8 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Map;
 
+import oracle.jdbc.pool.OracleDataSource;
+
 /**
  * @author Simon McDuff
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
index 1de0a2a2e1..1720181302 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
@@ -426,8 +426,8 @@ public class SQLQueryTest extends AbstractCDOTest
       customer.setStreet("Street " + i);
       resource.getContents().add(customer);
 
-      final List<Product1> customerProducts = products.subList(productCounter, productCounter
-          + NUM_OF_PRODUCTS_CUSTOMER);
+      final List<Product1> customerProducts = products.subList(productCounter,
+          productCounter + NUM_OF_PRODUCTS_CUSTOMER);
       for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
       {
         resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/bundle/OM.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/bundle/OM.java
index b662c73bc3..d6968a46ea 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
index 8f696dcf7e..7729056b86 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 /**
  * This is a simple test case that can be used to analyze how a DBMS handles DML in the middle of a transaction.
- * 
+ *
  * @author Stefan Winkler
  */
 public abstract class AbstractCapabilityTest extends TestCase
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/H2Test.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/H2Test.java
index fb4f5c627a..96d7a5737a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/H2Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/H2Test.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java
index 6aaee11dc5..feff17da87 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java
index 5031f26740..4ce73aac5f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/H2OfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/H2OfflineConfig.java
index 2033e5d8ce..40201ca3e6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/H2OfflineConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/H2OfflineConfig.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/MysqlOfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/MysqlOfflineConfig.java
index b0a1acfaf5..dd85202b5f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/MysqlOfflineConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/MysqlOfflineConfig.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java
index 6f329225fc..9e65f67242 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java
index 39bd38e968..3dd7329b55 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java
@@ -32,7 +32,7 @@ import java.util.Map;
 
 /**
  * NOTE: this testcase does not pass currently for CDO.
- * 
+ *
  * @author Simon McDuff
  * @Author Martin Taal
  */
@@ -122,7 +122,8 @@ public class AuditFeatureMapTest extends AbstractCDOTest
     }
   }
 
-  private void addToResultMap(long timeStamp, Map<Long, Map<EStructuralFeature, Class<?>>> result, FeatureMap featureMap)
+  private void addToResultMap(long timeStamp, Map<Long, Map<EStructuralFeature, Class<?>>> result,
+      FeatureMap featureMap)
   {
     final Map<EStructuralFeature, Class<?>> entryResult = new HashMap<EStructuralFeature, Class<?>>();
     result.put(timeStamp, entryResult);
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java
index c244f58696..34ebb605bd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java
@@ -221,8 +221,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
       CDORevisionDelta revisionDelta = revision3.compare(revision2);
       for (CDOFeatureDelta featureDelta : revisionDelta.getFeatureDeltas())
       {
-        System.err.println(featureDelta.getFeature().getName() + " changed through changeType "
-            + featureDelta.getType());
+        System.err
+            .println(featureDelta.getFeature().getName() + " changed through changeType " + featureDelta.getType());
       }
 
       assertEquals("ESC", revision1.getValue(revision1.getEClass().getEStructuralFeature("name")));
@@ -280,8 +280,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
     for (Object o : changedObjects)
     {
       final CDORevisionDelta cdoRevisionDelta = (CDORevisionDelta)o;
-      final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta.getFeatureDelta(EresourcePackage.eINSTANCE
-          .getCDOResource_Contents());
+      final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta
+          .getFeatureDelta(EresourcePackage.eINSTANCE.getCDOResource_Contents());
       assertNotNull(cdoFeatureDelta);
       assertEquals(CDOFeatureDelta.Type.LIST, cdoFeatureDelta.getType());
     }
@@ -326,8 +326,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
     for (Object o : changedObjects)
     {
       final CDORevisionDelta cdoRevisionDelta = (CDORevisionDelta)o;
-      final CDOSetFeatureDelta cdoFeatureDelta = (CDOSetFeatureDelta)cdoRevisionDelta.getFeatureDelta(cdoRevisionDelta
-          .getEClass().getEStructuralFeature("name"));
+      final CDOSetFeatureDelta cdoFeatureDelta = (CDOSetFeatureDelta)cdoRevisionDelta
+          .getFeatureDelta(cdoRevisionDelta.getEClass().getEStructuralFeature("name"));
       assertNotNull(cdoFeatureDelta);
       assertEquals("Sympedia", cdoFeatureDelta.getValue());
     }
@@ -344,8 +344,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
     for (Object o : changedObjects)
     {
       final CDORevisionDelta cdoRevisionDelta = (CDORevisionDelta)o;
-      final CDOSetFeatureDelta cdoFeatureDelta = (CDOSetFeatureDelta)cdoRevisionDelta.getFeatureDelta(cdoRevisionDelta
-          .getEClass().getEStructuralFeature("name"));
+      final CDOSetFeatureDelta cdoFeatureDelta = (CDOSetFeatureDelta)cdoRevisionDelta
+          .getFeatureDelta(cdoRevisionDelta.getEClass().getEStructuralFeature("name"));
       assertNotNull(cdoFeatureDelta);
       assertEquals("Eclipse", cdoFeatureDelta.getValue());
     }
@@ -369,8 +369,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
       {
         continue;
       }
-      final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta.getFeatureDelta(EresourcePackage.eINSTANCE
-          .getCDOResource_Contents());
+      final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta
+          .getFeatureDelta(EresourcePackage.eINSTANCE.getCDOResource_Contents());
       assertNotNull(cdoFeatureDelta);
       assertEquals(CDOFeatureDelta.Type.LIST, cdoFeatureDelta.getType());
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateAttributeTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateAttributeTest.java
index ee20d5cb13..fb604c9c5e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateAttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateAttributeTest.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.tests.AttributeTest;
 
 /**
  * Disable some tests which won't work with hibernate (persisting java classes and java objects).
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateAttributeTest extends AttributeTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_258933_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_258933_Test.java
index eef34790c1..bff57d1386 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_258933_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_258933_Test.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_258933_Test;
  * CDORevisionImpl.eIsSet() works incorrectly
  * <p>
  * See bug 258933
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateBugzilla_258933_Test extends Bugzilla_258933_Test
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_301104_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_301104_Test.java
index 119aad504c..09bd18874e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_301104_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_301104_Test.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EcoreFactory;
  * Allow application to set generated id.
  * <p>
  * See bug 301104
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateBugzilla_301104_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java
index 1ef70cd7c9..d4e35145dd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java
@@ -27,7 +27,7 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateBugzilla_356181_Test extends AbstractCDOTest
@@ -75,7 +75,8 @@ public class HibernateBugzilla_356181_Test extends AbstractCDOTest
       assertEquals(1, results.size());
       assertEquals(true,
           results.get(0).getSourceObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_NonTransient());
-      assertEquals(true, results.get(0).getTargetObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_Main());
+      assertEquals(true,
+          results.get(0).getTargetObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_Main());
       session.close();
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270b_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270b_Test.java
index 744b63681a..acc9dfbc3e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270b_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270b_Test.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
 
 /**
  * Read external reference annotation.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateBugzilla_362270b_Test extends Bugzilla_362270b_Test
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270c_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270c_Test.java
index 863b512178..c93a913ccd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270c_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270c_Test.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
 
 /**
  * Read external reference annotation.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateBugzilla_362270c_Test extends Bugzilla_362270c_Test
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_Test.java
index 1ad87d8a25..014cd265cf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_Test.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.teneo.PersistenceOptions;
 
 /**
  * Read external reference annotation.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateBugzilla_387752_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_True_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_True_Test.java
index f378f52dce..fe8f016b4d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_True_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_True_Test.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.teneo.PersistenceOptions;
 
 /**
  * Read external reference annotation.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateBugzilla_387752_True_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_417797_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_417797_Test.java
index 7a2025e818..b3ee16efaa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_417797_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_417797_Test.java
@@ -26,7 +26,7 @@ import org.hibernate.cache.ehcache.EhCacheRegionFactory;
 import org.hibernate.cfg.Environment;
 
 /**
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateBugzilla_417797_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java
index 8e5c9063a2..62c29e1799 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
 
 /**
  * Test {@link ExternalReferenceTest}, disables some testcases which will never work anyway.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateExternalReferenceTest extends ExternalReferenceTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java
index 642e54889d..4f50e25008 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java
@@ -32,7 +32,7 @@ import java.util.List;
 
 /**
  * Test lazy load behavior of hibernate
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateLazyLoadTest extends AbstractCDOTest
@@ -136,8 +136,8 @@ public class HibernateLazyLoadTest extends AbstractCDOTest
       customer.setStreet("Street " + i);
       resource.getContents().add(customer);
 
-      final List<Product1> customerProducts = products.subList(productCounter, productCounter
-          + NUM_OF_PRODUCTS_CUSTOMER);
+      final List<Product1> customerProducts = products.subList(productCounter,
+          productCounter + NUM_OF_PRODUCTS_CUSTOMER);
       for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
       {
         resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java
index a7b6250241..94035b47b5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java
@@ -17,7 +17,7 @@ import java.util.List;
 
 /**
  * Test different aspects of HQL querying using the CDO query api.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateMultiValuedOfAttributeTest extends MultiValuedOfAttributeTest
@@ -30,7 +30,7 @@ public class HibernateMultiValuedOfAttributeTest extends MultiValuedOfAttributeT
     list.add(10);
     list.add(13);
     list.add(20);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInteger(), getModel5Package()
-        .getGenListOfInteger_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInteger(),
+        getModel5Package().getGenListOfInteger_Elements());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java
index 50d10a375f..0643d4cc8e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.view.CDOQuery;
 
 /**
  * Test HQL queries with server side caching of query list to off.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateQueryNoCachingTest extends HibernateQueryTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
index 8ecaf6c17e..d8657196aa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
@@ -37,7 +37,7 @@ import java.util.List;
 
 /**
  * Test different aspects of HQL querying using the CDO query api.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateQueryTest extends AbstractCDOTest
@@ -202,10 +202,8 @@ public class HibernateQueryTest extends AbstractCDOTest
           final int productIndex = Integer.parseInt(product.getName());
           // note the id is always used as the parameter
           // bug 282620
-          final CDOQuery orderQuery = transaction
-              .createQuery(
-                  "hql",
-                  "select so from SalesOrder so, OrderDetail od where so.customer=:customer and od in elements(so.orderDetails) and od.product=:product");
+          final CDOQuery orderQuery = transaction.createQuery("hql",
+              "select so from SalesOrder so, OrderDetail od where so.customer=:customer and od in elements(so.orderDetails) and od.product=:product");
           orderQuery.setParameter("customer", customer);
           orderQuery.setParameter("product", product);
           addCacheParameter(orderQuery);
@@ -459,8 +457,8 @@ public class HibernateQueryTest extends AbstractCDOTest
       customer.setStreet("Street " + i);
       resource.getContents().add(customer);
 
-      final List<Product1> customerProducts = products.subList(productCounter, productCounter
-          + NUM_OF_PRODUCTS_CUSTOMER);
+      final List<Product1> customerProducts = products.subList(productCounter,
+          productCounter + NUM_OF_PRODUCTS_CUSTOMER);
       for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
       {
         resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateTimeStampTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateTimeStampTest.java
index f424574d55..9682346739 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateTimeStampTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateTimeStampTest.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 /**
  * Simple test to check that the timestamp is indeed stored. https://bugs.eclipse.org/bugs/show_bug.cgi?id=361792
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateTimeStampTest extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateXATransactionTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateXATransactionTest.java
index 039353b09e..34ceaadb24 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateXATransactionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateXATransactionTest.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
 
 /**
  * Override {@link XATransactionTest} to do mapping of external references.
- * 
+ *
  * @author Martin Taal
  */
 public class HibernateXATransactionTest extends XATransactionTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java
index 0564640107..aa8eb6029e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java
@@ -71,7 +71,7 @@ public class Hibernate_Missing_Version_Test extends AbstractCDOTest
     {
       CDOTransaction transaction = session.openTransaction();
       Customer customer = lastCustomer; // transaction.getObject(lastCustomer);//
-                                        // (Customer)resource.getContents().get(0);
+      // (Customer)resource.getContents().get(0);
       customer.setName("Peter");
       assertEquals(2, CDOUtil.getCDOObject(customer).cdoRevision().getVersion());
       transaction.commit();
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
index 0fc9458529..f9ef5127d5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
@@ -140,8 +140,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
     String oldTransient = transient_;
     transient_ = newTransient;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT,
-          oldTransient, transient_));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT, oldTransient,
+          transient_));
+    }
   }
 
   /**
@@ -164,8 +166,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
     String oldNonTransient = nonTransient;
     nonTransient = newNonTransient;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT,
           oldNonTransient, nonTransient));
+    }
   }
 
   /**
@@ -182,8 +186,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
       if (transientRef != oldTransientRef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF,
               oldTransientRef, transientRef));
+        }
       }
     }
     return transientRef;
@@ -209,8 +215,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
     Bz356181_Transient oldTransientRef = transientRef;
     transientRef = newTransientRef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF,
           oldTransientRef, transientRef));
+    }
   }
 
   /**
@@ -227,8 +235,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
       if (transientOtherRef != oldTransientOtherRef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF, oldTransientOtherRef, transientOtherRef));
+        }
       }
     }
     return transientOtherRef;
@@ -254,8 +264,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
     Bz356181_NonTransient oldTransientOtherRef = transientOtherRef;
     transientOtherRef = newTransientOtherRef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF,
           oldTransientOtherRef, transientOtherRef));
+    }
   }
 
   /**
@@ -274,11 +286,15 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
       return getNonTransient();
     case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
       if (resolve)
+      {
         return getTransientRef();
+      }
       return basicGetTransientRef();
     case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
       if (resolve)
+      {
         return getTransientOtherRef();
+      }
       return basicGetTransientOtherRef();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -367,7 +383,9 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (transient: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
index 03445fa331..ca0fcde4a0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
@@ -80,8 +80,10 @@ public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_N
       if (main != oldMain)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN,
               oldMain, main));
+        }
       }
     }
     return main;
@@ -107,8 +109,10 @@ public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_N
     Bz356181_Main oldMain = main;
     main = newMain;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN, oldMain,
           main));
+    }
   }
 
   /**
@@ -123,7 +127,9 @@ public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_N
     {
     case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
       if (resolve)
+      {
         return getMain();
+      }
       return basicGetMain();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
index 58751d95cc..14380299b3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
@@ -125,7 +125,9 @@ public class Bz380987_PersonImpl extends EObjectImpl implements Bz380987_Person
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ380987_PERSON__NAME, oldName, name));
+    }
   }
 
   /**
@@ -293,7 +295,9 @@ public class Bz380987_PersonImpl extends EObjectImpl implements Bz380987_Person
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
index 7d45d6d131..aa47d7f58e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
@@ -113,7 +113,9 @@ public class Bz380987_PlaceImpl extends EObjectImpl implements Bz380987_Place
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ380987_PLACE__NAME, oldName, name));
+    }
   }
 
   /**
@@ -251,7 +253,9 @@ public class Bz380987_PlaceImpl extends EObjectImpl implements Bz380987_Place
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
index ba584a91bd..4c2168e0a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
@@ -178,8 +178,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     boolean oldStrUnsettableESet = strUnsettableESet;
     strUnsettableESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE,
           oldStrUnsettable, strUnsettable, !oldStrUnsettableESet));
+    }
   }
 
   /**
@@ -194,8 +196,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     strUnsettable = STR_UNSETTABLE_EDEFAULT;
     strUnsettableESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE,
           oldStrUnsettable, STR_UNSETTABLE_EDEFAULT, oldStrUnsettableESet));
+    }
   }
 
   /**
@@ -228,8 +232,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     String oldStrSettable = strSettable;
     strSettable = newStrSettable;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE,
           oldStrSettable, strSettable));
+    }
   }
 
   /**
@@ -252,8 +258,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     Bz387752_Enum oldEnumSettable = enumSettable;
     enumSettable = newEnumSettable == null ? ENUM_SETTABLE_EDEFAULT : newEnumSettable;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE,
           oldEnumSettable, enumSettable));
+    }
   }
 
   /**
@@ -278,8 +286,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     boolean oldEnumUnsettableESet = enumUnsettableESet;
     enumUnsettableESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE,
           oldEnumUnsettable, enumUnsettable, !oldEnumUnsettableESet));
+    }
   }
 
   /**
@@ -294,8 +304,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
     enumUnsettable = ENUM_UNSETTABLE_EDEFAULT;
     enumUnsettableESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE,
           oldEnumUnsettable, ENUM_UNSETTABLE_EDEFAULT, oldEnumUnsettableESet));
+    }
   }
 
   /**
@@ -413,23 +425,33 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (strUnsettable: ");
     if (strUnsettableESet)
+    {
       result.append(strUnsettable);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", strSettable: ");
     result.append(strSettable);
     result.append(", enumSettable: ");
     result.append(enumSettable);
     result.append(", enumUnsettable: ");
     if (enumUnsettableESet)
+    {
       result.append(enumUnsettable);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
index 35cd4b24ab..7d4d1d272d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
@@ -98,7 +98,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
   public Bz397682P getRefToP()
   {
     if (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P)
+    {
       return null;
+    }
     return (Bz397682P)eContainer();
   }
 
@@ -121,23 +123,33 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
   public void setRefToP(Bz397682P newRefToP)
   {
     if (newRefToP != eInternalContainer()
-        || (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P && newRefToP != null))
+        || eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P && newRefToP != null)
     {
       if (EcoreUtil.isAncestor(this, newRefToP))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newRefToP != null)
+      {
         msgs = ((InternalEObject)newRefToP).eInverseAdd(this, HibernateTestPackage.BZ397682_P__LIST_OF_C,
             Bz397682P.class, msgs);
+      }
       msgs = basicSetRefToP(newRefToP, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_P, newRefToP,
           newRefToP));
+    }
   }
 
   /**
@@ -154,8 +166,10 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
       if (refToC != oldRefToC)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ397682_C__REF_TO_C,
               oldRefToC, refToC));
+        }
       }
     }
     return refToC;
@@ -181,8 +195,10 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
     Bz397682C oldRefToC = refToC;
     refToC = newRefToC;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC,
-          refToC));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC, refToC));
+    }
   }
 
   /**
@@ -205,7 +221,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
     String oldDbId = dbId;
     dbId = newDbId;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__DB_ID, oldDbId, dbId));
+    }
   }
 
   /**
@@ -220,7 +238,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
     {
     case HibernateTestPackage.BZ397682_C__REF_TO_P:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetRefToP((Bz397682P)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -273,7 +293,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
       return getRefToP();
     case HibernateTestPackage.BZ397682_C__REF_TO_C:
       if (resolve)
+      {
         return getRefToC();
+      }
       return basicGetRefToC();
     case HibernateTestPackage.BZ397682_C__DB_ID:
       return getDbId();
@@ -356,7 +378,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (dbId: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
index ecfe8224d8..56b11b3b32 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
@@ -113,7 +113,9 @@ public class Bz397682PImpl extends EObjectImpl implements Bz397682P
     String oldDbId = dbId;
     dbId = newDbId;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_P__DB_ID, oldDbId, dbId));
+    }
   }
 
   /**
@@ -251,7 +253,9 @@ public class Bz397682PImpl extends EObjectImpl implements Bz397682P
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (dbId: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
index a15d4eed2a..5b066c5d06 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
@@ -128,7 +128,9 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A
     String oldDbId = dbId;
     dbId = newDbId;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_A__DB_ID, oldDbId, dbId));
+    }
   }
 
   /**
@@ -251,7 +253,9 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (dbId: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java
index 110765cb25..f545ba1b3b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java
@@ -93,8 +93,10 @@ public class Bz398057B1Impl extends Bz398057BImpl implements Bz398057B1
     String oldValueStr = valueStr;
     valueStr = newValueStr;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B1__VALUE_STR, oldValueStr,
           valueStr));
+    }
   }
 
   /**
@@ -172,7 +174,9 @@ public class Bz398057B1Impl extends Bz398057BImpl implements Bz398057B1
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (valueStr: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
index c83bbfbb29..a7f864e7e4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
@@ -108,7 +108,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
   public Bz398057A getRefToClassA()
   {
     if (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A)
+    {
       return null;
+    }
     return (Bz398057A)eContainer();
   }
 
@@ -131,23 +133,33 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
   public void setRefToClassA(Bz398057A newRefToClassA)
   {
     if (newRefToClassA != eInternalContainer()
-        || (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A && newRefToClassA != null))
+        || eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A && newRefToClassA != null)
     {
       if (EcoreUtil.isAncestor(this, newRefToClassA))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newRefToClassA != null)
+      {
         msgs = ((InternalEObject)newRefToClassA).eInverseAdd(this, HibernateTestPackage.BZ398057_A__LIST_OF_B,
             Bz398057A.class, msgs);
+      }
       msgs = basicSetRefToClassA(newRefToClassA, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A,
           newRefToClassA, newRefToClassA));
+    }
   }
 
   /**
@@ -170,7 +182,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
     double oldValue = value;
     value = newValue;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__VALUE, oldValue, value));
+    }
   }
 
   /**
@@ -193,7 +207,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
     String oldDbId = dbId;
     dbId = newDbId;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__DB_ID, oldDbId, dbId));
+    }
   }
 
   /**
@@ -208,7 +224,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
     {
     case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetRefToClassA((Bz398057A)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -342,7 +360,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (value: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
index ade8333c41..1a1a165f50 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
@@ -304,8 +304,10 @@ public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateT
   {
     Bz387752_Enum result = Bz387752_Enum.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
index 67516fac80..85a5582cff 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
@@ -169,7 +169,7 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link HibernateTestPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -182,12 +182,14 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
   public static HibernateTestPackage init()
   {
     if (isInited)
+    {
       return (HibernateTestPackage)EPackage.Registry.INSTANCE.getEPackage(HibernateTestPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     HibernateTestPackageImpl theHibernateTestPackage = (HibernateTestPackageImpl)(EPackage.Registry.INSTANCE
         .get(eNS_URI) instanceof HibernateTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-        : new HibernateTestPackageImpl());
+            : new HibernateTestPackageImpl());
 
     isInited = true;
 
@@ -632,7 +634,9 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -709,7 +713,9 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -722,23 +728,23 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    bz398057A1EClass.getESuperTypes().add(this.getBz398057A());
-    bz398057B1EClass.getESuperTypes().add(this.getBz398057B());
+    bz398057A1EClass.getESuperTypes().add(getBz398057A());
+    bz398057B1EClass.getESuperTypes().add(getBz398057B());
 
     // Initialize classes and features; add operations and parameters
     initEClass(bz356181_MainEClass, Bz356181_Main.class, "Bz356181_Main", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getBz356181_Main_Transient(), ecorePackage.getEString(), "transient", null, 0, 1,
-        Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getBz356181_Main_NonTransient(), ecorePackage.getEString(), "nonTransient", null, 0, 1,
-        Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz356181_Main_TransientRef(), this.getBz356181_Transient(), null, "transientRef", null, 0, 1,
+        Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getBz356181_Main_TransientRef(), getBz356181_Transient(), null, "transientRef", null, 0, 1,
         Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz356181_Main_TransientOtherRef(), this.getBz356181_NonTransient(), null, "transientOtherRef",
-        null, 0, 1, Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getBz356181_Main_TransientOtherRef(), getBz356181_NonTransient(), null, "transientOtherRef", null, 0,
+        1, Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(bz356181_TransientEClass, Bz356181_Transient.class, "Bz356181_Transient", !IS_ABSTRACT, !IS_INTERFACE,
@@ -746,7 +752,7 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
 
     initEClass(bz356181_NonTransientEClass, Bz356181_NonTransient.class, "Bz356181_NonTransient", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz356181_NonTransient_Main(), this.getBz356181_Main(), null, "main", null, 0, 1,
+    initEReference(getBz356181_NonTransient_Main(), getBz356181_Main(), null, "main", null, 0, 1,
         Bz356181_NonTransient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -756,44 +762,43 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
         Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
     initEAttribute(getBz387752_Main_StrSettable(), ecorePackage.getEString(), "strSettable", "value", 0, 1,
-        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBz387752_Main_EnumSettable(), this.getBz387752_Enum(), "enumSettable", null, 0, 1,
-        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBz387752_Main_EnumUnsettable(), this.getBz387752_Enum(), "enumUnsettable", "VAL1", 0, 1,
+        Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getBz387752_Main_EnumSettable(), getBz387752_Enum(), "enumSettable", null, 0, 1, Bz387752_Main.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz387752_Main_EnumUnsettable(), getBz387752_Enum(), "enumUnsettable", "VAL1", 0, 1,
         Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(bz380987_GroupEClass, Bz380987_Group.class, "Bz380987_Group", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz380987_Group_People(), this.getBz380987_Person(), this.getBz380987_Person_Group(), "people",
-        null, 0, -1, Bz380987_Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Group_People(), getBz380987_Person(), getBz380987_Person_Group(), "people", null, 0, -1,
+        Bz380987_Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(bz380987_PlaceEClass, Bz380987_Place.class, "Bz380987_Place", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getBz380987_Place_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Place.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz380987_Place_People(), this.getBz380987_Person(), this.getBz380987_Person_Places(), "people",
-        null, 0, -1, Bz380987_Place.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Place_People(), getBz380987_Person(), getBz380987_Person_Places(), "people", null, 0, -1,
+        Bz380987_Place.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(bz380987_PersonEClass, Bz380987_Person.class, "Bz380987_Person", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getBz380987_Person_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Person.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz380987_Person_Group(), this.getBz380987_Group(), this.getBz380987_Group_People(), "group",
-        null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz380987_Person_Places(), this.getBz380987_Place(), this.getBz380987_Place_People(), "places",
-        null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Person_Group(), getBz380987_Group(), getBz380987_Group_People(), "group", null, 0, -1,
+        Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz380987_Person_Places(), getBz380987_Place(), getBz380987_Place_People(), "places", null, 0, -1,
+        Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(bz398057AEClass, Bz398057A.class, "Bz398057A", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz398057A_ListOfB(), this.getBz398057B(), this.getBz398057B_RefToClassA(), "listOfB", null, 0,
-        -1, Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz398057A_ListOfB(), getBz398057B(), getBz398057B_RefToClassA(), "listOfB", null, 0, -1,
+        Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getBz398057A_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057A.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -801,11 +806,11 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
         IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(bz398057BEClass, Bz398057B.class, "Bz398057B", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz398057B_RefToClassA(), this.getBz398057A(), this.getBz398057A_ListOfB(), "refToClassA", null,
-        0, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getBz398057B_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, Bz398057B.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz398057B_RefToClassA(), getBz398057A(), getBz398057A_ListOfB(), "refToClassA", null, 0, 1,
+        Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBz398057B_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, Bz398057B.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getBz398057B_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057B.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -817,17 +822,17 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
     initEClass(bz397682PEClass, Bz397682P.class, "Bz397682P", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getBz397682P_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682P.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz397682P_ListOfC(), this.getBz397682C(), this.getBz397682C_RefToP(), "listOfC", null, 0, -1,
+    initEReference(getBz397682P_ListOfC(), getBz397682C(), getBz397682C_RefToP(), "listOfC", null, 0, -1,
         Bz397682P.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(bz397682CEClass, Bz397682C.class, "Bz397682C", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBz397682C_RefToP(), this.getBz397682P(), this.getBz397682P_ListOfC(), "refToP", null, 0, 1,
-        Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBz397682C_RefToC(), this.getBz397682C(), null, "refToC", null, 0, 1, Bz397682C.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+    initEReference(getBz397682C_RefToP(), getBz397682P(), getBz397682P_ListOfC(), "refToP", null, 0, 1, Bz397682C.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
+    initEReference(getBz397682C_RefToC(), getBz397682C(), null, "refToC", null, 0, 1, Bz397682C.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getBz397682C_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682C.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -855,14 +860,14 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
     String source = "teneo.jpa";
     addAnnotation(getBz356181_Main_Transient(), source, new String[] { "value", "@Transient" });
     addAnnotation(bz356181_TransientEClass, source, new String[] { "value", "@Transient" });
-    addAnnotation(bz398057AEClass, source, new String[] { "value",
-        "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+    addAnnotation(bz398057AEClass, source,
+        new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
     addAnnotation(getBz398057A_DbId(), source, new String[] { "value", "@Id" });
-    addAnnotation(bz398057BEClass, source, new String[] { "value",
-        "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+    addAnnotation(bz398057BEClass, source,
+        new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
     addAnnotation(getBz398057B_DbId(), source, new String[] { "value", "@Id" });
-    addAnnotation(bz397682PEClass, source, new String[] { "value",
-        "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+    addAnnotation(bz397682PEClass, source,
+        new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
     addAnnotation(getBz397682P_DbId(), source, new String[] { "value", "@Id" });
     addAnnotation(getBz397682C_DbId(), source, new String[] { "value", "@Id" });
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
index c511c6033c..548cbae1d9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
@@ -97,7 +97,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz356181_Main bz356181_Main = (Bz356181_Main)theEObject;
       T result = caseBz356181_Main(bz356181_Main);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ356181_TRANSIENT:
@@ -105,7 +107,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz356181_Transient bz356181_Transient = (Bz356181_Transient)theEObject;
       T result = caseBz356181_Transient(bz356181_Transient);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ356181_NON_TRANSIENT:
@@ -113,7 +117,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz356181_NonTransient bz356181_NonTransient = (Bz356181_NonTransient)theEObject;
       T result = caseBz356181_NonTransient(bz356181_NonTransient);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ387752_MAIN:
@@ -121,7 +127,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz387752_Main bz387752_Main = (Bz387752_Main)theEObject;
       T result = caseBz387752_Main(bz387752_Main);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ380987_GROUP:
@@ -129,7 +137,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz380987_Group bz380987_Group = (Bz380987_Group)theEObject;
       T result = caseBz380987_Group(bz380987_Group);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ380987_PLACE:
@@ -137,7 +147,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz380987_Place bz380987_Place = (Bz380987_Place)theEObject;
       T result = caseBz380987_Place(bz380987_Place);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ380987_PERSON:
@@ -145,7 +157,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz380987_Person bz380987_Person = (Bz380987_Person)theEObject;
       T result = caseBz380987_Person(bz380987_Person);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ398057_A:
@@ -153,7 +167,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz398057A bz398057A = (Bz398057A)theEObject;
       T result = caseBz398057A(bz398057A);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ398057_A1:
@@ -161,9 +177,13 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz398057A1 bz398057A1 = (Bz398057A1)theEObject;
       T result = caseBz398057A1(bz398057A1);
       if (result == null)
+      {
         result = caseBz398057A(bz398057A1);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ398057_B:
@@ -171,7 +191,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz398057B bz398057B = (Bz398057B)theEObject;
       T result = caseBz398057B(bz398057B);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ398057_B1:
@@ -179,9 +201,13 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz398057B1 bz398057B1 = (Bz398057B1)theEObject;
       T result = caseBz398057B1(bz398057B1);
       if (result == null)
+      {
         result = caseBz398057B(bz398057B1);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ397682_P:
@@ -189,7 +215,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz397682P bz397682P = (Bz397682P)theEObject;
       T result = caseBz397682P(bz397682P);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case HibernateTestPackage.BZ397682_C:
@@ -197,7 +225,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
       Bz397682C bz397682C = (Bz397682C)theEObject;
       T result = caseBz397682C(bz397682C);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
index 8e47564a4e..39fae7241e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mango; singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,10 +10,10 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.mango;version="3.0.400",
- org.eclipse.emf.cdo.tests.mango.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.mango.legacy;version="3.0.400",
- org.eclipse.emf.cdo.tests.mango.legacy.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.mango.legacy.util;version="3.0.400",
- org.eclipse.emf.cdo.tests.mango.util;version="3.0.400"
+Export-Package: org.eclipse.emf.cdo.tests.mango;version="3.0.500",
+ org.eclipse.emf.cdo.tests.mango.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.mango.legacy;version="3.0.500",
+ org.eclipse.emf.cdo.tests.mango.legacy.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.mango.legacy.util;version="3.0.500",
+ org.eclipse.emf.cdo.tests.mango.util;version="3.0.500"
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java
index f04656a683..1f705f01ab 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
index 7500bd49f1..d2f4a01911 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -95,7 +95,7 @@ public interface MangoPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl <em>Value</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl
    * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoValue()
    * @generated
@@ -192,7 +192,7 @@ public interface MangoPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.MangoValue <em>Value</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Value</em>'.
    * @see org.eclipse.emf.cdo.tests.mango.MangoValue
    * @generated
@@ -212,7 +212,7 @@ public interface MangoPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter <em>Parameter</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Parameter</em>'.
    * @see org.eclipse.emf.cdo.tests.mango.MangoParameter
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
index 55711745cc..c23ffdaaed 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
index c0a202db1a..0f523880c1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -46,7 +46,7 @@ public interface MangoValue extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.MangoValue#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
index 5174cdf4d6..bae623445b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
index d122b639df..5916f388e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
index 3360e0d45f..0c530d40a7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
@@ -154,8 +154,10 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
   {
     ParameterPassing result = ParameterPassing.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
index 3260c52f3e..57a889a663 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -61,7 +61,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#eNS_URI
    * @see #init()
@@ -80,7 +80,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link MangoPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -93,11 +93,13 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   public static MangoPackage init()
   {
     if (isInited)
+    {
       return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new MangoPackageImpl());
+    MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MangoPackageImpl());
 
     isInited = true;
 
@@ -220,7 +222,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -254,7 +258,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -273,22 +279,21 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMangoValueList_Values(), this.getMangoValue(), null, "values", null, 0, -1, MangoValueList.class,
+    initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(mangoValueEClass, MangoValue.class, "MangoValue", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(mangoParameterEClass, MangoParameter.class, "MangoParameter", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getMangoParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1,
-        MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing");
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java
index 66f0619f9f..67ac4fd7b7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java
index 439bf4db87..6730806f7f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java
index 3a85769878..988aaccd45 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
index 78a98eb3ad..cb88d93eed 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
@@ -163,8 +163,10 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
   {
     ParameterPassing result = ParameterPassing.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java
index 9e3dd3d3e6..7513f623c2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java
@@ -66,7 +66,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage#eNS_URI
    * @see #init()
@@ -85,7 +85,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link MangoPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -98,11 +98,13 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   public static MangoPackage init()
   {
     if (isInited)
+    {
       return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new MangoPackageImpl());
+    MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MangoPackageImpl());
 
     isInited = true;
 
@@ -225,7 +227,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -259,7 +263,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -278,22 +284,21 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMangoValueList_Values(), this.getMangoValue(), null, "values", null, 0, -1, MangoValueList.class,
+    initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(mangoValueEClass, MangoValue.class, "MangoValue", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMangoValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValue.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(mangoParameterEClass, MangoParameter.class, "MangoParameter", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getMangoParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1,
-        MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing");
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java
index 2ce6e37023..2fa5f828c7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java
@@ -36,7 +36,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -109,7 +109,9 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__NAME, oldName, name));
+    }
   }
 
   /**
@@ -130,7 +132,10 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
     ParameterPassing oldPassing = passing;
     passing = newPassing == null ? PASSING_EDEFAULT : newPassing;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__PASSING, oldPassing, passing));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__PASSING, oldPassing, passing));
+    }
   }
 
   /**
@@ -213,7 +218,9 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueImpl.java
index db011d440a..5b313aea60 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueImpl.java
@@ -34,7 +34,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -87,7 +87,9 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_VALUE__NAME, oldName, name));
+    }
   }
 
   /**
@@ -160,7 +162,9 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueListImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueListImpl.java
index c11f8e65af..4f768ae9e7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueListImpl.java
@@ -103,7 +103,9 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_VALUE_LIST__NAME, oldName, name));
+    }
   }
 
   /**
@@ -201,7 +203,9 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java
index 1096a42d23..92bd6346ce 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java
@@ -107,7 +107,9 @@ public class MangoSwitch<T>
       MangoValueList mangoValueList = (MangoValueList)theEObject;
       T result = caseMangoValueList(mangoValueList);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case MangoPackage.MANGO_VALUE:
@@ -115,7 +117,9 @@ public class MangoSwitch<T>
       MangoValue mangoValue = (MangoValue)theEObject;
       T result = caseMangoValue(mangoValue);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case MangoPackage.MANGO_PARAMETER:
@@ -123,7 +127,9 @@ public class MangoSwitch<T>
       MangoParameter mangoParameter = (MangoParameter)theEObject;
       T result = caseMangoParameter(mangoParameter);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
index 41865ea2fb..0d19f590d9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
@@ -97,7 +97,9 @@ public class MangoSwitch<T>
       MangoValueList mangoValueList = (MangoValueList)theEObject;
       T result = caseMangoValueList(mangoValueList);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case MangoPackage.MANGO_VALUE:
@@ -105,7 +107,9 @@ public class MangoSwitch<T>
       MangoValue mangoValue = (MangoValue)theEObject;
       T result = caseMangoValue(mangoValue);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case MangoPackage.MANGO_PARAMETER:
@@ -113,7 +117,9 @@ public class MangoSwitch<T>
       MangoParameter mangoParameter = (MangoParameter)theEObject;
       T result = caseMangoParameter(mangoParameter);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
index 107aa9a25a..3e3694499b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model1; singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -9,9 +9,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.model1;version="3.0.400",
- org.eclipse.emf.cdo.tests.model1.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model1.legacy;version="3.0.400",
- org.eclipse.emf.cdo.tests.model1.legacy.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model1.legacy.util;version="3.0.400",
- org.eclipse.emf.cdo.tests.model1.util;version="3.0.400"
+Export-Package: org.eclipse.emf.cdo.tests.model1;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model1.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model1.legacy;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model1.legacy.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model1.legacy.util;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model1.util;version="3.0.500"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
index 08c3a110b3..9d2a59e0d4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -48,7 +48,7 @@ public interface Address extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -74,7 +74,7 @@ public interface Address extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Street</em>' attribute.
    * @see #getStreet()
@@ -100,7 +100,7 @@ public interface Address extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>City</em>' attribute.
    * @see #getCity()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
index 108d86ccb6..a4d123c7e0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -49,7 +49,7 @@ public interface Category extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
index 7ea6b9fbc3..b41f6089f3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
index 4d012dcd38..8cd768b475 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java
index 3e20b4b6a9..cdcdd6d649 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
index 7e6d10ef6f..13c30cd060 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -63,7 +63,7 @@ public interface Model1Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model1.impl.AddressImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getAddress()
    * @generated
@@ -132,7 +132,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Address <em>Address</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Address</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Address
    * @generated
@@ -181,7 +181,7 @@ public interface Model1Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCompany()
    * @generated
@@ -292,7 +292,7 @@ public interface Model1Package extends EPackage
   /**
    * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -374,7 +374,7 @@ public interface Model1Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model1.impl.OrderImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrder()
    * @generated
@@ -425,7 +425,7 @@ public interface Model1Package extends EPackage
   /**
    * The number of structural features of the '<em>Order Detail</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -459,7 +459,7 @@ public interface Model1Package extends EPackage
   /**
    * The number of structural features of the '<em>Purchase Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -502,7 +502,7 @@ public interface Model1Package extends EPackage
   /**
    * The number of structural features of the '<em>Sales Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -562,7 +562,7 @@ public interface Model1Package extends EPackage
   /**
    * The feature id for the '<em><b>Order Details</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -678,7 +678,7 @@ public interface Model1Package extends EPackage
   /**
    * The number of structural features of the '<em>Order Address</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -731,7 +731,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Supplier</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Supplier
    * @generated
@@ -892,7 +892,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Category</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Category
    * @generated
@@ -934,7 +934,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Product1 <em>Product1</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Product1</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Product1
    * @generated
@@ -995,7 +995,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Company</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Company
    * @generated
@@ -1060,7 +1060,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Customer</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Customer
    * @generated
@@ -1090,7 +1090,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Order</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Order
    * @generated
@@ -1111,7 +1111,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder <em>Sales Order</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Sales Order</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.SalesOrder
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
index 06deeca6ac..74d3826755 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
index 2dabb7221a..ce20065201 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
index 5933c472b4..72d0513f6d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java
index d99e6c99f2..221240da3b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -51,7 +51,7 @@ public interface Product1 extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product1#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -98,7 +98,7 @@ public interface Product1 extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product1#getVat <em>Vat</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Vat</em>' attribute.
    * @see org.eclipse.emf.cdo.tests.model1.VAT
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
index 433748a4a0..a15a7293e7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
index fa58a3785c..55fa22979b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -45,7 +45,7 @@ public interface SalesOrder extends Order
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Id</em>' attribute.
    * @see #getId()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
index 4b1fe08d06..eab6a6ce50 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -55,7 +55,7 @@ public interface Supplier extends Address
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Preferred</em>' attribute.
    * @see #setPreferred(boolean)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier_Preferred()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
index 624633bacb..217fe8a5ca 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
index ddcd7049bb..c94b4877d1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
index 52a98f08aa..bf9a388f9a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
index f9084470cb..bc54d057a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
index a94ffd930e..5ac4b40e38 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
index bef252eaf5..47afb751e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
@@ -212,8 +212,10 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
   {
     VAT result = VAT.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
index 7ffc52ad47..c2f01495c6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -124,7 +124,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#eNS_URI
    * @see #init()
@@ -143,7 +143,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Model1Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -156,11 +156,13 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
   public static Model1Package init()
   {
     if (isInited)
+    {
       return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model1PackageImpl());
+    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model1PackageImpl());
 
     isInited = true;
 
@@ -599,7 +601,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -677,7 +681,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -690,14 +696,14 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    companyEClass.getESuperTypes().add(this.getAddress());
-    supplierEClass.getESuperTypes().add(this.getAddress());
-    customerEClass.getESuperTypes().add(this.getAddress());
-    purchaseOrderEClass.getESuperTypes().add(this.getOrder());
-    salesOrderEClass.getESuperTypes().add(this.getOrder());
-    orderAddressEClass.getESuperTypes().add(this.getAddress());
-    orderAddressEClass.getESuperTypes().add(this.getOrder());
-    orderAddressEClass.getESuperTypes().add(this.getOrderDetail());
+    companyEClass.getESuperTypes().add(getAddress());
+    supplierEClass.getESuperTypes().add(getAddress());
+    customerEClass.getESuperTypes().add(getAddress());
+    purchaseOrderEClass.getESuperTypes().add(getOrder());
+    salesOrderEClass.getESuperTypes().add(getOrder());
+    orderAddressEClass.getESuperTypes().add(getAddress());
+    orderAddressEClass.getESuperTypes().add(getOrder());
+    orderAddressEClass.getESuperTypes().add(getOrderDetail());
 
     // Initialize classes and features; add operations and parameters
     initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -709,50 +715,50 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class,
+    initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class,
+    initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1,
-        Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
+    initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(),
-        "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders",
+        null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null,
-        0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCustomer_OrderByProduct(), this.getProductToOrder(), null, "orderByProduct", null, 0, -1,
+    initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1,
+        Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_OrderByProduct(), getProductToOrder(), null, "orderByProduct", null, 0, -1,
         Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null,
-        0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1,
+        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1,
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Product(), getProduct1(), getProduct1_OrderDetails(), "product", null, 0, 1,
         OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrderDetail_Product(), this.getProduct1(), this.getProduct1_OrderDetails(), "product", null, 0,
-        1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -760,37 +766,37 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier",
-        null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1,
+        PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1,
-        1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1,
+        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getCategory_Products(), this.getProduct1(), null, "products", null, 0, -1, Category.class,
+    initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Products(), getProduct1(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(product1EClass, Product1.class, "Product1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getProduct1_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product1.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getProduct1_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails",
-        null, 0, -1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE,
+    initEReference(getProduct1_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1,
+        Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProduct1_Vat(), getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProduct1_OtherVATs(), this.getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT,
+    initEAttribute(getProduct1_OtherVATs(), getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getProduct1_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product1.class,
         IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -803,10 +809,10 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
     initEClass(productToOrderEClass, Map.Entry.class, "ProductToOrder", !IS_ABSTRACT, !IS_INTERFACE,
         !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getProductToOrder_Key(), this.getProduct1(), null, "key", null, 0, 1, Map.Entry.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getProductToOrder_Value(), this.getSalesOrder(), null, "value", null, 0, 1, Map.Entry.class,
+    initEReference(getProductToOrder_Key(), getProduct1(), null, "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getProductToOrder_Value(), getSalesOrder(), null, "value", null, 0, 1, Map.Entry.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
@@ -832,16 +838,12 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
   protected void createTeneoAnnotations()
   {
     String source = "teneo.jpa";
-    addAnnotation(
-        this,
-        source,
-        new String[] {
-            "value",
-            "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})" });
+    addAnnotation(this, source, new String[] { "value",
+        "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})" });
     addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" });
     addAnnotation(getProduct1_Name(), source, new String[] { "value", "@Id" });
     addAnnotation(orderAddressEClass, source, new String[] { "value",
-        "@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))" });
+    "@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))" });
   }
 
 } // Model1PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java
index 762fb3dc2b..6874ac9f7f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
index ac1ee75420..5bd327cfad 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java
index 47ad8b7104..600c2f5b5e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java
index 58b7b08dab..57553918df 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java
index da5d688812..5db00897d0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry<Product1, SalesOrder>
@@ -116,7 +116,7 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
index 19bfcf9d1b..06f8c97898 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
index ed20d8ef47..03b6837cf1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
index 541f35ac7e..152fb9a31a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CategoryImpl.java
index dd09eb1ceb..ba99b112a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/CategoryImpl.java
@@ -144,7 +144,8 @@ public class CategoryImpl extends EObjectImpl implements Category
   {
     if (products == null)
     {
-      products = new EObjectContainmentEList.Resolving<Product1>(Product1.class, this, Model1Package.CATEGORY__PRODUCTS);
+      products = new EObjectContainmentEList.Resolving<Product1>(Product1.class, this,
+          Model1Package.CATEGORY__PRODUCTS);
     }
     return products;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
index 1bbfd2d1b7..9f849317b6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1FactoryImpl.java
@@ -261,8 +261,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
     VAT result = VAT.get(initialValue);
     if (result == null)
     {
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
     }
     return result;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
index f47537b207..9300fa5d5d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java
@@ -163,8 +163,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
     }
 
     // Obtain or create and register package
-    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.get(Model1Package.eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model1PackageImpl());
+    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE
+        .get(Model1Package.eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new Model1PackageImpl());
 
     isInited = true;
 
@@ -777,8 +778,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
     initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1,
-        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT,
@@ -840,16 +841,12 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
   protected void createTeneoAnnotations()
   {
     String source = "teneo.jpa";
-    addAnnotation(
-        this,
-        source,
-        new String[] {
-            "value",
-            "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})" });
+    addAnnotation(this, source, new String[] { "value",
+        "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})" });
     addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" });
     addAnnotation(getProduct1_Name(), source, new String[] { "value", "@Id" });
     addAnnotation(orderAddressEClass, source, new String[] { "value",
-        "@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))" });
+    "@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))" });
   }
 
 } // Model1PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderAddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderAddressImpl.java
index c3249130e8..a6a13b0582 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderAddressImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderAddressImpl.java
@@ -181,8 +181,8 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
    */
   public void setOrder(Order newOrder)
   {
-    if (newOrder != eInternalContainer() || eContainerFeatureID() != Model1Package.ORDER_ADDRESS__ORDER
-        && newOrder != null)
+    if (newOrder != eInternalContainer()
+        || eContainerFeatureID() != Model1Package.ORDER_ADDRESS__ORDER && newOrder != null)
     {
       if (EcoreUtil.isAncestor(this, newOrder))
       {
@@ -291,8 +291,8 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRODUCT, newProduct,
-          newProduct));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRODUCT, newProduct, newProduct));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java
index 92f6f08174..4da69b933f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/OrderDetailImpl.java
@@ -130,8 +130,8 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
    */
   public void setOrder(Order newOrder)
   {
-    if (newOrder != eInternalContainer() || eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER
-        && newOrder != null)
+    if (newOrder != eInternalContainer()
+        || eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER && newOrder != null)
     {
       if (EcoreUtil.isAncestor(this, newOrder))
       {
@@ -240,7 +240,8 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, newProduct, newProduct));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, newProduct, newProduct));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java
index f138b897ad..20e05651d4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java
@@ -112,8 +112,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
       {
         if (eNotificationRequired())
         {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PURCHASE_ORDER__SUPPLIER,
-              oldSupplier, supplier));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PURCHASE_ORDER__SUPPLIER, oldSupplier,
+              supplier));
         }
       }
     }
@@ -164,13 +164,13 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
       NotificationChain msgs = null;
       if (supplier != null)
       {
-        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS,
-            Supplier.class, msgs);
+        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class,
+            msgs);
       }
       if (newSupplier != null)
       {
-        msgs = ((InternalEObject)newSupplier).eInverseAdd(this, Model1Package.SUPPLIER__PURCHASE_ORDERS,
-            Supplier.class, msgs);
+        msgs = ((InternalEObject)newSupplier).eInverseAdd(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class,
+            msgs);
       }
       msgs = basicSetSupplier(newSupplier, msgs);
       if (msgs != null)
@@ -197,8 +197,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
     case Model1Package.PURCHASE_ORDER__SUPPLIER:
       if (supplier != null)
       {
-        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS,
-            Supplier.class, msgs);
+        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class,
+            msgs);
       }
       return basicSetSupplier((Supplier)otherEnd, msgs);
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java
index 70b9595aec..a477233531 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java
@@ -186,8 +186,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__CUSTOMER, newCustomer,
-          newCustomer));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__CUSTOMER, newCustomer, newCustomer));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SupplierImpl.java
index bfd3777cfb..b03d53815f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SupplierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SupplierImpl.java
@@ -121,7 +121,8 @@ public class SupplierImpl extends AddressImpl implements Supplier
     preferred = newPreferred;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SUPPLIER__PREFERRED, oldPreferred, preferred));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model1Package.SUPPLIER__PREFERRED, oldPreferred, preferred));
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
index 7726ea505b..2fccfaf388 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
@@ -91,7 +91,9 @@ public class Model1Switch<T> extends Switch<T>
       Address address = (Address)theEObject;
       T result = caseAddress(address);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.COMPANY:
@@ -99,9 +101,13 @@ public class Model1Switch<T> extends Switch<T>
       Company company = (Company)theEObject;
       T result = caseCompany(company);
       if (result == null)
+      {
         result = caseAddress(company);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.SUPPLIER:
@@ -109,9 +115,13 @@ public class Model1Switch<T> extends Switch<T>
       Supplier supplier = (Supplier)theEObject;
       T result = caseSupplier(supplier);
       if (result == null)
+      {
         result = caseAddress(supplier);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.CUSTOMER:
@@ -119,9 +129,13 @@ public class Model1Switch<T> extends Switch<T>
       Customer customer = (Customer)theEObject;
       T result = caseCustomer(customer);
       if (result == null)
+      {
         result = caseAddress(customer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.ORDER:
@@ -129,7 +143,9 @@ public class Model1Switch<T> extends Switch<T>
       Order order = (Order)theEObject;
       T result = caseOrder(order);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.ORDER_DETAIL:
@@ -137,7 +153,9 @@ public class Model1Switch<T> extends Switch<T>
       OrderDetail orderDetail = (OrderDetail)theEObject;
       T result = caseOrderDetail(orderDetail);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.PURCHASE_ORDER:
@@ -145,9 +163,13 @@ public class Model1Switch<T> extends Switch<T>
       PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject;
       T result = casePurchaseOrder(purchaseOrder);
       if (result == null)
+      {
         result = caseOrder(purchaseOrder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.SALES_ORDER:
@@ -155,9 +177,13 @@ public class Model1Switch<T> extends Switch<T>
       SalesOrder salesOrder = (SalesOrder)theEObject;
       T result = caseSalesOrder(salesOrder);
       if (result == null)
+      {
         result = caseOrder(salesOrder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.CATEGORY:
@@ -165,7 +191,9 @@ public class Model1Switch<T> extends Switch<T>
       Category category = (Category)theEObject;
       T result = caseCategory(category);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.PRODUCT1:
@@ -173,7 +201,9 @@ public class Model1Switch<T> extends Switch<T>
       Product1 product1 = (Product1)theEObject;
       T result = caseProduct1(product1);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.ORDER_ADDRESS:
@@ -181,13 +211,21 @@ public class Model1Switch<T> extends Switch<T>
       OrderAddress orderAddress = (OrderAddress)theEObject;
       T result = caseOrderAddress(orderAddress);
       if (result == null)
+      {
         result = caseAddress(orderAddress);
+      }
       if (result == null)
+      {
         result = caseOrder(orderAddress);
+      }
       if (result == null)
+      {
         result = caseOrderDetail(orderAddress);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model1Package.PRODUCT_TO_ORDER:
@@ -196,7 +234,9 @@ public class Model1Switch<T> extends Switch<T>
       Map.Entry<Product1, SalesOrder> productToOrder = (Map.Entry<Product1, SalesOrder>)theEObject;
       T result = caseProductToOrder(productToOrder);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
index 6e4ec95b12..71849d1b7a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model2; singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,9 +11,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.tests.model1;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.model2;version="3.0.400",
- org.eclipse.emf.cdo.tests.model2.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model2.legacy;version="3.0.400",
- org.eclipse.emf.cdo.tests.model2.legacy.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model2.legacy.util;version="3.0.400",
- org.eclipse.emf.cdo.tests.model2.util;version="3.0.400"
+Export-Package: org.eclipse.emf.cdo.tests.model2;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model2.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model2.legacy;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model2.legacy.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model2.legacy.util;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model2.util;version="3.0.500"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java
index e1951dbf29..e22918f8ac 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model2.EnumListHolder#getEnumList <em>Enum List</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getEnumListHolder()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java
index 8c6730ae0f..cb084e1062 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -102,7 +102,7 @@ public interface MapHolder extends EObject
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>String To Address Containment Map</em>' map.
    * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToAddressContainmentMap()
    * @model mapType=
@@ -120,7 +120,7 @@ public interface MapHolder extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>String To Address Reference Map</em>' map.
    * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToAddressReferenceMap()
    * @model mapType=
@@ -138,7 +138,7 @@ public interface MapHolder extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>EObject To EObject Map</em>' map.
    * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectMap()
    * @model mapType=
@@ -156,7 +156,7 @@ public interface MapHolder extends EObject
    * of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>EObject To EObject Key Contained Map</em>' map.
    * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectKeyContainedMap()
    * @model mapType=
@@ -174,7 +174,7 @@ public interface MapHolder extends EObject
    * of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>EObject To EObject Both Contained Map</em>' map.
    * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectBothContainedMap()
    * @model mapType=
@@ -192,7 +192,7 @@ public interface MapHolder extends EObject
    * more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>EObject To EObject Value Contained Map</em>' map.
    * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectValueContainedMap()
    * @model mapType=
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java
index c01df2e814..722647bf4c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java
index 4596d1b58c..f232e28b22 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -141,7 +141,7 @@ public interface Model2Package extends EPackage
   /**
    * The number of structural features of the '<em>Task Container</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -150,7 +150,7 @@ public interface Model2Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.TaskImpl <em>Task</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model2.impl.TaskImpl
    * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getTask()
    * @generated
@@ -202,7 +202,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Unsettable Boolean</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -291,7 +291,7 @@ public interface Model2Package extends EPackage
   /**
    * The number of structural features of the '<em>Unsettable1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -309,7 +309,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Unsettable Boolean</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -510,7 +510,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Byte</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -519,7 +519,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -528,7 +528,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -537,7 +537,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Double</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -546,7 +546,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Float</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -555,7 +555,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Int</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -564,7 +564,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Long</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -573,7 +573,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Short</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -582,7 +582,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable String</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -591,7 +591,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable VAT</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -600,7 +600,7 @@ public interface Model2Package extends EPackage
   /**
    * The number of structural features of the '<em>Not Unsettable</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -627,7 +627,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Byte</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -636,7 +636,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -645,7 +645,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -654,7 +654,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Double</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -663,7 +663,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Float</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -672,7 +672,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Int</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -681,7 +681,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Long</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -690,7 +690,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable Short</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -699,7 +699,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable String</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -708,7 +708,7 @@ public interface Model2Package extends EPackage
   /**
    * The feature id for the '<em><b>Not Unsettable VAT</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1083,7 +1083,7 @@ public interface Model2Package extends EPackage
   /**
    * The number of structural features of the '<em>EObject To EObject Both Contained Map</em>' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1117,7 +1117,7 @@ public interface Model2Package extends EPackage
   /**
    * The number of structural features of the '<em>EObject To EObject Value Contained Map</em>' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -1162,7 +1162,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getDiscountCode <em>Discount Code</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Discount Code</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getDiscountCode()
    * @see #getSpecialPurchaseOrder()
@@ -1174,7 +1174,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the containment reference '
    * {@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getShippingAddress <em>Shipping Address</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference '<em>Shipping Address</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getShippingAddress()
    * @see #getSpecialPurchaseOrder()
@@ -1205,7 +1205,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model2.Task <em>Task</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Task</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Task
    * @generated
@@ -1245,7 +1245,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model2.Unsettable1 <em>Unsettable1</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Unsettable1</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Unsettable1
    * @generated
@@ -1385,7 +1385,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableByte <em>Unsettable Byte</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Unsettable Byte</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableByte()
    * @see #getUnsettable2WithDefault()
@@ -1397,7 +1397,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableChar <em>Unsettable Char</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Unsettable Char</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableChar()
    * @see #getUnsettable2WithDefault()
@@ -1409,7 +1409,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableDate <em>Unsettable Date</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Unsettable Date</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableDate()
    * @see #getUnsettable2WithDefault()
@@ -1431,7 +1431,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableFloat <em>Unsettable Float</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Unsettable Float</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableFloat()
    * @see #getUnsettable2WithDefault()
@@ -1443,7 +1443,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableInt <em>Unsettable Int</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Unsettable Int</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableInt()
    * @see #getUnsettable2WithDefault()
@@ -1455,7 +1455,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableLong <em>Unsettable Long</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Unsettable Long</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableLong()
    * @see #getUnsettable2WithDefault()
@@ -1467,7 +1467,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableShort <em>Unsettable Short</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Unsettable Short</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableShort()
    * @see #getUnsettable2WithDefault()
@@ -1489,7 +1489,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableVAT <em>Unsettable VAT</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Unsettable VAT</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableVAT()
    * @see #getUnsettable2WithDefault()
@@ -1510,7 +1510,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.PersistentContainment#getAttrBefore <em>Attr Before</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Attr Before</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.PersistentContainment#getAttrBefore()
    * @see #getPersistentContainment()
@@ -1533,7 +1533,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.PersistentContainment#getAttrAfter <em>Attr After</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Attr After</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.PersistentContainment#getAttrAfter()
    * @see #getPersistentContainment()
@@ -1554,7 +1554,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.TransientContainer#getAttrBefore <em>Attr Before</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Attr Before</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.TransientContainer#getAttrBefore()
    * @see #getTransientContainer()
@@ -1606,7 +1606,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableByte <em>Not Unsettable Byte</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable Byte</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableByte()
    * @see #getNotUnsettable()
@@ -1618,7 +1618,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableChar <em>Not Unsettable Char</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable Char</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableChar()
    * @see #getNotUnsettable()
@@ -1630,7 +1630,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableDate <em>Not Unsettable Date</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable Date</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableDate()
    * @see #getNotUnsettable()
@@ -1642,7 +1642,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableDouble <em>Not Unsettable Double</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable Double</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableDouble()
    * @see #getNotUnsettable()
@@ -1654,7 +1654,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableFloat <em>Not Unsettable Float</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable Float</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableFloat()
    * @see #getNotUnsettable()
@@ -1666,7 +1666,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableInt <em>Not Unsettable Int</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable Int</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableInt()
    * @see #getNotUnsettable()
@@ -1678,7 +1678,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableLong <em>Not Unsettable Long</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable Long</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableLong()
    * @see #getNotUnsettable()
@@ -1690,7 +1690,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableShort <em>Not Unsettable Short</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable Short</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableShort()
    * @see #getNotUnsettable()
@@ -1702,7 +1702,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableString <em>Not Unsettable String</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable String</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableString()
    * @see #getNotUnsettable()
@@ -1714,7 +1714,7 @@ public interface Model2Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableVAT <em>Not Unsettable VAT</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Not Unsettable VAT</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableVAT()
    * @see #getNotUnsettable()
@@ -1844,7 +1844,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model2.MapHolder <em>Map Holder</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Map Holder</em>'.
    * @see org.eclipse.emf.cdo.tests.model2.MapHolder
    * @generated
@@ -2046,7 +2046,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Address Containment Map</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>String To Address Containment Map</em>'.
    * @see java.util.Map.Entry
    * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.cdo.tests.model1.Address"
@@ -2069,7 +2069,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference '<em>Value</em>'.
    * @see java.util.Map.Entry
    * @see #getStringToAddressContainmentMap()
@@ -2080,7 +2080,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Address Reference Map</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>String To Address Reference Map</em>'.
    * @see java.util.Map.Entry
    * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.cdo.tests.model1.Address"
@@ -2113,7 +2113,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Map</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>EObject To EObject Map</em>'.
    * @see java.util.Map.Entry
    * @model keyType="org.eclipse.emf.ecore.EObject" valueType="org.eclipse.emf.ecore.EObject"
@@ -2146,7 +2146,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Key Contained Map</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>EObject To EObject Key Contained Map</em>'.
    * @see java.util.Map.Entry
    * @model keyType="org.eclipse.emf.ecore.EObject" keyContainment="true" valueType="org.eclipse.emf.ecore.EObject"
@@ -2157,7 +2157,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Key</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference '<em>Key</em>'.
    * @see java.util.Map.Entry
    * @see #getEObjectToEObjectKeyContainedMap()
@@ -2190,7 +2190,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Key</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference '<em>Key</em>'.
    * @see java.util.Map.Entry
    * @see #getEObjectToEObjectBothContainedMap()
@@ -2201,7 +2201,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference '<em>Value</em>'.
    * @see java.util.Map.Entry
    * @see #getEObjectToEObjectBothContainedMap()
@@ -2234,7 +2234,7 @@ public interface Model2Package extends EPackage
   /**
    * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference '<em>Value</em>'.
    * @see java.util.Map.Entry
    * @see #getEObjectToEObjectValueContainedMap()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java
index 22d9439817..3f270a532f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java
@@ -4,7 +4,7 @@
  * 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
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java
index c64ec4e303..c2d12c379b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java
@@ -4,7 +4,7 @@
  * 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
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java
index bd0cfab7af..faff9971c6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java
index 425d6d2a91..94221a4a1b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java
index c9d6cf8b09..c4bfecfd43 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -100,7 +100,7 @@ public interface Task extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model2.Task#isDone <em>Done</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Done</em>' attribute.
    * @see #isDone()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java
index a2f0c57dd5..5979e3b403 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java
index bbb007ca64..5bb43d8ab6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model2.TransientContainer#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTransientContainer()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java
index e648165e49..3c54b19ca2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java
index 5e978cdfc1..86fc7eee40 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -102,7 +102,7 @@ public interface Unsettable2WithDefault extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Unsettable Byte</em>' attribute.
    * @see #isSetUnsettableByte()
    * @see #unsetUnsettableByte()
@@ -357,7 +357,7 @@ public interface Unsettable2WithDefault extends EObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Unsettable Int</em>' attribute.
    * @see #isSetUnsettableInt()
    * @see #unsetUnsettableInt()
@@ -408,7 +408,7 @@ public interface Unsettable2WithDefault extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Unsettable Long</em>' attribute.
    * @see #isSetUnsettableLong()
    * @see #unsetUnsettableLong()
@@ -459,7 +459,7 @@ public interface Unsettable2WithDefault extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Unsettable Short</em>' attribute.
    * @see #isSetUnsettableShort()
    * @see #unsetUnsettableShort()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java
index 4efc4961c9..ab0b4f562c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -116,7 +116,7 @@ public class EObjectToEObjectBothContainedMapImpl extends CDOObjectImpl implemen
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java
index 8887b435db..80aa41f0a8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -116,7 +116,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends CDOObjectImpl implement
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java
index 49104d010d..647050e2fa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -116,7 +116,7 @@ public class EObjectToEObjectMapImpl extends CDOObjectImpl implements BasicEMap.
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java
index 58a889f626..29afd8c85c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -116,7 +116,7 @@ public class EObjectToEObjectValueContainedMapImpl extends CDOObjectImpl impleme
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java
index 2004506e86..c48e73b5bf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EnumListHolderImpl#getEnumList <em>Enum List</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EnumListHolderImpl extends CDOObjectImpl implements EnumListHolder
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java
index c80ed07517..c393f51a1d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -116,7 +116,7 @@ public class IntegerToStringMapImpl extends CDOObjectImpl implements BasicEMap.E
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java
index dc7e54661d..51435d901a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
index e88e8b7f20..12d612aadc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -166,7 +166,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.model2.Model2Package#eNS_URI
    * @see #init()
@@ -185,7 +185,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Model2Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -198,11 +198,13 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public static Model2Package init()
   {
     if (isInited)
+    {
       return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model2PackageImpl());
+    Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model2PackageImpl());
 
     isInited = true;
 
@@ -1183,7 +1185,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -1327,7 +1331,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -1357,14 +1363,14 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
     initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTaskContainer_Tasks(), this.getTask(), this.getTask_TaskContainer(), "tasks", null, 0, -1,
+    initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1,
         TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTask_TaskContainer(), this.getTaskContainer(), this.getTaskContainer_Tasks(), "taskContainer",
-        null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1,
+        Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT,
@@ -1414,8 +1420,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getUnsettable2WithDefault_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", "3", 0, 1,
         Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0,
-        1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+    initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, 1,
+        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getUnsettable2WithDefault_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate",
         "2009-12-21T15:12:59", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
@@ -1438,8 +1444,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getUnsettable2WithDefault_UnsettableString(), ecorePackage.getEString(), "unsettableString",
         "\"eike\"", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE,
         !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0,
-        1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+    initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, 1,
+        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(persistentContainmentEClass, PersistentContainment.class, "PersistentContainment", !IS_ABSTRACT,
@@ -1447,10 +1453,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
         PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getPersistentContainment_Children(), this.getTransientContainer(),
-        this.getTransientContainer_Parent(), "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        !IS_ORDERED);
+    initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(),
+        "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
     initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
         PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
@@ -1460,52 +1465,51 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
         TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getTransientContainer_Parent(), this.getPersistentContainment(),
-        this.getPersistentContainment_Children(), "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(),
+        "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
         TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(notUnsettableEClass, NotUnsettable.class, "NotUnsettable", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null,
-        0, 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+    initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, 0,
+        1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0,
-        1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, 1,
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0,
-        1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, 1,
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getNotUnsettableWithDefault_NotUnsettableBoolean(), ecorePackage.getEBoolean(),
         "notUnsettableBoolean", "true", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1519,11 +1523,11 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
         "1979-03-15T07:12:59", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNotUnsettableWithDefault_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble",
-        "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNotUnsettableWithDefault_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat",
-        "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNotUnsettableWithDefault_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", "5", 0,
         1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1541,31 +1545,31 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
         !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getMapHolder_IntegerToStringMap(), this.getIntegerToStringMap(), null, "integerToStringMap", null,
-        0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToStringMap(), this.getStringToStringMap(), null, "stringToStringMap", null, 0,
-        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToVATMap(), this.getStringToVATMap(), null, "stringToVATMap", null, 0, -1,
+    initEReference(getMapHolder_IntegerToStringMap(), getIntegerToStringMap(), null, "integerToStringMap", null, 0, -1,
         MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToAddressContainmentMap(), this.getStringToAddressContainmentMap(), null,
+    initEReference(getMapHolder_StringToStringMap(), getStringToStringMap(), null, "stringToStringMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToVATMap(), getStringToVATMap(), null, "stringToVATMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressContainmentMap(), getStringToAddressContainmentMap(), null,
         "stringToAddressContainmentMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToAddressReferenceMap(), this.getStringToAddressReferenceMap(), null,
+    initEReference(getMapHolder_StringToAddressReferenceMap(), getStringToAddressReferenceMap(), null,
         "stringToAddressReferenceMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectMap(), this.getEObjectToEObjectMap(), null, "eObjectToEObjectMap",
-        null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getMapHolder_EObjectToEObjectMap(), getEObjectToEObjectMap(), null, "eObjectToEObjectMap", null, 0,
+        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), this.getEObjectToEObjectKeyContainedMap(), null,
+    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), getEObjectToEObjectKeyContainedMap(), null,
         "eObjectToEObjectKeyContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), this.getEObjectToEObjectBothContainedMap(), null,
+    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), getEObjectToEObjectBothContainedMap(), null,
         "eObjectToEObjectBothContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), this.getEObjectToEObjectValueContainedMap(), null,
+    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), getEObjectToEObjectValueContainedMap(), null,
         "eObjectToEObjectValueContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java
index 85c1e11810..b90c909e4a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java
index f1d9271fc6..b62dec9648 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java
index 4973b6acc8..a1d3d1825f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java
index bb96c6ee88..560a8448c5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java
index 0c47943ff7..ac2de64381 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -117,7 +117,7 @@ public class StringToAddressContainmentMapImpl extends CDOObjectImpl implements
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java
index 58bec4c747..5c8fd17e33 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -117,7 +117,7 @@ public class StringToAddressReferenceMapImpl extends CDOObjectImpl implements Ba
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java
index 51342af237..0eb5dd6baa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -116,7 +116,7 @@ public class StringToStringMapImpl extends CDOObjectImpl implements BasicEMap.En
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java
index a6c7e98c69..5ab2d3c05e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry<String, VAT>
@@ -117,7 +117,7 @@ public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java
index abe55921f3..adcbee162a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java
index 0b5aecc128..a170c946fd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java
index d0aac68c8c..0fb5db451a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java
index 023ea0a768..565dad305b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java
index b2d6741c1b..db202f7168 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java
index 1bbd201d2d..b2e89395c8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -100,9 +100,13 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, oldKey, newKey);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -117,18 +121,26 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
     {
       NotificationChain msgs = null;
       if (key != null)
-        msgs = ((InternalEObject)key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
+      {
+        msgs = ((InternalEObject)key).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
+      }
       if (newKey != null)
-        msgs = ((InternalEObject)newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
+      {
+        msgs = ((InternalEObject)newKey).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
+      }
       msgs = basicSetTypedKey(newKey, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY,
           newKey, newKey));
+    }
   }
 
   /**
@@ -153,9 +165,13 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, oldValue, newValue);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -170,18 +186,26 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
     {
       NotificationChain msgs = null;
       if (value != null)
-        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
+      {
+        msgs = ((InternalEObject)value).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
+      }
       if (newValue != null)
-        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
+      {
+        msgs = ((InternalEObject)newValue).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
+      }
       msgs = basicSetTypedValue(newValue, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE,
           newValue, newValue));
+    }
   }
 
   /**
@@ -288,7 +312,7 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java
index d59d2e442c..b92d6a21d1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -100,9 +100,13 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, oldKey, newKey);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -117,18 +121,26 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
     {
       NotificationChain msgs = null;
       if (key != null)
-        msgs = ((InternalEObject)key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
+      {
+        msgs = ((InternalEObject)key).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
+      }
       if (newKey != null)
-        msgs = ((InternalEObject)newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
+      {
+        msgs = ((InternalEObject)newKey).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
+      }
       msgs = basicSetTypedKey(newKey, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY,
           newKey, newKey));
+    }
   }
 
   /**
@@ -144,8 +156,10 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
       if (value != oldValue)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, oldValue, value));
+        }
       }
     }
     return value;
@@ -169,8 +183,10 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
     EObject oldValue = value;
     value = newValue;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE,
           oldValue, value));
+    }
   }
 
   /**
@@ -201,7 +217,9 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
       return getTypedKey();
     case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE:
       if (resolve)
+      {
         return getTypedValue();
+      }
       return basicGetTypedValue();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -277,7 +295,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java
index 0169e27d46..af93e2e980 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -41,7 +41,7 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
   /**
    * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -90,8 +90,10 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
       if (key != oldKey)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY, oldKey,
               key));
+        }
       }
     }
     return key;
@@ -115,7 +117,9 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
     EObject oldKey = key;
     key = newKey;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY, oldKey, key));
+    }
   }
 
   /**
@@ -131,8 +135,10 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
       if (value != oldValue)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE,
               oldValue, value));
+        }
       }
     }
     return value;
@@ -156,8 +162,10 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
     EObject oldValue = value;
     value = newValue;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE, oldValue,
-          value));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE, oldValue, value));
+    }
   }
 
   /**
@@ -171,11 +179,15 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
     {
     case Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY:
       if (resolve)
+      {
         return getTypedKey();
+      }
       return basicGetTypedKey();
     case Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE:
       if (resolve)
+      {
         return getTypedValue();
+      }
       return basicGetTypedValue();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -251,7 +263,7 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java
index 886e41fd4c..cd8c596119 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -42,7 +42,7 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
   /**
    * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -91,8 +91,10 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
       if (key != oldKey)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, oldKey, key));
+        }
       }
     }
     return key;
@@ -116,8 +118,10 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
     EObject oldKey = key;
     key = newKey;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY,
           oldKey, key));
+    }
   }
 
   /**
@@ -142,9 +146,13 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, oldValue, newValue);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -159,18 +167,26 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
     {
       NotificationChain msgs = null;
       if (value != null)
-        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
+      {
+        msgs = ((InternalEObject)value).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
+      }
       if (newValue != null)
-        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
+      {
+        msgs = ((InternalEObject)newValue).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
+      }
       msgs = basicSetTypedValue(newValue, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, newValue, newValue));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE,
+          newValue, newValue));
+    }
   }
 
   /**
@@ -199,7 +215,9 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
     {
     case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY:
       if (resolve)
+      {
         return getTypedKey();
+      }
       return basicGetTypedKey();
     case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE:
       return getTypedValue();
@@ -277,7 +295,7 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EnumListHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EnumListHolderImpl.java
index d7db969c8f..ae53ac3918 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EnumListHolderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EnumListHolderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -30,7 +30,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EnumListHolderImpl#getEnumList <em>Enum List</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EnumListHolderImpl extends EObjectImpl implements EnumListHolder
@@ -149,7 +149,9 @@ public class EnumListHolderImpl extends EObjectImpl implements EnumListHolder
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (enumList: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java
index 2d4d044b56..0a6a9a0fcd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -40,7 +40,7 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent
   /**
    * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent
   /**
    * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -114,7 +114,9 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent
     Integer oldKey = key;
     key = newKey;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__KEY, oldKey, key));
+    }
   }
 
   /**
@@ -135,7 +137,10 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent
     String oldValue = value;
     value = newValue;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__VALUE, oldValue, value));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__VALUE, oldValue, value));
+    }
   }
 
   /**
@@ -218,7 +223,9 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (key: ");
@@ -244,7 +251,7 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java
index e5cd8d4cbd..9445b01490 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -99,7 +99,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   /**
    * The cached value of the '{@link #getEObjectToEObjectMap() <em>EObject To EObject Map</em>}' map. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getEObjectToEObjectMap()
    * @generated
    * @ordered
@@ -188,8 +188,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
   {
     if (stringToVATMap == null)
     {
-      stringToVATMap = new EcoreEMap<String, VAT>(Model2Package.eINSTANCE.getStringToVATMap(),
-          StringToVATMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP);
+      stringToVATMap = new EcoreEMap<String, VAT>(Model2Package.eINSTANCE.getStringToVATMap(), StringToVATMapImpl.class,
+          this, Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP);
     }
     return stringToVATMap;
   }
@@ -247,8 +247,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
     if (eObjectToEObjectKeyContainedMap == null)
     {
       eObjectToEObjectKeyContainedMap = new EcoreEMap<EObject, EObject>(
-          Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap(), EObjectToEObjectKeyContainedMapImpl.class,
-          this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP);
+          Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap(), EObjectToEObjectKeyContainedMapImpl.class, this,
+          Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP);
     }
     return eObjectToEObjectKeyContainedMap;
   }
@@ -325,49 +325,85 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder
     {
     case Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP:
       if (coreType)
+      {
         return getIntegerToStringMap();
+      }
       else
+      {
         return getIntegerToStringMap().map();
+      }
     case Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP:
       if (coreType)
+      {
         return getStringToStringMap();
+      }
       else
+      {
         return getStringToStringMap().map();
+      }
     case Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP:
       if (coreType)
+      {
         return getStringToVATMap();
+      }
       else
+      {
         return getStringToVATMap().map();
+      }
     case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP:
       if (coreType)
+      {
         return getStringToAddressContainmentMap();
+      }
       else
+      {
         return getStringToAddressContainmentMap().map();
+      }
     case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP:
       if (coreType)
+      {
         return getStringToAddressReferenceMap();
+      }
       else
+      {
         return getStringToAddressReferenceMap().map();
+      }
     case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP:
       if (coreType)
+      {
         return getEObjectToEObjectMap();
+      }
       else
+      {
         return getEObjectToEObjectMap().map();
+      }
     case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
       if (coreType)
+      {
         return getEObjectToEObjectKeyContainedMap();
+      }
       else
+      {
         return getEObjectToEObjectKeyContainedMap().map();
+      }
     case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
       if (coreType)
+      {
         return getEObjectToEObjectBothContainedMap();
+      }
       else
+      {
         return getEObjectToEObjectBothContainedMap().map();
+      }
     case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
       if (coreType)
+      {
         return getEObjectToEObjectValueContainedMap();
+      }
       else
+      {
         return getEObjectToEObjectValueContainedMap().map();
+      }
     }
     return super.eGet(featureID, resolve, coreType);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java
index c9c7d42b68..e184c1b0a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java
@@ -166,7 +166,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Package#eNS_URI
    * @see #init()
@@ -185,7 +185,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Model2Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -198,11 +198,13 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public static Model2Package init()
   {
     if (isInited)
+    {
       return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model2PackageImpl());
+    Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model2PackageImpl());
 
     isInited = true;
 
@@ -1183,7 +1185,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -1327,7 +1331,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -1357,14 +1363,14 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
     initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTaskContainer_Tasks(), this.getTask(), this.getTask_TaskContainer(), "tasks", null, 0, -1,
+    initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1,
         TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTask_TaskContainer(), this.getTaskContainer(), this.getTaskContainer_Tasks(), "taskContainer",
-        null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1,
+        Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT,
@@ -1414,8 +1420,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getUnsettable2WithDefault_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", "3", 0, 1,
         Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0,
-        1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+    initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, 1,
+        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getUnsettable2WithDefault_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate",
         "2009-12-21T15:12:59", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
@@ -1438,8 +1444,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getUnsettable2WithDefault_UnsettableString(), ecorePackage.getEString(), "unsettableString",
         "\"eike\"", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE,
         !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0,
-        1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+    initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, 1,
+        Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(persistentContainmentEClass, PersistentContainment.class, "PersistentContainment", !IS_ABSTRACT,
@@ -1447,10 +1453,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
         PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getPersistentContainment_Children(), this.getTransientContainer(),
-        this.getTransientContainer_Parent(), "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        !IS_ORDERED);
+    initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(),
+        "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
     initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
         PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
@@ -1460,52 +1465,51 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
         TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getTransientContainer_Parent(), this.getPersistentContainment(),
-        this.getPersistentContainment_Children(), "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(),
+        "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
         TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(notUnsettableEClass, NotUnsettable.class, "NotUnsettable", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null,
-        0, 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+    initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, 0,
+        1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0,
-        1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, 1,
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0,
-        1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, 1,
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNotUnsettable_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", null, 0, 1,
-        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+        NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
-    initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getNotUnsettableWithDefault_NotUnsettableBoolean(), ecorePackage.getEBoolean(),
         "notUnsettableBoolean", "true", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE,
         IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1519,11 +1523,11 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
         "1979-03-15T07:12:59", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNotUnsettableWithDefault_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble",
-        "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNotUnsettableWithDefault_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat",
-        "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-        !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNotUnsettableWithDefault_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", "5", 0,
         1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1541,31 +1545,31 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
         !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getMapHolder_IntegerToStringMap(), this.getIntegerToStringMap(), null, "integerToStringMap", null,
-        0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToStringMap(), this.getStringToStringMap(), null, "stringToStringMap", null, 0,
-        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToVATMap(), this.getStringToVATMap(), null, "stringToVATMap", null, 0, -1,
+    initEReference(getMapHolder_IntegerToStringMap(), getIntegerToStringMap(), null, "integerToStringMap", null, 0, -1,
         MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToAddressContainmentMap(), this.getStringToAddressContainmentMap(), null,
+    initEReference(getMapHolder_StringToStringMap(), getStringToStringMap(), null, "stringToStringMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToVATMap(), getStringToVATMap(), null, "stringToVATMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressContainmentMap(), getStringToAddressContainmentMap(), null,
         "stringToAddressContainmentMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_StringToAddressReferenceMap(), this.getStringToAddressReferenceMap(), null,
+    initEReference(getMapHolder_StringToAddressReferenceMap(), getStringToAddressReferenceMap(), null,
         "stringToAddressReferenceMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectMap(), this.getEObjectToEObjectMap(), null, "eObjectToEObjectMap",
-        null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getMapHolder_EObjectToEObjectMap(), getEObjectToEObjectMap(), null, "eObjectToEObjectMap", null, 0,
+        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), this.getEObjectToEObjectKeyContainedMap(), null,
+    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), getEObjectToEObjectKeyContainedMap(), null,
         "eObjectToEObjectKeyContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), this.getEObjectToEObjectBothContainedMap(), null,
+    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), getEObjectToEObjectBothContainedMap(), null,
         "eObjectToEObjectBothContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), this.getEObjectToEObjectValueContainedMap(), null,
+    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), getEObjectToEObjectValueContainedMap(), null,
         "eObjectToEObjectValueContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java
index 89a53094ac..26ab5d10cb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -49,7 +49,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #isNotUnsettableBoolean() <em>Not Unsettable Boolean</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isNotUnsettableBoolean()
    * @generated
    * @ordered
@@ -59,7 +59,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The cached value of the '{@link #isNotUnsettableBoolean() <em>Not Unsettable Boolean</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isNotUnsettableBoolean()
    * @generated
    * @ordered
@@ -69,7 +69,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableByte() <em>Not Unsettable Byte</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableByte()
    * @generated
    * @ordered
@@ -79,7 +79,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The cached value of the '{@link #getNotUnsettableByte() <em>Not Unsettable Byte</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableByte()
    * @generated
    * @ordered
@@ -89,7 +89,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableChar() <em>Not Unsettable Char</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableChar()
    * @generated
    * @ordered
@@ -99,7 +99,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The cached value of the '{@link #getNotUnsettableChar() <em>Not Unsettable Char</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableChar()
    * @generated
    * @ordered
@@ -109,7 +109,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableDate() <em>Not Unsettable Date</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableDate()
    * @generated
    * @ordered
@@ -119,7 +119,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The cached value of the '{@link #getNotUnsettableDate() <em>Not Unsettable Date</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableDate()
    * @generated
    * @ordered
@@ -129,7 +129,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableDouble() <em>Not Unsettable Double</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableDouble()
    * @generated
    * @ordered
@@ -139,7 +139,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The cached value of the '{@link #getNotUnsettableDouble() <em>Not Unsettable Double</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableDouble()
    * @generated
    * @ordered
@@ -149,7 +149,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableFloat() <em>Not Unsettable Float</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableFloat()
    * @generated
    * @ordered
@@ -159,7 +159,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The cached value of the '{@link #getNotUnsettableFloat() <em>Not Unsettable Float</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableFloat()
    * @generated
    * @ordered
@@ -169,7 +169,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableInt() <em>Not Unsettable Int</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableInt()
    * @generated
    * @ordered
@@ -189,7 +189,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableLong() <em>Not Unsettable Long</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableLong()
    * @generated
    * @ordered
@@ -199,7 +199,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The cached value of the '{@link #getNotUnsettableLong() <em>Not Unsettable Long</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableLong()
    * @generated
    * @ordered
@@ -209,7 +209,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableShort() <em>Not Unsettable Short</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableShort()
    * @generated
    * @ordered
@@ -219,7 +219,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The cached value of the '{@link #getNotUnsettableShort() <em>Not Unsettable Short</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableShort()
    * @generated
    * @ordered
@@ -229,7 +229,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableString() <em>Not Unsettable String</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableString()
    * @generated
    * @ordered
@@ -239,7 +239,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The cached value of the '{@link #getNotUnsettableString() <em>Not Unsettable String</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableString()
    * @generated
    * @ordered
@@ -249,7 +249,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   /**
    * The default value of the '{@link #getNotUnsettableVAT() <em>Not Unsettable VAT</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableVAT()
    * @generated
    * @ordered
@@ -303,8 +303,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     boolean oldNotUnsettableBoolean = notUnsettableBoolean;
     notUnsettableBoolean = newNotUnsettableBoolean;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BOOLEAN,
           oldNotUnsettableBoolean, notUnsettableBoolean));
+    }
   }
 
   /**
@@ -325,8 +327,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     byte oldNotUnsettableByte = notUnsettableByte;
     notUnsettableByte = newNotUnsettableByte;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BYTE,
           oldNotUnsettableByte, notUnsettableByte));
+    }
   }
 
   /**
@@ -347,8 +351,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     char oldNotUnsettableChar = notUnsettableChar;
     notUnsettableChar = newNotUnsettableChar;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR,
           oldNotUnsettableChar, notUnsettableChar));
+    }
   }
 
   /**
@@ -369,8 +375,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     Date oldNotUnsettableDate = notUnsettableDate;
     notUnsettableDate = newNotUnsettableDate;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE,
           oldNotUnsettableDate, notUnsettableDate));
+    }
   }
 
   /**
@@ -391,8 +399,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     double oldNotUnsettableDouble = notUnsettableDouble;
     notUnsettableDouble = newNotUnsettableDouble;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE,
           oldNotUnsettableDouble, notUnsettableDouble));
+    }
   }
 
   /**
@@ -413,8 +423,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     float oldNotUnsettableFloat = notUnsettableFloat;
     notUnsettableFloat = newNotUnsettableFloat;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT,
           oldNotUnsettableFloat, notUnsettableFloat));
+    }
   }
 
   /**
@@ -435,8 +447,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     int oldNotUnsettableInt = notUnsettableInt;
     notUnsettableInt = newNotUnsettableInt;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_INT,
           oldNotUnsettableInt, notUnsettableInt));
+    }
   }
 
   /**
@@ -457,8 +471,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     long oldNotUnsettableLong = notUnsettableLong;
     notUnsettableLong = newNotUnsettableLong;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_LONG,
           oldNotUnsettableLong, notUnsettableLong));
+    }
   }
 
   /**
@@ -479,8 +495,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     short oldNotUnsettableShort = notUnsettableShort;
     notUnsettableShort = newNotUnsettableShort;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT,
           oldNotUnsettableShort, notUnsettableShort));
+    }
   }
 
   /**
@@ -501,8 +519,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     String oldNotUnsettableString = notUnsettableString;
     notUnsettableString = newNotUnsettableString;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING,
           oldNotUnsettableString, notUnsettableString));
+    }
   }
 
   /**
@@ -523,8 +543,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     VAT oldNotUnsettableVAT = notUnsettableVAT;
     notUnsettableVAT = newNotUnsettableVAT == null ? NOT_UNSETTABLE_VAT_EDEFAULT : newNotUnsettableVAT;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT,
           oldNotUnsettableVAT, notUnsettableVAT));
+    }
   }
 
   /**
@@ -670,8 +692,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR:
       return notUnsettableChar != NOT_UNSETTABLE_CHAR_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE:
-      return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null : !NOT_UNSETTABLE_DATE_EDEFAULT
-          .equals(notUnsettableDate);
+      return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null
+          : !NOT_UNSETTABLE_DATE_EDEFAULT.equals(notUnsettableDate);
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE:
       return notUnsettableDouble != NOT_UNSETTABLE_DOUBLE_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT:
@@ -683,8 +705,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT:
       return notUnsettableShort != NOT_UNSETTABLE_SHORT_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING:
-      return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null : !NOT_UNSETTABLE_STRING_EDEFAULT
-          .equals(notUnsettableString);
+      return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null
+          : !NOT_UNSETTABLE_STRING_EDEFAULT.equals(notUnsettableString);
     case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT:
       return notUnsettableVAT != NOT_UNSETTABLE_VAT_EDEFAULT;
     }
@@ -699,7 +721,9 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (notUnsettableBoolean: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java
index e4b17f2820..8ea200d1bc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -52,7 +52,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #isNotUnsettableBoolean() <em>Not Unsettable Boolean</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isNotUnsettableBoolean()
    * @generated
    * @ordered
@@ -62,7 +62,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The cached value of the '{@link #isNotUnsettableBoolean() <em>Not Unsettable Boolean</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isNotUnsettableBoolean()
    * @generated
    * @ordered
@@ -72,7 +72,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableByte() <em>Not Unsettable Byte</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableByte()
    * @generated
    * @ordered
@@ -82,7 +82,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The cached value of the '{@link #getNotUnsettableByte() <em>Not Unsettable Byte</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableByte()
    * @generated
    * @ordered
@@ -92,7 +92,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableChar() <em>Not Unsettable Char</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableChar()
    * @generated
    * @ordered
@@ -102,7 +102,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The cached value of the '{@link #getNotUnsettableChar() <em>Not Unsettable Char</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableChar()
    * @generated
    * @ordered
@@ -112,18 +112,18 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableDate() <em>Not Unsettable Date</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableDate()
    * @generated
    * @ordered
    */
-  protected static final Date NOT_UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE.createFromString(
-      EcorePackage.eINSTANCE.getEDate(), "1979-03-15T07:12:59");
+  protected static final Date NOT_UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE
+      .createFromString(EcorePackage.eINSTANCE.getEDate(), "1979-03-15T07:12:59");
 
   /**
    * The cached value of the '{@link #getNotUnsettableDate() <em>Not Unsettable Date</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableDate()
    * @generated
    * @ordered
@@ -133,7 +133,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableDouble() <em>Not Unsettable Double</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableDouble()
    * @generated
    * @ordered
@@ -143,7 +143,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The cached value of the '{@link #getNotUnsettableDouble() <em>Not Unsettable Double</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableDouble()
    * @generated
    * @ordered
@@ -153,7 +153,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableFloat() <em>Not Unsettable Float</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableFloat()
    * @generated
    * @ordered
@@ -163,7 +163,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The cached value of the '{@link #getNotUnsettableFloat() <em>Not Unsettable Float</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableFloat()
    * @generated
    * @ordered
@@ -173,7 +173,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableInt() <em>Not Unsettable Int</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableInt()
    * @generated
    * @ordered
@@ -193,7 +193,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableLong() <em>Not Unsettable Long</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableLong()
    * @generated
    * @ordered
@@ -203,7 +203,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The cached value of the '{@link #getNotUnsettableLong() <em>Not Unsettable Long</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableLong()
    * @generated
    * @ordered
@@ -213,7 +213,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableShort() <em>Not Unsettable Short</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableShort()
    * @generated
    * @ordered
@@ -223,7 +223,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The cached value of the '{@link #getNotUnsettableShort() <em>Not Unsettable Short</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableShort()
    * @generated
    * @ordered
@@ -233,7 +233,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableString() <em>Not Unsettable String</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableString()
    * @generated
    * @ordered
@@ -243,7 +243,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The cached value of the '{@link #getNotUnsettableString() <em>Not Unsettable String</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableString()
    * @generated
    * @ordered
@@ -253,7 +253,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   /**
    * The default value of the '{@link #getNotUnsettableVAT() <em>Not Unsettable VAT</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getNotUnsettableVAT()
    * @generated
    * @ordered
@@ -307,9 +307,11 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     boolean oldNotUnsettableBoolean = notUnsettableBoolean;
     notUnsettableBoolean = newNotUnsettableBoolean;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BOOLEAN, oldNotUnsettableBoolean,
           notUnsettableBoolean));
+    }
   }
 
   /**
@@ -330,8 +332,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     byte oldNotUnsettableByte = notUnsettableByte;
     notUnsettableByte = newNotUnsettableByte;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BYTE, oldNotUnsettableByte, notUnsettableByte));
+    }
   }
 
   /**
@@ -352,8 +356,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     char oldNotUnsettableChar = notUnsettableChar;
     notUnsettableChar = newNotUnsettableChar;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR, oldNotUnsettableChar, notUnsettableChar));
+    }
   }
 
   /**
@@ -374,8 +380,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     Date oldNotUnsettableDate = notUnsettableDate;
     notUnsettableDate = newNotUnsettableDate;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE, oldNotUnsettableDate, notUnsettableDate));
+    }
   }
 
   /**
@@ -396,8 +404,11 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     double oldNotUnsettableDouble = notUnsettableDouble;
     notUnsettableDouble = newNotUnsettableDouble;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE, oldNotUnsettableDouble, notUnsettableDouble));
+          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE, oldNotUnsettableDouble,
+          notUnsettableDouble));
+    }
   }
 
   /**
@@ -418,8 +429,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     float oldNotUnsettableFloat = notUnsettableFloat;
     notUnsettableFloat = newNotUnsettableFloat;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT, oldNotUnsettableFloat, notUnsettableFloat));
+    }
   }
 
   /**
@@ -440,8 +453,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     int oldNotUnsettableInt = notUnsettableInt;
     notUnsettableInt = newNotUnsettableInt;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_INT, oldNotUnsettableInt, notUnsettableInt));
+    }
   }
 
   /**
@@ -462,8 +477,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     long oldNotUnsettableLong = notUnsettableLong;
     notUnsettableLong = newNotUnsettableLong;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_LONG, oldNotUnsettableLong, notUnsettableLong));
+    }
   }
 
   /**
@@ -484,8 +501,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     short oldNotUnsettableShort = notUnsettableShort;
     notUnsettableShort = newNotUnsettableShort;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT, oldNotUnsettableShort, notUnsettableShort));
+    }
   }
 
   /**
@@ -506,8 +525,11 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     String oldNotUnsettableString = notUnsettableString;
     notUnsettableString = newNotUnsettableString;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
-          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING, oldNotUnsettableString, notUnsettableString));
+          Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING, oldNotUnsettableString,
+          notUnsettableString));
+    }
   }
 
   /**
@@ -528,8 +550,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     VAT oldNotUnsettableVAT = notUnsettableVAT;
     notUnsettableVAT = newNotUnsettableVAT == null ? NOT_UNSETTABLE_VAT_EDEFAULT : newNotUnsettableVAT;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT, oldNotUnsettableVAT, notUnsettableVAT));
+    }
   }
 
   /**
@@ -675,8 +699,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR:
       return notUnsettableChar != NOT_UNSETTABLE_CHAR_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE:
-      return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null : !NOT_UNSETTABLE_DATE_EDEFAULT
-          .equals(notUnsettableDate);
+      return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null
+          : !NOT_UNSETTABLE_DATE_EDEFAULT.equals(notUnsettableDate);
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE:
       return notUnsettableDouble != NOT_UNSETTABLE_DOUBLE_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT:
@@ -688,8 +712,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT:
       return notUnsettableShort != NOT_UNSETTABLE_SHORT_EDEFAULT;
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING:
-      return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null : !NOT_UNSETTABLE_STRING_EDEFAULT
-          .equals(notUnsettableString);
+      return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null
+          : !NOT_UNSETTABLE_STRING_EDEFAULT.equals(notUnsettableString);
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT:
       return notUnsettableVAT != NOT_UNSETTABLE_VAT_EDEFAULT;
     }
@@ -704,7 +728,9 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (notUnsettableBoolean: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java
index 3dd1f6b7fd..f56482be8c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java
@@ -129,8 +129,10 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
     String oldAttrBefore = attrBefore;
     attrBefore = newAttrBefore;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE,
           oldAttrBefore, attrBefore));
+    }
   }
 
   /**
@@ -165,8 +167,10 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
     String oldAttrAfter = attrAfter;
     attrAfter = newAttrAfter;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER,
           oldAttrAfter, attrAfter));
+    }
   }
 
   /**
@@ -292,7 +296,9 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (attrBefore: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java
index 0f19638872..a9845a17cf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java
@@ -59,7 +59,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
   /**
    * The cached value of the '{@link #getShippingAddress() <em>Shipping Address</em>}' containment reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getShippingAddress()
    * @generated
    * @ordered
@@ -103,8 +103,10 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
     String oldDiscountCode = discountCode;
     discountCode = newDiscountCode;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE,
           oldDiscountCode, discountCode));
+    }
   }
 
   /**
@@ -129,9 +131,13 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, oldShippingAddress, newShippingAddress);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -146,18 +152,26 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
     {
       NotificationChain msgs = null;
       if (shippingAddress != null)
-        msgs = ((InternalEObject)shippingAddress).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
+      {
+        msgs = ((InternalEObject)shippingAddress).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
+      }
       if (newShippingAddress != null)
-        msgs = ((InternalEObject)newShippingAddress).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
+      {
+        msgs = ((InternalEObject)newShippingAddress).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
+      }
       msgs = basicSetShippingAddress(newShippingAddress, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS,
           newShippingAddress, newShippingAddress));
+    }
   }
 
   /**
@@ -255,7 +269,9 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (discountCode: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java
index c0b31aa265..f61f9931a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -43,7 +43,7 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
   /**
    * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -53,7 +53,7 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
   /**
    * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -107,8 +107,10 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
     String oldKey = key;
     key = newKey;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY,
           oldKey, key));
+    }
   }
 
   /**
@@ -133,9 +135,13 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, oldValue, newValue);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -150,18 +156,26 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
     {
       NotificationChain msgs = null;
       if (value != null)
-        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
+      {
+        msgs = ((InternalEObject)value).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
+      }
       if (newValue != null)
-        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
+      {
+        msgs = ((InternalEObject)newValue).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
+      }
       msgs = basicSetTypedValue(newValue, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE,
           newValue, newValue));
+    }
   }
 
   /**
@@ -259,7 +273,9 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (key: ");
@@ -283,7 +299,7 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java
index 905587867f..8b1164f4d8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -42,7 +42,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
   /**
    * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -52,7 +52,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
   /**
    * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -106,8 +106,10 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
     String oldKey = key;
     key = newKey;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__KEY, oldKey,
           key));
+    }
   }
 
   /**
@@ -123,8 +125,10 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
       if (value != oldValue)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, oldValue, value));
+        }
       }
     }
     return value;
@@ -148,8 +152,10 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
     Address oldValue = value;
     value = newValue;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE,
           oldValue, value));
+    }
   }
 
   /**
@@ -165,7 +171,9 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
       return getTypedKey();
     case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE:
       if (resolve)
+      {
         return getTypedValue();
+      }
       return basicGetTypedValue();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -234,7 +242,9 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (key: ");
@@ -258,7 +268,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java
index 519b1a8316..fd32f98636 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -40,7 +40,7 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr
   /**
    * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr
   /**
    * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -114,7 +114,9 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr
     String oldKey = key;
     key = newKey;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__KEY, oldKey, key));
+    }
   }
 
   /**
@@ -135,7 +137,10 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr
     String oldValue = value;
     value = newValue;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__VALUE, oldValue, value));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__VALUE, oldValue, value));
+    }
   }
 
   /**
@@ -218,7 +223,9 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (key: ");
@@ -244,7 +251,7 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToVATMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToVATMapImpl.java
index 90d10b0f38..224d9d3569 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToVATMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToVATMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  *
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<String, VAT>
@@ -41,7 +41,7 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S
   /**
    * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -51,7 +51,7 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S
   /**
    * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -115,7 +115,9 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S
     String oldKey = key;
     key = newKey;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_VAT_MAP__KEY, oldKey, key));
+    }
   }
 
   /**
@@ -136,7 +138,9 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S
     VAT oldValue = value;
     value = newValue == null ? VALUE_EDEFAULT : newValue;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_VAT_MAP__VALUE, oldValue, value));
+    }
   }
 
   /**
@@ -219,7 +223,9 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (key: ");
@@ -245,7 +251,7 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java
index 928d706f53..e9aadd960b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java
@@ -101,7 +101,9 @@ public class TaskImpl extends EObjectImpl implements Task
   public TaskContainer getTaskContainer()
   {
     if (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER)
+    {
       return null;
+    }
     return (TaskContainer)eContainer();
   }
 
@@ -122,23 +124,33 @@ public class TaskImpl extends EObjectImpl implements Task
   public void setTaskContainer(TaskContainer newTaskContainer)
   {
     if (newTaskContainer != eInternalContainer()
-        || (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER && newTaskContainer != null))
+        || eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER && newTaskContainer != null)
     {
       if (EcoreUtil.isAncestor(this, newTaskContainer))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newTaskContainer != null)
+      {
         msgs = ((InternalEObject)newTaskContainer).eInverseAdd(this, Model2Package.TASK_CONTAINER__TASKS,
             TaskContainer.class, msgs);
+      }
       msgs = basicSetTaskContainer(newTaskContainer, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__TASK_CONTAINER, newTaskContainer,
           newTaskContainer));
+    }
   }
 
   /**
@@ -159,8 +171,10 @@ public class TaskImpl extends EObjectImpl implements Task
     String oldDescription = description;
     description = newDescription;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DESCRIPTION, oldDescription,
-          description));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DESCRIPTION, oldDescription, description));
+    }
   }
 
   /**
@@ -181,7 +195,9 @@ public class TaskImpl extends EObjectImpl implements Task
     boolean oldDone = done;
     done = newDone;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DONE, oldDone, done));
+    }
   }
 
   /**
@@ -195,7 +211,9 @@ public class TaskImpl extends EObjectImpl implements Task
     {
     case Model2Package.TASK__TASK_CONTAINER:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetTaskContainer((TaskContainer)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -321,7 +339,9 @@ public class TaskImpl extends EObjectImpl implements Task
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (description: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java
index 0bceba1fb4..489c69e913 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java
@@ -115,8 +115,10 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     String oldAttrBefore = attrBefore;
     attrBefore = newAttrBefore;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE,
           oldAttrBefore, attrBefore));
+    }
   }
 
   /**
@@ -126,7 +128,9 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
   public PersistentContainment getParent()
   {
     if (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT)
+    {
       return null;
+    }
     return (PersistentContainment)eContainer();
   }
 
@@ -147,23 +151,33 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
   public void setParent(PersistentContainment newParent)
   {
     if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT && newParent != null))
+        || eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN,
             PersistentContainment.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__PARENT, newParent,
           newParent));
+    }
   }
 
   /**
@@ -184,8 +198,10 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     String oldAttrAfter = attrAfter;
     attrAfter = newAttrAfter;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER,
-          oldAttrAfter, attrAfter));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER, oldAttrAfter,
+          attrAfter));
+    }
   }
 
   /**
@@ -199,7 +215,9 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     {
     case Model2Package.TRANSIENT_CONTAINER__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((PersistentContainment)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -326,7 +344,9 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (attrBefore: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java
index fe5b228e67..9906ba5b73 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java
@@ -47,7 +47,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   /**
    * The default value of the '{@link #isUnsettableBoolean() <em>Unsettable Boolean</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isUnsettableBoolean()
    * @generated
    * @ordered
@@ -391,8 +391,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableBooleanESet = unsettableBooleanESet;
     unsettableBooleanESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN,
           oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet));
+    }
   }
 
   /**
@@ -406,8 +408,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT;
     unsettableBooleanESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN,
           oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
+    }
   }
 
   /**
@@ -439,8 +443,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableByteESet = unsettableByteESet;
     unsettableByteESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE,
           oldUnsettableByte, unsettableByte, !oldUnsettableByteESet));
+    }
   }
 
   /**
@@ -454,8 +460,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableByte = UNSETTABLE_BYTE_EDEFAULT;
     unsettableByteESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE,
           oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet));
+    }
   }
 
   /**
@@ -487,8 +495,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableCharESet = unsettableCharESet;
     unsettableCharESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR,
           oldUnsettableChar, unsettableChar, !oldUnsettableCharESet));
+    }
   }
 
   /**
@@ -502,8 +512,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableChar = UNSETTABLE_CHAR_EDEFAULT;
     unsettableCharESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR,
           oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet));
+    }
   }
 
   /**
@@ -535,8 +547,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableDateESet = unsettableDateESet;
     unsettableDateESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE,
           oldUnsettableDate, unsettableDate, !oldUnsettableDateESet));
+    }
   }
 
   /**
@@ -550,8 +564,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableDate = UNSETTABLE_DATE_EDEFAULT;
     unsettableDateESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE,
           oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet));
+    }
   }
 
   /**
@@ -583,8 +599,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableDoubleESet = unsettableDoubleESet;
     unsettableDoubleESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE,
           oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet));
+    }
   }
 
   /**
@@ -598,8 +616,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT;
     unsettableDoubleESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE,
           oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet));
+    }
   }
 
   /**
@@ -631,8 +651,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableFloatESet = unsettableFloatESet;
     unsettableFloatESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT,
           oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet));
+    }
   }
 
   /**
@@ -646,8 +668,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT;
     unsettableFloatESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT,
           oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet));
+    }
   }
 
   /**
@@ -679,8 +703,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableIntESet = unsettableIntESet;
     unsettableIntESet = true;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_INT,
-          oldUnsettableInt, unsettableInt, !oldUnsettableIntESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_INT, oldUnsettableInt,
+          unsettableInt, !oldUnsettableIntESet));
+    }
   }
 
   /**
@@ -694,8 +720,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableInt = UNSETTABLE_INT_EDEFAULT;
     unsettableIntESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_INT,
           oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet));
+    }
   }
 
   /**
@@ -727,8 +755,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableLongESet = unsettableLongESet;
     unsettableLongESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG,
           oldUnsettableLong, unsettableLong, !oldUnsettableLongESet));
+    }
   }
 
   /**
@@ -742,8 +772,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableLong = UNSETTABLE_LONG_EDEFAULT;
     unsettableLongESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG,
           oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet));
+    }
   }
 
   /**
@@ -775,8 +807,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableShortESet = unsettableShortESet;
     unsettableShortESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT,
           oldUnsettableShort, unsettableShort, !oldUnsettableShortESet));
+    }
   }
 
   /**
@@ -790,8 +824,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableShort = UNSETTABLE_SHORT_EDEFAULT;
     unsettableShortESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT,
           oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet));
+    }
   }
 
   /**
@@ -823,8 +859,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableStringESet = unsettableStringESet;
     unsettableStringESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING,
           oldUnsettableString, unsettableString, !oldUnsettableStringESet));
+    }
   }
 
   /**
@@ -838,8 +876,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableString = UNSETTABLE_STRING_EDEFAULT;
     unsettableStringESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING,
           oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet));
+    }
   }
 
   /**
@@ -871,8 +911,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableVATESet = unsettableVATESet;
     unsettableVATESet = true;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT,
-          oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT, oldUnsettableVAT,
+          unsettableVAT, !oldUnsettableVATESet));
+    }
   }
 
   /**
@@ -886,8 +928,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableVAT = UNSETTABLE_VAT_EDEFAULT;
     unsettableVATESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT,
           oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet));
+    }
   }
 
   /**
@@ -1069,64 +1113,110 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (unsettableBoolean: ");
     if (unsettableBooleanESet)
+    {
       result.append(unsettableBoolean);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableByte: ");
     if (unsettableByteESet)
+    {
       result.append(unsettableByte);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableChar: ");
     if (unsettableCharESet)
+    {
       result.append(unsettableChar);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableDate: ");
     if (unsettableDateESet)
+    {
       result.append(unsettableDate);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableDouble: ");
     if (unsettableDoubleESet)
+    {
       result.append(unsettableDouble);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableFloat: ");
     if (unsettableFloatESet)
+    {
       result.append(unsettableFloat);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableInt: ");
     if (unsettableIntESet)
+    {
       result.append(unsettableInt);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableLong: ");
     if (unsettableLongESet)
+    {
       result.append(unsettableLong);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableShort: ");
     if (unsettableShortESet)
+    {
       result.append(unsettableShort);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableString: ");
     if (unsettableStringESet)
+    {
       result.append(unsettableString);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableVAT: ");
     if (unsettableVATESet)
+    {
       result.append(unsettableVAT);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java
index 31821f9e32..639b7e5c44 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java
@@ -50,7 +50,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   /**
    * The default value of the '{@link #isUnsettableBoolean() <em>Unsettable Boolean</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isUnsettableBoolean()
    * @generated
    * @ordered
@@ -139,8 +139,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
    * @generated
    * @ordered
    */
-  protected static final Date UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE.createFromString(
-      EcorePackage.eINSTANCE.getEDate(), "2009-12-21T15:12:59");
+  protected static final Date UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE
+      .createFromString(EcorePackage.eINSTANCE.getEDate(), "2009-12-21T15:12:59");
 
   /**
    * The cached value of the '{@link #getUnsettableDate() <em>Unsettable Date</em>}' attribute.
@@ -395,8 +395,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableBooleanESet = unsettableBooleanESet;
     unsettableBooleanESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN,
           oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet));
+    }
   }
 
   /**
@@ -410,9 +412,11 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT;
     unsettableBooleanESet = false;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET,
-          Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, oldUnsettableBoolean,
-          UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN,
+              oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
+    }
   }
 
   /**
@@ -444,8 +448,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableByteESet = unsettableByteESet;
     unsettableByteESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE,
           oldUnsettableByte, unsettableByte, !oldUnsettableByteESet));
+    }
   }
 
   /**
@@ -459,8 +465,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableByte = UNSETTABLE_BYTE_EDEFAULT;
     unsettableByteESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE,
           oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet));
+    }
   }
 
   /**
@@ -492,8 +500,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableCharESet = unsettableCharESet;
     unsettableCharESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR,
           oldUnsettableChar, unsettableChar, !oldUnsettableCharESet));
+    }
   }
 
   /**
@@ -507,8 +517,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableChar = UNSETTABLE_CHAR_EDEFAULT;
     unsettableCharESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR,
           oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet));
+    }
   }
 
   /**
@@ -540,8 +552,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableDateESet = unsettableDateESet;
     unsettableDateESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE,
           oldUnsettableDate, unsettableDate, !oldUnsettableDateESet));
+    }
   }
 
   /**
@@ -555,8 +569,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableDate = UNSETTABLE_DATE_EDEFAULT;
     unsettableDateESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE,
           oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet));
+    }
   }
 
   /**
@@ -588,8 +604,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableDoubleESet = unsettableDoubleESet;
     unsettableDoubleESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE,
           oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet));
+    }
   }
 
   /**
@@ -603,9 +621,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT;
     unsettableDoubleESet = false;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET,
-          Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT,
-          oldUnsettableDoubleESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE,
+          oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet));
+    }
   }
 
   /**
@@ -637,8 +656,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableFloatESet = unsettableFloatESet;
     unsettableFloatESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT,
           oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet));
+    }
   }
 
   /**
@@ -652,8 +673,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT;
     unsettableFloatESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT,
           oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet));
+    }
   }
 
   /**
@@ -685,8 +708,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableIntESet = unsettableIntESet;
     unsettableIntESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT,
           oldUnsettableInt, unsettableInt, !oldUnsettableIntESet));
+    }
   }
 
   /**
@@ -700,8 +725,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableInt = UNSETTABLE_INT_EDEFAULT;
     unsettableIntESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT,
           oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet));
+    }
   }
 
   /**
@@ -733,8 +760,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableLongESet = unsettableLongESet;
     unsettableLongESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG,
           oldUnsettableLong, unsettableLong, !oldUnsettableLongESet));
+    }
   }
 
   /**
@@ -748,8 +777,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableLong = UNSETTABLE_LONG_EDEFAULT;
     unsettableLongESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG,
           oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet));
+    }
   }
 
   /**
@@ -781,8 +812,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableShortESet = unsettableShortESet;
     unsettableShortESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT,
           oldUnsettableShort, unsettableShort, !oldUnsettableShortESet));
+    }
   }
 
   /**
@@ -796,8 +829,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableShort = UNSETTABLE_SHORT_EDEFAULT;
     unsettableShortESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT,
           oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet));
+    }
   }
 
   /**
@@ -829,8 +864,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableStringESet = unsettableStringESet;
     unsettableStringESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING,
           oldUnsettableString, unsettableString, !oldUnsettableStringESet));
+    }
   }
 
   /**
@@ -844,9 +881,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableString = UNSETTABLE_STRING_EDEFAULT;
     unsettableStringESet = false;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET,
-          Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, oldUnsettableString, UNSETTABLE_STRING_EDEFAULT,
-          oldUnsettableStringESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING,
+          oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet));
+    }
   }
 
   /**
@@ -878,8 +916,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableVATESet = unsettableVATESet;
     unsettableVATESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT,
           oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet));
+    }
   }
 
   /**
@@ -893,8 +933,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableVAT = UNSETTABLE_VAT_EDEFAULT;
     unsettableVATESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT,
           oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet));
+    }
   }
 
   /**
@@ -1076,64 +1118,110 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (unsettableBoolean: ");
     if (unsettableBooleanESet)
+    {
       result.append(unsettableBoolean);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableByte: ");
     if (unsettableByteESet)
+    {
       result.append(unsettableByte);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableChar: ");
     if (unsettableCharESet)
+    {
       result.append(unsettableChar);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableDate: ");
     if (unsettableDateESet)
+    {
       result.append(unsettableDate);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableDouble: ");
     if (unsettableDoubleESet)
+    {
       result.append(unsettableDouble);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableFloat: ");
     if (unsettableFloatESet)
+    {
       result.append(unsettableFloat);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableInt: ");
     if (unsettableIntESet)
+    {
       result.append(unsettableInt);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableLong: ");
     if (unsettableLongESet)
+    {
       result.append(unsettableLong);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableShort: ");
     if (unsettableShortESet)
+    {
       result.append(unsettableShort);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableString: ");
     if (unsettableStringESet)
+    {
       result.append(unsettableString);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", unsettableVAT: ");
     if (unsettableVATESet)
+    {
       result.append(unsettableVAT);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java
index 0877cf60b6..a95a6fc885 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java
@@ -103,11 +103,17 @@ public class Model2Switch<T> extends Switch<T>
       SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject;
       T result = caseSpecialPurchaseOrder(specialPurchaseOrder);
       if (result == null)
+      {
         result = casePurchaseOrder(specialPurchaseOrder);
+      }
       if (result == null)
+      {
         result = caseOrder(specialPurchaseOrder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.TASK_CONTAINER:
@@ -115,7 +121,9 @@ public class Model2Switch<T> extends Switch<T>
       TaskContainer taskContainer = (TaskContainer)theEObject;
       T result = caseTaskContainer(taskContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.TASK:
@@ -123,7 +131,9 @@ public class Model2Switch<T> extends Switch<T>
       Task task = (Task)theEObject;
       T result = caseTask(task);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.UNSETTABLE1:
@@ -131,7 +141,9 @@ public class Model2Switch<T> extends Switch<T>
       Unsettable1 unsettable1 = (Unsettable1)theEObject;
       T result = caseUnsettable1(unsettable1);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.UNSETTABLE2_WITH_DEFAULT:
@@ -139,7 +151,9 @@ public class Model2Switch<T> extends Switch<T>
       Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject;
       T result = caseUnsettable2WithDefault(unsettable2WithDefault);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.PERSISTENT_CONTAINMENT:
@@ -147,7 +161,9 @@ public class Model2Switch<T> extends Switch<T>
       PersistentContainment persistentContainment = (PersistentContainment)theEObject;
       T result = casePersistentContainment(persistentContainment);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.TRANSIENT_CONTAINER:
@@ -155,7 +171,9 @@ public class Model2Switch<T> extends Switch<T>
       TransientContainer transientContainer = (TransientContainer)theEObject;
       T result = caseTransientContainer(transientContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.NOT_UNSETTABLE:
@@ -163,7 +181,9 @@ public class Model2Switch<T> extends Switch<T>
       NotUnsettable notUnsettable = (NotUnsettable)theEObject;
       T result = caseNotUnsettable(notUnsettable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT:
@@ -171,7 +191,9 @@ public class Model2Switch<T> extends Switch<T>
       NotUnsettableWithDefault notUnsettableWithDefault = (NotUnsettableWithDefault)theEObject;
       T result = caseNotUnsettableWithDefault(notUnsettableWithDefault);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.MAP_HOLDER:
@@ -179,7 +201,9 @@ public class Model2Switch<T> extends Switch<T>
       MapHolder mapHolder = (MapHolder)theEObject;
       T result = caseMapHolder(mapHolder);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.STRING_TO_STRING_MAP:
@@ -188,7 +212,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>)theEObject;
       T result = caseStringToStringMap(stringToStringMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.INTEGER_TO_STRING_MAP:
@@ -197,7 +223,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<Integer, String> integerToStringMap = (Map.Entry<Integer, String>)theEObject;
       T result = caseIntegerToStringMap(integerToStringMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.STRING_TO_VAT_MAP:
@@ -206,7 +234,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<String, VAT> stringToVATMap = (Map.Entry<String, VAT>)theEObject;
       T result = caseStringToVATMap(stringToVATMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP:
@@ -215,7 +245,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<String, Address> stringToAddressContainmentMap = (Map.Entry<String, Address>)theEObject;
       T result = caseStringToAddressContainmentMap(stringToAddressContainmentMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP:
@@ -224,7 +256,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<String, Address> stringToAddressReferenceMap = (Map.Entry<String, Address>)theEObject;
       T result = caseStringToAddressReferenceMap(stringToAddressReferenceMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.EOBJECT_TO_EOBJECT_MAP:
@@ -233,7 +267,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<EObject, EObject> eObjectToEObjectMap = (Map.Entry<EObject, EObject>)theEObject;
       T result = caseEObjectToEObjectMap(eObjectToEObjectMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
@@ -242,7 +278,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<EObject, EObject> eObjectToEObjectKeyContainedMap = (Map.Entry<EObject, EObject>)theEObject;
       T result = caseEObjectToEObjectKeyContainedMap(eObjectToEObjectKeyContainedMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
@@ -251,7 +289,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<EObject, EObject> eObjectToEObjectBothContainedMap = (Map.Entry<EObject, EObject>)theEObject;
       T result = caseEObjectToEObjectBothContainedMap(eObjectToEObjectBothContainedMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
@@ -260,7 +300,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<EObject, EObject> eObjectToEObjectValueContainedMap = (Map.Entry<EObject, EObject>)theEObject;
       T result = caseEObjectToEObjectValueContainedMap(eObjectToEObjectValueContainedMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.ENUM_LIST_HOLDER:
@@ -268,7 +310,9 @@ public class Model2Switch<T> extends Switch<T>
       EnumListHolder enumListHolder = (EnumListHolder)theEObject;
       T result = caseEnumListHolder(enumListHolder);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
index 3fe3e33a18..b07c089892 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
@@ -95,11 +95,17 @@ public class Model2Switch<T> extends Switch<T>
       SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject;
       T result = caseSpecialPurchaseOrder(specialPurchaseOrder);
       if (result == null)
+      {
         result = casePurchaseOrder(specialPurchaseOrder);
+      }
       if (result == null)
+      {
         result = caseOrder(specialPurchaseOrder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.TASK_CONTAINER:
@@ -107,7 +113,9 @@ public class Model2Switch<T> extends Switch<T>
       TaskContainer taskContainer = (TaskContainer)theEObject;
       T result = caseTaskContainer(taskContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.TASK:
@@ -115,7 +123,9 @@ public class Model2Switch<T> extends Switch<T>
       Task task = (Task)theEObject;
       T result = caseTask(task);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.UNSETTABLE1:
@@ -123,7 +133,9 @@ public class Model2Switch<T> extends Switch<T>
       Unsettable1 unsettable1 = (Unsettable1)theEObject;
       T result = caseUnsettable1(unsettable1);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.UNSETTABLE2_WITH_DEFAULT:
@@ -131,7 +143,9 @@ public class Model2Switch<T> extends Switch<T>
       Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject;
       T result = caseUnsettable2WithDefault(unsettable2WithDefault);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.PERSISTENT_CONTAINMENT:
@@ -139,7 +153,9 @@ public class Model2Switch<T> extends Switch<T>
       PersistentContainment persistentContainment = (PersistentContainment)theEObject;
       T result = casePersistentContainment(persistentContainment);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.TRANSIENT_CONTAINER:
@@ -147,7 +163,9 @@ public class Model2Switch<T> extends Switch<T>
       TransientContainer transientContainer = (TransientContainer)theEObject;
       T result = caseTransientContainer(transientContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.NOT_UNSETTABLE:
@@ -155,7 +173,9 @@ public class Model2Switch<T> extends Switch<T>
       NotUnsettable notUnsettable = (NotUnsettable)theEObject;
       T result = caseNotUnsettable(notUnsettable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT:
@@ -163,7 +183,9 @@ public class Model2Switch<T> extends Switch<T>
       NotUnsettableWithDefault notUnsettableWithDefault = (NotUnsettableWithDefault)theEObject;
       T result = caseNotUnsettableWithDefault(notUnsettableWithDefault);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.MAP_HOLDER:
@@ -171,7 +193,9 @@ public class Model2Switch<T> extends Switch<T>
       MapHolder mapHolder = (MapHolder)theEObject;
       T result = caseMapHolder(mapHolder);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.STRING_TO_STRING_MAP:
@@ -180,7 +204,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>)theEObject;
       T result = caseStringToStringMap(stringToStringMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.INTEGER_TO_STRING_MAP:
@@ -189,7 +215,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<Integer, String> integerToStringMap = (Map.Entry<Integer, String>)theEObject;
       T result = caseIntegerToStringMap(integerToStringMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.STRING_TO_VAT_MAP:
@@ -198,7 +226,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<String, VAT> stringToVATMap = (Map.Entry<String, VAT>)theEObject;
       T result = caseStringToVATMap(stringToVATMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP:
@@ -207,7 +237,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<String, Address> stringToAddressContainmentMap = (Map.Entry<String, Address>)theEObject;
       T result = caseStringToAddressContainmentMap(stringToAddressContainmentMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP:
@@ -216,7 +248,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<String, Address> stringToAddressReferenceMap = (Map.Entry<String, Address>)theEObject;
       T result = caseStringToAddressReferenceMap(stringToAddressReferenceMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.EOBJECT_TO_EOBJECT_MAP:
@@ -225,7 +259,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<EObject, EObject> eObjectToEObjectMap = (Map.Entry<EObject, EObject>)theEObject;
       T result = caseEObjectToEObjectMap(eObjectToEObjectMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
@@ -234,7 +270,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<EObject, EObject> eObjectToEObjectKeyContainedMap = (Map.Entry<EObject, EObject>)theEObject;
       T result = caseEObjectToEObjectKeyContainedMap(eObjectToEObjectKeyContainedMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
@@ -243,7 +281,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<EObject, EObject> eObjectToEObjectBothContainedMap = (Map.Entry<EObject, EObject>)theEObject;
       T result = caseEObjectToEObjectBothContainedMap(eObjectToEObjectBothContainedMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
@@ -252,7 +292,9 @@ public class Model2Switch<T> extends Switch<T>
       Map.Entry<EObject, EObject> eObjectToEObjectValueContainedMap = (Map.Entry<EObject, EObject>)theEObject;
       T result = caseEObjectToEObjectValueContainedMap(eObjectToEObjectValueContainedMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model2Package.ENUM_LIST_HOLDER:
@@ -260,7 +302,9 @@ public class Model2Switch<T> extends Switch<T>
       EnumListHolder enumListHolder = (EnumListHolder)theEObject;
       T result = caseEnumListHolder(enumListHolder);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
index c45b8f9c49..0b54eeb708 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model3; singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,15 +10,15 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.model3;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.legacy;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.legacy.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.legacy.util;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.subpackage;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.subpackage.legacy;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.subpackage.legacy.util;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.subpackage.util;version="3.0.400",
- org.eclipse.emf.cdo.tests.model3.util;version="3.0.400"
+Export-Package: org.eclipse.emf.cdo.tests.model3;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.legacy;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.legacy.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.legacy.util;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.subpackage;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.subpackage.legacy;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.subpackage.legacy.util;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.subpackage.util;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model3.util;version="3.0.500"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java
index e6b394a48e..3f352ea7c4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java
index 6628020596..48874f919e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java
index 48de9ce7e1..2ac0e21e4b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -49,7 +49,7 @@ public interface File extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.File#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -75,7 +75,7 @@ public interface File extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.File#getData <em>Data</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Data</em>' attribute.
    * @see #getData()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java
index f1a70fdd24..3ee75886c3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -50,7 +50,7 @@ public interface Image extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.Image#getWidth <em>Width</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Width</em>' attribute.
    * @see #getWidth()
@@ -76,7 +76,7 @@ public interface Image extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.Image#getHeight <em>Height</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Height</em>' attribute.
    * @see #getHeight()
@@ -102,7 +102,7 @@ public interface Image extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.Image#getData <em>Data</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Data</em>' attribute.
    * @see #getData()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java
index c48744f8ad..2ebea68d3b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference;
  * The following features are supported: >{@link or <li>se.emf.cdo.tests.model3.MetaRef#getEPackageRef <em>EPackage Ref
  * </em>}</li> </ul>
  * </p>
- * 
+ *
  * @see org.ec se.emf.cdo.tests.model3.Model3Package#getMetaRef()
  * @model
  * @generated
@@ -33,7 +33,7 @@ public interface MetaRef extends EObject
    * Returns the value of the '<em><b>EPackage Ref</b></em>' reference. ' reference. <!-- begin-user-doc --> he meaning
    * of the '<em>EPackage Ref</em>' reference isn'' reference isn't clear, there really should be more of a description
    * here... </p> doc -->
-   * 
+   *
    * @return the val e of the '<em>EPackage Ref</em>' reference.
    * @see #setEPackageRef(EPackage)
    * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getMetaRef_EPackageRef()
@@ -46,7 +46,7 @@ public interface MetaRef extends EObject
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEPackageRef <em>EPackage Ref</em>}'
    * reference. ' reference. <!-- begin-user-doc --> <!-- end-user-doc --> h new v value the new value of the '</em>'
    * reference.
-   * 
+   *
    * @see #getEPackageRef()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java
index 317bd95ce3..1169271968 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
index a29adf009b..ee9e0b505b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -62,7 +62,7 @@ public interface Model3Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.Class1Impl <em>Class1</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model3.impl.Class1Impl
    * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getClass1()
    * @generated
@@ -129,7 +129,7 @@ public interface Model3Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonImpl <em>Polygon</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model3.impl.PolygonImpl
    * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getPolygon()
    * @generated
@@ -181,7 +181,7 @@ public interface Model3Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl <em>Node A</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl
    * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeA()
    * @generated
@@ -224,7 +224,7 @@ public interface Model3Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl <em>Node B</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl
    * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeB()
    * @generated
@@ -267,7 +267,7 @@ public interface Model3Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl <em>Node C</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl
    * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeC()
    * @generated
@@ -310,7 +310,7 @@ public interface Model3Package extends EPackage
   /**
    * The feature id for the '<em><b>Opposite Nodes</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -327,7 +327,7 @@ public interface Model3Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl <em>Node D</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl
    * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeD()
    * @generated
@@ -432,7 +432,7 @@ public interface Model3Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.ImageImpl <em>Image</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model3.impl.ImageImpl
    * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getImage()
    * @generated
@@ -474,7 +474,7 @@ public interface Model3Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.FileImpl <em>File</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model3.impl.FileImpl
    * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getFile()
    * @generated
@@ -599,7 +599,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.Class1 <em>Class1</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Class1</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.Class1
    * @generated
@@ -619,7 +619,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.MetaRef <em>Meta Ref</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Meta Ref</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.MetaRef
    * @generated
@@ -659,7 +659,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.Polygon <em>Polygon</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Polygon</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.Polygon
    * @generated
@@ -699,7 +699,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.NodeA <em>Node A</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Node A</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.NodeA
    * @generated
@@ -740,7 +740,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.NodeB <em>Node B</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Node B</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.NodeB
    * @generated
@@ -781,7 +781,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.NodeC <em>Node C</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Node C</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.NodeC
    * @generated
@@ -842,7 +842,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.NodeD <em>Node D</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Node D</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.NodeD
    * @generated
@@ -946,7 +946,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.Image <em>Image</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Image</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.Image
    * @generated
@@ -986,7 +986,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.File <em>File</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>File</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.File
    * @generated
@@ -1077,7 +1077,7 @@ public interface Model3Package extends EPackage
   /**
    * Returns the meta object for data type '{@link org.eclipse.emf.cdo.tests.model3.Point <em>Point</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for data type '<em>Point</em>'.
    * @see org.eclipse.emf.cdo.tests.model3.Point
    * @model instanceClass="org.eclipse.emf.cdo.tests.model3.Point"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java
index 4fa69e88a1..2404d648c7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -65,7 +65,7 @@ public interface NodeA extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeA#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java
index 5ade6fe397..b8b9667c5c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -94,7 +94,7 @@ public interface NodeB extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeB#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java
index eec448ed01..2bb7d2af3b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -96,7 +96,7 @@ public interface NodeC extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java
index 14c7380032..801cd92c57 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -96,7 +96,7 @@ public interface NodeD extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java
index 3dd2c05f58..04f44a7935 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java
index 3501071d83..f4fbdcff0e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java
index f8213437d5..5ced07db54 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithIDAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithIDAttributeImpl.java
index 1bd0ce02f4..c5a71d6148 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithIDAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithIDAttributeImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaObjectAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaObjectAttributeImpl.java
index c4c0b3a78a..b4afc88dd5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaObjectAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaObjectAttributeImpl.java
@@ -71,7 +71,7 @@ public class ClassWithJavaObjectAttributeImpl extends CDOObjectImpl implements C
    */
   public Object getJavaObject()
   {
-    return (Object)eGet(Model3Package.eINSTANCE.getClassWithJavaObjectAttribute_JavaObject(), true);
+    return eGet(Model3Package.eINSTANCE.getClassWithJavaObjectAttribute_JavaObject(), true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java
index b1e78d69e6..d090a0d88e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java
index 18711a8e67..bd90a9e719 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java
index f0231d8d7f..ed7f638664 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl#getEPackageRef <em>EPackage Ref</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MetaRefImpl extends CDOObjectImpl implements MetaRef
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
index 11281de496..0fd5b24ae3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -146,7 +146,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.model3.Model3Package#eNS_URI
    * @see #init()
@@ -165,7 +165,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Model3Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -178,11 +178,13 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public static Model3Package init()
   {
     if (isInited)
+    {
       return (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model3PackageImpl());
+    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model3PackageImpl());
 
     isInited = true;
 
@@ -191,8 +193,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
     // Obtain or create and register interdependencies
     SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI) : SubpackagePackage.eINSTANCE);
+        .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl
+            ? EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI) : SubpackagePackage.eINSTANCE);
 
     // Create package meta-data objects
     theModel3Package.createPackageContents();
@@ -674,7 +676,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -758,7 +762,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -799,74 +805,73 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygon_Points(), this.getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPolygon_Points(), getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(polygonWithDuplicatesEClass, PolygonWithDuplicates.class, "PolygonWithDuplicates", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygonWithDuplicates_Points(), this.getPoint(), "points", null, 1, -1,
-        PolygonWithDuplicates.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPolygonWithDuplicates_Points(), getPoint(), "points", null, 1, -1, PolygonWithDuplicates.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeAEClass, NodeA.class, "NodeA", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeA_Children(), this.getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT,
+    initEReference(getNodeA_Children(), getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
     initEAttribute(getNodeA_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeA.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeA_OtherNodes(), this.getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT,
+    initEReference(getNodeA_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(nodeBEClass, NodeB.class, "NodeB", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeB_Children(), this.getNodeB(), this.getNodeB_Parent(), "children", null, 0, -1, NodeB.class,
+    initEReference(getNodeB_Children(), getNodeB(), getNodeB_Parent(), "children", null, 0, -1, NodeB.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeB_Parent(), this.getNodeB(), this.getNodeB_Children(), "parent", null, 0, 1, NodeB.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeB_Parent(), getNodeB(), getNodeB_Children(), "parent", null, 0, 1, NodeB.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNodeB_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeB.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeCEClass, NodeC.class, "NodeC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeC_Children(), this.getNodeC(), this.getNodeC_Parent(), "children", null, 0, -1, NodeC.class,
+    initEReference(getNodeC_Children(), getNodeC(), getNodeC_Parent(), "children", null, 0, -1, NodeC.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_Parent(), this.getNodeC(), this.getNodeC_Children(), "parent", null, 0, 1, NodeC.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_Parent(), getNodeC(), getNodeC_Children(), "parent", null, 0, 1, NodeC.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNodeC_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeC.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OtherNodes(), this.getNodeC(), this.getNodeC_OppositeNodes(), "otherNodes", null, 0, -1,
-        NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OppositeNodes(), this.getNodeC(), this.getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1,
+    initEReference(getNodeC_OtherNodes(), getNodeC(), getNodeC_OppositeNodes(), "otherNodes", null, 0, -1, NodeC.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_OppositeNodes(), getNodeC(), getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1,
         NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeDEClass, NodeD.class, "NodeD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeD_Children(), this.getNodeD(), this.getNodeD_Parent(), "children", null, 0, -1, NodeD.class,
+    initEReference(getNodeD_Children(), getNodeD(), getNodeD_Parent(), "children", null, 0, -1, NodeD.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_Parent(), this.getNodeD(), this.getNodeD_Children(), "parent", null, 0, 1, NodeD.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_Parent(), getNodeD(), getNodeD_Children(), "parent", null, 0, 1, NodeD.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNodeD_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeD.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OtherNodes(), this.getNodeD(), this.getNodeD_OppositeNode(), "otherNodes", null, 0, -1,
-        NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OppositeNode(), this.getNodeD(), this.getNodeD_OtherNodes(), "oppositeNode", null, 0, 1,
-        NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OtherNodes(), getNodeD(), getNodeD_OppositeNode(), "otherNodes", null, 0, -1, NodeD.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OppositeNode(), getNodeD(), getNodeD_OtherNodes(), "oppositeNode", null, 0, 1, NodeD.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeEEClass, NodeE.class, "NodeE", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeE_MainNode(), this.getNodeA(), null, "mainNode", null, 0, 1, NodeE.class, !IS_TRANSIENT,
+    initEReference(getNodeE_MainNode(), getNodeA(), null, "mainNode", null, 0, 1, NodeE.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
     initEAttribute(getNodeE_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeE.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeE_OtherNodes(), this.getNodeA(), null, "otherNodes", null, 0, -1, NodeE.class, !IS_TRANSIENT,
+    initEReference(getNodeE_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeE.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -896,8 +901,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
     EGenericType g2 = createEGenericType();
     g1.getETypeArguments().add(g2);
     initEAttribute(getClassWithJavaClassAttribute_JavaClass(), g1, "javaClass", null, 0, 1,
-        ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(classWithJavaObjectAttributeEClass, ClassWithJavaObjectAttribute.class, "ClassWithJavaObjectAttribute",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -919,7 +924,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   /**
    * Initializes the annotations for <b>teneo.jpa</b>.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   protected void createTeneoAnnotations()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java
index f57af5e3e8..9aa2478782 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java
index a3e6ccd38f..beffa0d48e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java
index cec2ca136a..b8ead64eea 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java
index c0c2980c51..7880057533 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java
index 23da1f86a6..5ac58b581f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java
index 365f117fc3..f8ed9e45e6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java
index bef13b9f3e..938081d6c7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java
@@ -88,7 +88,9 @@ public class Class1Impl extends EObjectImpl implements Class1
   public void unsetClass2()
   {
     if (class2 != null)
+    {
       ((InternalEList.Unsettable<?>)class2).unset();
+    }
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithIDAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithIDAttributeImpl.java
index 64fd888f13..e36a3d6bb9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithIDAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithIDAttributeImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -87,7 +87,9 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID
     String oldId = id;
     id = newId;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS_WITH_ID_ATTRIBUTE__ID, oldId, id));
+    }
   }
 
   /**
@@ -160,7 +162,9 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (id: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java
index 910ae76135..63c711f8c7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java
@@ -84,8 +84,10 @@ public class ClassWithJavaClassAttributeImpl extends EObjectImpl implements Clas
     Class<?> oldJavaClass = javaClass;
     javaClass = newJavaClass;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS,
           oldJavaClass, javaClass));
+    }
   }
 
   /**
@@ -163,7 +165,9 @@ public class ClassWithJavaClassAttributeImpl extends EObjectImpl implements Clas
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (javaClass: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java
index c09973bd1a..9fad5cffc5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java
@@ -94,8 +94,10 @@ public class ClassWithJavaObjectAttributeImpl extends EObjectImpl implements Cla
     Object oldJavaObject = javaObject;
     javaObject = newJavaObject;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT, oldJavaObject, javaObject));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT,
+          oldJavaObject, javaObject));
+    }
   }
 
   /**
@@ -173,7 +175,9 @@ public class ClassWithJavaObjectAttributeImpl extends EObjectImpl implements Cla
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (javaObject: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/FileImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/FileImpl.java
index b5ee4ec4e9..41406305b7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/FileImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/FileImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -36,7 +36,7 @@ public class FileImpl extends EObjectImpl implements File
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -55,7 +55,7 @@ public class FileImpl extends EObjectImpl implements File
   /**
    * The default value of the '{@link #getData() <em>Data</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getData()
    * @generated
    * @ordered
@@ -108,7 +108,9 @@ public class FileImpl extends EObjectImpl implements File
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.FILE__NAME, oldName, name));
+    }
   }
 
   /**
@@ -129,7 +131,9 @@ public class FileImpl extends EObjectImpl implements File
     CDOClob oldData = data;
     data = newData;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.FILE__DATA, oldData, data));
+    }
   }
 
   /**
@@ -212,7 +216,9 @@ public class FileImpl extends EObjectImpl implements File
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ImageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ImageImpl.java
index 0a85d200fe..d9320c4615 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ImageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ImageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -37,7 +37,7 @@ public class ImageImpl extends EObjectImpl implements Image
   /**
    * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getWidth()
    * @generated
    * @ordered
@@ -47,7 +47,7 @@ public class ImageImpl extends EObjectImpl implements Image
   /**
    * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getWidth()
    * @generated
    * @ordered
@@ -67,7 +67,7 @@ public class ImageImpl extends EObjectImpl implements Image
   /**
    * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getHeight()
    * @generated
    * @ordered
@@ -77,7 +77,7 @@ public class ImageImpl extends EObjectImpl implements Image
   /**
    * The default value of the '{@link #getData() <em>Data</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getData()
    * @generated
    * @ordered
@@ -130,7 +130,9 @@ public class ImageImpl extends EObjectImpl implements Image
     int oldWidth = width;
     width = newWidth;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.IMAGE__WIDTH, oldWidth, width));
+    }
   }
 
   /**
@@ -151,7 +153,9 @@ public class ImageImpl extends EObjectImpl implements Image
     int oldHeight = height;
     height = newHeight;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.IMAGE__HEIGHT, oldHeight, height));
+    }
   }
 
   /**
@@ -172,7 +176,9 @@ public class ImageImpl extends EObjectImpl implements Image
     CDOBlob oldData = data;
     data = newData;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.IMAGE__DATA, oldData, data));
+    }
   }
 
   /**
@@ -265,7 +271,9 @@ public class ImageImpl extends EObjectImpl implements Image
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (width: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/MetaRefImpl.java
index 44e68fb929..1c81217471 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/MetaRefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/MetaRefImpl.java
@@ -98,8 +98,10 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
       if (ePackageRef != oldEPackageRef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__EPACKAGE_REF,
               oldEPackageRef, ePackageRef));
+        }
       }
     }
     return ePackageRef;
@@ -123,8 +125,10 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
     EPackage oldEPackageRef = ePackageRef;
     ePackageRef = newEPackageRef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__EPACKAGE_REF, oldEPackageRef,
           ePackageRef));
+    }
   }
 
   /**
@@ -140,8 +144,10 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
       if (eClassRef != oldEClassRef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__ECLASS_REF, oldEClassRef,
               eClassRef));
+        }
       }
     }
     return eClassRef;
@@ -165,7 +171,10 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
     EClass oldEClassRef = eClassRef;
     eClassRef = newEClassRef;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__ECLASS_REF, oldEClassRef, eClassRef));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__ECLASS_REF, oldEClassRef, eClassRef));
+    }
   }
 
   /**
@@ -181,8 +190,10 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
       if (eReferenceRef != oldEReferenceRef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__EREFERENCE_REF,
               oldEReferenceRef, eReferenceRef));
+        }
       }
     }
     return eReferenceRef;
@@ -206,8 +217,10 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
     EReference oldEReferenceRef = eReferenceRef;
     eReferenceRef = newEReferenceRef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__EREFERENCE_REF, oldEReferenceRef,
           eReferenceRef));
+    }
   }
 
   /**
@@ -221,15 +234,21 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef
     {
     case Model3Package.META_REF__EPACKAGE_REF:
       if (resolve)
+      {
         return getEPackageRef();
+      }
       return basicGetEPackageRef();
     case Model3Package.META_REF__ECLASS_REF:
       if (resolve)
+      {
         return getEClassRef();
+      }
       return basicGetEClassRef();
     case Model3Package.META_REF__EREFERENCE_REF:
       if (resolve)
+      {
         return getEReferenceRef();
+      }
       return basicGetEReferenceRef();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java
index 2894749e30..11034835b7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java
@@ -146,7 +146,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package#eNS_URI
    * @see #init()
@@ -165,7 +165,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Model3Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -178,11 +178,13 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public static Model3Package init()
   {
     if (isInited)
+    {
       return (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model3PackageImpl());
+    Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model3PackageImpl());
 
     isInited = true;
 
@@ -191,8 +193,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
     // Obtain or create and register interdependencies
     SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(SubpackagePackage.eNS_URI) : SubpackagePackage.eINSTANCE);
+        .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl
+            ? EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI) : SubpackagePackage.eINSTANCE);
 
     // Create package meta-data objects
     theModel3Package.createPackageContents();
@@ -674,7 +676,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -758,7 +762,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -799,74 +805,73 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygon_Points(), this.getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPolygon_Points(), getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(polygonWithDuplicatesEClass, PolygonWithDuplicates.class, "PolygonWithDuplicates", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygonWithDuplicates_Points(), this.getPoint(), "points", null, 1, -1,
-        PolygonWithDuplicates.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPolygonWithDuplicates_Points(), getPoint(), "points", null, 1, -1, PolygonWithDuplicates.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeAEClass, NodeA.class, "NodeA", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeA_Children(), this.getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT,
+    initEReference(getNodeA_Children(), getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
     initEAttribute(getNodeA_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeA.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeA_OtherNodes(), this.getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT,
+    initEReference(getNodeA_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(nodeBEClass, NodeB.class, "NodeB", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeB_Children(), this.getNodeB(), this.getNodeB_Parent(), "children", null, 0, -1, NodeB.class,
+    initEReference(getNodeB_Children(), getNodeB(), getNodeB_Parent(), "children", null, 0, -1, NodeB.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeB_Parent(), this.getNodeB(), this.getNodeB_Children(), "parent", null, 0, 1, NodeB.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeB_Parent(), getNodeB(), getNodeB_Children(), "parent", null, 0, 1, NodeB.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNodeB_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeB.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeCEClass, NodeC.class, "NodeC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeC_Children(), this.getNodeC(), this.getNodeC_Parent(), "children", null, 0, -1, NodeC.class,
+    initEReference(getNodeC_Children(), getNodeC(), getNodeC_Parent(), "children", null, 0, -1, NodeC.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_Parent(), this.getNodeC(), this.getNodeC_Children(), "parent", null, 0, 1, NodeC.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_Parent(), getNodeC(), getNodeC_Children(), "parent", null, 0, 1, NodeC.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNodeC_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeC.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OtherNodes(), this.getNodeC(), this.getNodeC_OppositeNodes(), "otherNodes", null, 0, -1,
-        NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OppositeNodes(), this.getNodeC(), this.getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1,
+    initEReference(getNodeC_OtherNodes(), getNodeC(), getNodeC_OppositeNodes(), "otherNodes", null, 0, -1, NodeC.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_OppositeNodes(), getNodeC(), getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1,
         NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeDEClass, NodeD.class, "NodeD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeD_Children(), this.getNodeD(), this.getNodeD_Parent(), "children", null, 0, -1, NodeD.class,
+    initEReference(getNodeD_Children(), getNodeD(), getNodeD_Parent(), "children", null, 0, -1, NodeD.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_Parent(), this.getNodeD(), this.getNodeD_Children(), "parent", null, 0, 1, NodeD.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_Parent(), getNodeD(), getNodeD_Children(), "parent", null, 0, 1, NodeD.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getNodeD_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeD.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OtherNodes(), this.getNodeD(), this.getNodeD_OppositeNode(), "otherNodes", null, 0, -1,
-        NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OppositeNode(), this.getNodeD(), this.getNodeD_OtherNodes(), "oppositeNode", null, 0, 1,
-        NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OtherNodes(), getNodeD(), getNodeD_OppositeNode(), "otherNodes", null, 0, -1, NodeD.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OppositeNode(), getNodeD(), getNodeD_OtherNodes(), "oppositeNode", null, 0, 1, NodeD.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeEEClass, NodeE.class, "NodeE", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeE_MainNode(), this.getNodeA(), null, "mainNode", null, 0, 1, NodeE.class, !IS_TRANSIENT,
+    initEReference(getNodeE_MainNode(), getNodeA(), null, "mainNode", null, 0, 1, NodeE.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
     initEAttribute(getNodeE_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeE.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeE_OtherNodes(), this.getNodeA(), null, "otherNodes", null, 0, -1, NodeE.class, !IS_TRANSIENT,
+    initEReference(getNodeE_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeE.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -896,8 +901,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
     EGenericType g2 = createEGenericType();
     g1.getETypeArguments().add(g2);
     initEAttribute(getClassWithJavaClassAttribute_JavaClass(), g1, "javaClass", null, 0, 1,
-        ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(classWithJavaObjectAttributeEClass, ClassWithJavaObjectAttribute.class, "ClassWithJavaObjectAttribute",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeAImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeAImpl.java
index d12fd9a3bd..c309bf8b8d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeAImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeAImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -54,7 +54,7 @@ public class NodeAImpl extends EObjectImpl implements NodeA
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -130,7 +130,9 @@ public class NodeAImpl extends EObjectImpl implements NodeA
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_A__NAME, oldName, name));
+    }
   }
 
   /**
@@ -254,7 +256,9 @@ public class NodeAImpl extends EObjectImpl implements NodeA
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java
index 78d85b1d57..3df5023be5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -54,7 +54,7 @@ public class NodeBImpl extends EObjectImpl implements NodeB
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -110,7 +110,9 @@ public class NodeBImpl extends EObjectImpl implements NodeB
   public NodeB getParent()
   {
     if (eContainerFeatureID() != Model3Package.NODE_B__PARENT)
+    {
       return null;
+    }
     return (NodeB)eContainer();
   }
 
@@ -130,22 +132,31 @@ public class NodeBImpl extends EObjectImpl implements NodeB
    */
   public void setParent(NodeB newParent)
   {
-    if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != Model3Package.NODE_B__PARENT && newParent != null))
+    if (newParent != eInternalContainer() || eContainerFeatureID() != Model3Package.NODE_B__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, Model3Package.NODE_B__CHILDREN, NodeB.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_B__PARENT, newParent, newParent));
+    }
   }
 
   /**
@@ -166,7 +177,9 @@ public class NodeBImpl extends EObjectImpl implements NodeB
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_B__NAME, oldName, name));
+    }
   }
 
   /**
@@ -183,7 +196,9 @@ public class NodeBImpl extends EObjectImpl implements NodeB
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
     case Model3Package.NODE_B__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((NodeB)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -313,7 +328,9 @@ public class NodeBImpl extends EObjectImpl implements NodeB
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java
index 236caedf7f..5e42c8adc5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -57,7 +57,7 @@ public class NodeCImpl extends EObjectImpl implements NodeC
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -133,7 +133,9 @@ public class NodeCImpl extends EObjectImpl implements NodeC
   public NodeC getParent()
   {
     if (eContainerFeatureID() != Model3Package.NODE_C__PARENT)
+    {
       return null;
+    }
     return (NodeC)eContainer();
   }
 
@@ -153,22 +155,31 @@ public class NodeCImpl extends EObjectImpl implements NodeC
    */
   public void setParent(NodeC newParent)
   {
-    if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != Model3Package.NODE_C__PARENT && newParent != null))
+    if (newParent != eInternalContainer() || eContainerFeatureID() != Model3Package.NODE_C__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, Model3Package.NODE_C__CHILDREN, NodeC.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_C__PARENT, newParent, newParent));
+    }
   }
 
   /**
@@ -189,7 +200,9 @@ public class NodeCImpl extends EObjectImpl implements NodeC
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_C__NAME, oldName, name));
+    }
   }
 
   /**
@@ -234,7 +247,9 @@ public class NodeCImpl extends EObjectImpl implements NodeC
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
     case Model3Package.NODE_C__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((NodeC)otherEnd, msgs);
     case Model3Package.NODE_C__OTHER_NODES:
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getOtherNodes()).basicAdd(otherEnd, msgs);
@@ -394,7 +409,9 @@ public class NodeCImpl extends EObjectImpl implements NodeC
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java
index e0dc17a692..5bd1b9b108 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -57,7 +57,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -133,7 +133,9 @@ public class NodeDImpl extends EObjectImpl implements NodeD
   public NodeD getParent()
   {
     if (eContainerFeatureID() != Model3Package.NODE_D__PARENT)
+    {
       return null;
+    }
     return (NodeD)eContainer();
   }
 
@@ -153,22 +155,31 @@ public class NodeDImpl extends EObjectImpl implements NodeD
    */
   public void setParent(NodeD newParent)
   {
-    if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != Model3Package.NODE_D__PARENT && newParent != null))
+    if (newParent != eInternalContainer() || eContainerFeatureID() != Model3Package.NODE_D__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, Model3Package.NODE_D__CHILDREN, NodeD.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_D__PARENT, newParent, newParent));
+    }
   }
 
   /**
@@ -189,7 +200,9 @@ public class NodeDImpl extends EObjectImpl implements NodeD
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_D__NAME, oldName, name));
+    }
   }
 
   /**
@@ -219,8 +232,10 @@ public class NodeDImpl extends EObjectImpl implements NodeD
       if (oppositeNode != oldOppositeNode)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.NODE_D__OPPOSITE_NODE,
               oldOppositeNode, oppositeNode));
+        }
       }
     }
     return oppositeNode;
@@ -248,9 +263,13 @@ public class NodeDImpl extends EObjectImpl implements NodeD
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model3Package.NODE_D__OPPOSITE_NODE, oldOppositeNode, newOppositeNode);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -265,18 +284,26 @@ public class NodeDImpl extends EObjectImpl implements NodeD
     {
       NotificationChain msgs = null;
       if (oppositeNode != null)
+      {
         msgs = ((InternalEObject)oppositeNode).eInverseRemove(this, Model3Package.NODE_D__OTHER_NODES, NodeD.class,
             msgs);
+      }
       if (newOppositeNode != null)
+      {
         msgs = ((InternalEObject)newOppositeNode).eInverseAdd(this, Model3Package.NODE_D__OTHER_NODES, NodeD.class,
             msgs);
+      }
       msgs = basicSetOppositeNode(newOppositeNode, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_D__OPPOSITE_NODE, newOppositeNode,
           newOppositeNode));
+    }
   }
 
   /**
@@ -293,14 +320,18 @@ public class NodeDImpl extends EObjectImpl implements NodeD
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
     case Model3Package.NODE_D__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((NodeD)otherEnd, msgs);
     case Model3Package.NODE_D__OTHER_NODES:
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getOtherNodes()).basicAdd(otherEnd, msgs);
     case Model3Package.NODE_D__OPPOSITE_NODE:
       if (oppositeNode != null)
+      {
         msgs = ((InternalEObject)oppositeNode).eInverseRemove(this, Model3Package.NODE_D__OTHER_NODES, NodeD.class,
             msgs);
+      }
       return basicSetOppositeNode((NodeD)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -361,7 +392,9 @@ public class NodeDImpl extends EObjectImpl implements NodeD
       return getOtherNodes();
     case Model3Package.NODE_D__OPPOSITE_NODE:
       if (resolve)
+      {
         return getOppositeNode();
+      }
       return basicGetOppositeNode();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -457,7 +490,9 @@ public class NodeDImpl extends EObjectImpl implements NodeD
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonImpl.java
index 5e496b24bb..202b31c826 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -148,7 +148,9 @@ public class PolygonImpl extends EObjectImpl implements Polygon
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (points: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonWithDuplicatesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonWithDuplicatesImpl.java
index 639a8e9aa2..5add5a88e1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonWithDuplicatesImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonWithDuplicatesImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -149,7 +149,9 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (points: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java
index 3db8fb4f99..29cb2371b7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackageFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackageFactory.java
index 8644f85688..6a52e56ee7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackageFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackageFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java
index d00b34d4b9..75d8efc83b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/Class2Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/Class2Impl.java
index df0354b62e..aa125969f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/Class2Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/Class2Impl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
index 94a234493c..4c1959e8cd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -41,7 +41,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage#eNS_URI
    * @see #init()
@@ -60,7 +60,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link SubpackagePackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc
@@ -73,11 +73,14 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   public static SubpackagePackage init()
   {
     if (isInited)
+    {
       return (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new SubpackagePackageImpl());
+    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new SubpackagePackageImpl());
 
     isInited = true;
 
@@ -86,8 +89,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
     // Obtain or create and register interdependencies
     Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE);
+        .getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl
+            ? EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE);
 
     // Create package meta-data objects
     theSubpackagePackage.createPackageContents();
@@ -147,7 +150,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -170,7 +175,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java
index 3252349f4b..28b63b2762 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java
@@ -41,7 +41,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage#eNS_URI
    * @see #init()
@@ -60,7 +60,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link SubpackagePackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc
@@ -73,11 +73,14 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   public static SubpackagePackage init()
   {
     if (isInited)
+    {
       return (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new SubpackagePackageImpl());
+    SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new SubpackagePackageImpl());
 
     isInited = true;
 
@@ -86,8 +89,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
     // Obtain or create and register interdependencies
     Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE);
+        .getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl
+            ? EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE);
 
     // Create package meta-data objects
     theSubpackagePackage.createPackageContents();
@@ -147,7 +150,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -170,7 +175,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java
index 31eb7e231c..11fd58e082 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java
@@ -105,7 +105,9 @@ public class SubpackageSwitch<T>
       Class2 class2 = (Class2)theEObject;
       T result = caseClass2(class2);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java
index e97ed99f5d..7301b1b339 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java
@@ -95,7 +95,9 @@ public class SubpackageSwitch<T>
       Class2 class2 = (Class2)theEObject;
       T result = caseClass2(class2);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF
index ea53be28e7..f08a3c8c1a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model4;singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.tests.model4;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4.legacy;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4.legacy.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4.legacy.util;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4.util;version="3.0.400"
+Export-Package: org.eclipse.emf.cdo.tests.model4;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4.legacy;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4.legacy.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4.legacy.util;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4.util;version="3.0.500"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java
index 5b599468d3..7bf654c2a0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java
index 6bb40898a9..69a07aa427 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java
index c702e77cf2..da0bc19206 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java
index 9596315179..fbffc042ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java
index 03b90b78a3..0ad11d55e9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java
index 9c86793cb8..9aab8c771e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java
index 7a13558154..02372644f7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java
index 0e9fad0f10..4c6aeaa93e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java
index 2822537dac..054cc7cefc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java
index 861497c308..5410cee022 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java
index 7a6a3a0f62..e6d89613ba 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java
index 861635c0f6..d5b8b0dd2d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java
index 91a0f080f7..9e564bee7b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java
index ff07b95c68..614c3e3611 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java
index 400f69c158..7a0020bbc8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java
index c80f7dafb6..e011865bc9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java
index d20dfbee60..0779c70f2c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java
index 9aca90da72..269389c5c8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java
index 1c06fe3894..12385e3fbb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java
index 7b261d0747..6a0fa42f13 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java
index 29ff8e87b6..40c8de468c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java
index 73d5396c76..32c244fc1d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java
index 5380575882..94121e36dc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -62,7 +62,7 @@ public interface MultiNonContainedUnsettableElement extends EObject
    * If the meaning of the '<em>Parent</em>' reference isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Parent</em>' reference.
    * @see #isSetParent()
    * @see #unsetParent()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java
index e046f184e2..0d28ecac22 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model4.RefMultiContained#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiContained()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java
index 482aba6a3b..c5eef14e0d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java
index 9a0eb23867..b7ab140298 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java
index d639b269c6..46d13d5d37 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java
index 2db0a46ccd..7c1825ad59 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -40,7 +40,7 @@ public interface RefMultiNonContainedUnsettable extends EObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Elements</em>' reference list.
    * @see #isSetElements()
    * @see #unsetElements()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java
index bfbce1f7a6..75d8d11ac7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java
index 0c993c6623..fb097ddb8a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java
index 3da37acfe2..826eadfbab 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java
index 385fd81e76..f7ecc03533 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java
index 085ccbc183..acb1e1495b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java
index a7c1a1b916..678147ada6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java
index 5151803b85..6a47a01dfb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java
index 6d6c41bd78..150e40af04 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java
index a1242169a2..b148340ba6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java
index 6a7aea5fbf..8b45a123c6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java
index 44871a1ff3..a394875b56 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java
index 93c4df4857..7d23f414fd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java
index ac43013595..50815cabbd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java
index 793fe3ade0..ee7468e9ab 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java
index aa577d6e97..c99ce8f868 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java
index 85d94169e6..1e6e5d1faa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java
index 2e44bcaef4..9120fa2a20 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java
index 02831b9242..d6b54ae0f6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -69,7 +69,8 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement
    */
   public IMultiRefNonContainer getParent()
   {
-    return (IMultiRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(), true);
+    return (IMultiRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(),
+        true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java
index 4649e050d5..fc70bfaeeb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java
index 7a8f903622..1b51635af1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java
index c46eb8a087..2a9e295441 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java
index 6148c99efc..f04e25720a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java
index 86a758b707..659752c9d7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java
index 5215354874..edff549562 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java
index bf3a485126..6b1438a19a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java
index 6d1cd93be7..3469572ece 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -68,8 +68,8 @@ public class ImplSingleRefNonContainerNPLImpl extends CDOObjectImpl implements I
    */
   public IContainedElementNoParentLink getElement()
   {
-    return (IContainedElementNoParentLink)eGet(
-        model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(), true);
+    return (IContainedElementNoParentLink)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(),
+        true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java
index bf957cc9f4..95a68a92df 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java
index 6cded8a990..b64f05d7e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java
index ac0210bff7..7f407912f5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java
index 365c754a7e..d168ae1ba0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java
index 2813ef08f6..4a168a4488 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java
index 33de3c2425..ada91444fe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java
index 3432ef2bf3..e99f7074fd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java
index dea131bfcd..085230be6f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java
index d643b263a4..739a2d7566 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java
index 88bc907f13..57c713eaaf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java
index 6b4c75ef01..3a664539eb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java
index a229ba6059..1499a2f136 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java
index ce69395071..bc33c8e0b1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java
index be0e7ac829..3455a952d0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java
index cfb367afad..493de8e95c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entry<String, EObject>
@@ -114,7 +114,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
index bc25132bab..b686c6dee2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -279,7 +279,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.model4.model4Package#eNS_URI
    * @see #init()
@@ -298,7 +298,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link model4Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -311,11 +311,13 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
   public static model4Package init()
   {
     if (isInited)
+    {
       return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new model4PackageImpl());
+    model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4PackageImpl());
 
     isInited = true;
 
@@ -963,7 +965,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -1085,7 +1089,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -1104,13 +1110,13 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     // Add supertypes to classes
     implSingleRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainer());
     implSingleRefContainedElementEClass.getESuperTypes()
-        .add(themodel4interfacesPackage.getISingleRefContainedElement());
+    .add(themodel4interfacesPackage.getISingleRefContainedElement());
     implSingleRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefNonContainer());
-    implSingleRefNonContainedElementEClass.getESuperTypes().add(
-        themodel4interfacesPackage.getISingleRefNonContainedElement());
+    implSingleRefNonContainedElementEClass.getESuperTypes()
+        .add(themodel4interfacesPackage.getISingleRefNonContainedElement());
     implMultiRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefNonContainer());
-    implMultiRefNonContainedElementEClass.getESuperTypes().add(
-        themodel4interfacesPackage.getIMultiRefNonContainedElement());
+    implMultiRefNonContainedElementEClass.getESuperTypes()
+        .add(themodel4interfacesPackage.getIMultiRefNonContainedElement());
     implMultiRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainer());
     implMultiRefContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainedElement());
     implSingleRefContainerNPLEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainerNPL());
@@ -1123,25 +1129,23 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     // Initialize classes and features; add operations and parameters
     initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContained_Element(), this.getSingleContainedElement(),
-        this.getSingleContainedElement_Parent(), "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(),
+        "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleContainedElement_Parent(), this.getRefSingleContained(),
-        this.getRefSingleContained_Element(), "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(),
+        "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(),
-        this.getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT,
+    initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(),
+        getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -1150,91 +1154,88 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(),
-        this.getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
+    initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(),
+        getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContained_Elements(), this.getMultiContainedElement(),
-        this.getMultiContainedElement_Parent(), "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(),
+        "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiContainedElement_Parent(), this.getRefMultiContained(),
-        this.getRefMultiContained_Elements(), "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), "parent",
+        null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(),
-        this.getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT,
+    initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(),
+        getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiNonContainedElement_Parent(), this.getRefMultiNonContained(),
-        this.getRefMultiNonContained_Elements(), "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(),
+        "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class,
         "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(),
-        this.getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1,
-        RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(),
+        getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class,
         "MultiNonContainedUnsettableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiNonContainedUnsettableElement_Parent(), this.getRefMultiNonContainedUnsettable(),
-        this.getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1,
-        MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(),
+        getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, 0,
-        1, RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
+        RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null,
-        0, 1, RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
+        RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, 0,
-        -1, RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1,
+        RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null,
-        0, -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0,
+        -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getContainedElementNoOpposite_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(genRefSingleContainedEClass, GenRefSingleContained.class, "GenRefSingleContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1242,8 +1243,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
         GenRefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getGenRefSingleNonContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1,
         GenRefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1278,8 +1279,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
         ImplSingleRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(implMultiRefNonContainedElementEClass, ImplMultiRefNonContainedElement.class,
         "ImplMultiRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1302,8 +1303,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     initEClass(implSingleRefNonContainerNPLEClass, ImplSingleRefNonContainerNPL.class, "ImplSingleRefNonContainerNPL",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(implMultiRefNonContainerNPLEClass, ImplMultiRefNonContainerNPL.class, "ImplMultiRefNonContainerNPL",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1314,12 +1315,12 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     initEClass(genRefMultiNUNonContainedEClass, GenRefMultiNUNonContained.class, "GenRefMultiNUNonContained",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getGenRefMultiNUNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1,
-        GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMapNonContained_Elements(), this.getStringToEObject(), null, "elements", null, 0, -1,
+    initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1,
         GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java
index 2d336ce1f9..97cf2bd535 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -35,7 +35,7 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -88,8 +88,10 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, oldName,
           name));
+    }
   }
 
   /**
@@ -162,7 +164,9 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java
index d27ba19e02..25b90cf580 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java
@@ -40,7 +40,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
   /**
    * The cached value of the '{@link #getElements() <em>Elements</em>}' map. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getElements()
    * @generated
    * @ordered
@@ -74,8 +74,8 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
   {
     if (elements == null)
     {
-      elements = new EcoreEMap<String, EObject>(model4Package.eINSTANCE.getStringToEObject(),
-          StringToEObjectImpl.class, this, model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS);
+      elements = new EcoreEMap<String, EObject>(model4Package.eINSTANCE.getStringToEObject(), StringToEObjectImpl.class,
+          this, model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS);
     }
     return elements;
   }
@@ -106,9 +106,13 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN
     {
     case model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS:
       if (coreType)
+      {
         return getElements();
+      }
       else
+      {
         return getElements().map();
+      }
     }
     return super.eGet(featureID, resolve, coreType);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java
index f58d144336..d31a2dd850 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java
@@ -86,9 +86,13 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -103,18 +107,26 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing
     {
       NotificationChain msgs = null;
       if (element != null)
-        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)element).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
+      }
       if (newElement != null)
-        msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)newElement).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
+      }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT,
-          newElement, newElement));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, newElement,
+          newElement));
+    }
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java
index 97fc51d96a..85b6b81466 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java
@@ -76,8 +76,10 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
       if (element != oldElement)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element));
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT,
+              oldElement, element));
+        }
       }
     }
     return element;
@@ -101,8 +103,10 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
     EObject oldElement = element;
     element = newElement;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT,
           oldElement, element));
+    }
   }
 
   /**
@@ -116,7 +120,9 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS
     {
     case model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT:
       if (resolve)
+      {
         return getElement();
+      }
       return basicGetElement();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java
index 0cb1da80e3..fe9ff35d30 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java
@@ -37,7 +37,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -90,8 +90,10 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_CONTAINED_ELEMENT_NPL__NAME, oldName,
-          name));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, model4Package.IMPL_CONTAINED_ELEMENT_NPL__NAME, oldName, name));
+    }
   }
 
   /**
@@ -204,7 +206,9 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java
index 8e77447a49..110320156d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java
@@ -41,7 +41,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -83,7 +83,9 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
   public IMultiRefContainer getParent()
   {
     if (eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT)
+    {
       return null;
+    }
     return (IMultiRefContainer)eContainer();
   }
 
@@ -104,23 +106,33 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
   public void setParent(IMultiRefContainer newParent)
   {
     if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null))
+        || eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_CONTAINER__ELEMENTS,
             IMultiRefContainer.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT,
           newParent, newParent));
+    }
   }
 
   /**
@@ -141,8 +153,10 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME,
           oldName, name));
+    }
   }
 
   /**
@@ -156,7 +170,9 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
     {
     case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((IMultiRefContainer)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -273,7 +289,9 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java
index 4fc5fa087e..a80f53e223 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java
@@ -40,7 +40,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getParent()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -98,8 +98,10 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
       if (parent != oldParent)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent));
+        }
       }
     }
     return parent;
@@ -127,9 +129,13 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -144,18 +150,26 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
     {
       NotificationChain msgs = null;
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this,
             model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this,
             model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT,
           newParent, newParent));
+    }
   }
 
   /**
@@ -176,8 +190,10 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME,
           oldName, name));
+    }
   }
 
   /**
@@ -191,8 +207,10 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
     {
     case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT:
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this,
             model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs);
+      }
       return basicSetParent((IMultiRefNonContainer)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -224,7 +242,9 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
     {
     case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT:
       if (resolve)
+      {
         return getParent();
+      }
       return basicGetParent();
     case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME:
       return getName();
@@ -295,7 +315,9 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java
index 4e856f8417..697ff7d7e4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java
@@ -41,7 +41,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -83,7 +83,9 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
   public ISingleRefContainer getParent()
   {
     if (eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT)
+    {
       return null;
+    }
     return (ISingleRefContainer)eContainer();
   }
 
@@ -93,7 +95,8 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
    */
   public NotificationChain basicSetParent(ISingleRefContainer newParent, NotificationChain msgs)
   {
-    msgs = eBasicSetContainer((InternalEObject)newParent, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT, msgs);
+    msgs = eBasicSetContainer((InternalEObject)newParent, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT,
+        msgs);
     return msgs;
   }
 
@@ -104,23 +107,33 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
   public void setParent(ISingleRefContainer newParent)
   {
     if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null))
+        || eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINER__ELEMENT,
             ISingleRefContainer.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT,
           newParent, newParent));
+    }
   }
 
   /**
@@ -141,8 +154,10 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME,
           oldName, name));
+    }
   }
 
   /**
@@ -156,7 +171,9 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
     {
     case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((ISingleRefContainer)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -273,7 +290,9 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java
index 1a8c4d76d8..79bdaa778a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java
@@ -87,9 +87,13 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, oldElement, newElement);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -104,18 +108,26 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
     {
       NotificationChain msgs = null;
       if (element != null)
+      {
         msgs = ((InternalEObject)element).eInverseRemove(this,
             model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs);
+      }
       if (newElement != null)
+      {
         msgs = ((InternalEObject)newElement).eInverseAdd(this,
             model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs);
+      }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT,
           newElement, newElement));
+    }
   }
 
   /**
@@ -129,8 +141,10 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl
     {
     case model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT:
       if (element != null)
-        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)element).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, null, msgs);
+      }
       return basicSetElement((ISingleRefContainedElement)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java
index aa5e892286..6393190fd7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java
@@ -86,9 +86,13 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, oldElement, newElement);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -103,18 +107,26 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi
     {
       NotificationChain msgs = null;
       if (element != null)
-        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)element).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs);
+      }
       if (newElement != null)
-        msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)newElement).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs);
+      }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT,
           newElement, newElement));
+    }
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java
index 7c1974e28d..d80bd7e115 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java
@@ -40,7 +40,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getParent()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -98,8 +98,10 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
       if (parent != oldParent)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent));
+        }
       }
     }
     return parent;
@@ -127,9 +129,13 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -144,18 +150,26 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
     {
       NotificationChain msgs = null;
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this,
             model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this,
             model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT,
+          newParent, newParent));
+    }
   }
 
   /**
@@ -176,8 +190,10 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME,
           oldName, name));
+    }
   }
 
   /**
@@ -191,8 +207,10 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
     {
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT:
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this,
             model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs);
+      }
       return basicSetParent((ISingleRefNonContainer)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -224,7 +242,9 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
     {
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT:
       if (resolve)
+      {
         return getParent();
+      }
       return basicGetParent();
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME:
       return getName();
@@ -295,7 +315,9 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java
index 956b04f2fa..e504ecdaa5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java
@@ -78,8 +78,10 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
       if (element != oldElement)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, element));
+        }
       }
     }
     return element;
@@ -107,9 +109,13 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, newElement);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -124,20 +130,28 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
     {
       NotificationChain msgs = null;
       if (element != null)
+      {
         msgs = ((InternalEObject)element).eInverseRemove(this,
             model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class,
             msgs);
+      }
       if (newElement != null)
+      {
         msgs = ((InternalEObject)newElement).eInverseAdd(this,
             model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class,
             msgs);
+      }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT,
           newElement, newElement));
+    }
   }
 
   /**
@@ -151,9 +165,11 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
     {
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT:
       if (element != null)
+      {
         msgs = ((InternalEObject)element).eInverseRemove(this,
             model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class,
             msgs);
+      }
       return basicSetElement((ISingleRefNonContainedElement)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -185,7 +201,9 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi
     {
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT:
       if (resolve)
+      {
         return getElement();
+      }
       return basicGetElement();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java
index cae680a5aa..42f1b23818 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java
@@ -76,8 +76,10 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
       if (element != oldElement)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element));
+        }
       }
     }
     return element;
@@ -101,8 +103,10 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
     IContainedElementNoParentLink oldElement = element;
     element = newElement;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT,
           oldElement, element));
+    }
   }
 
   /**
@@ -116,7 +120,9 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp
     {
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT:
       if (resolve)
+      {
         return getElement();
+      }
       return basicGetElement();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java
index 22b11ecad5..b1ad5e8365 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java
@@ -40,7 +40,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -93,7 +93,10 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__NAME, oldName, name));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__NAME, oldName, name));
+    }
   }
 
   /**
@@ -103,7 +106,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
   public RefMultiContained getParent()
   {
     if (eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT)
+    {
       return null;
+    }
     return (RefMultiContained)eContainer();
   }
 
@@ -124,23 +129,33 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
   public void setParent(RefMultiContained newParent)
   {
     if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT && newParent != null))
+        || eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_CONTAINED__ELEMENTS,
             RefMultiContained.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__PARENT, newParent,
           newParent));
+    }
   }
 
   /**
@@ -154,7 +169,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
     {
     case model4Package.MULTI_CONTAINED_ELEMENT__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((RefMultiContained)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -271,7 +288,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java
index dd1827be2a..dfb37e1dab 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java
@@ -39,7 +39,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -58,7 +58,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getParent()
    * @generated
    * @ordered
@@ -102,8 +102,10 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__NAME, oldName,
           name));
+    }
   }
 
   /**
@@ -119,8 +121,10 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
       if (parent != oldParent)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT,
               oldParent, parent));
+        }
       }
     }
     return parent;
@@ -148,9 +152,13 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -165,18 +173,26 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
     {
       NotificationChain msgs = null;
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS,
             RefMultiNonContained.class, msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS,
             RefMultiNonContained.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT,
           newParent, newParent));
+    }
   }
 
   /**
@@ -190,8 +206,10 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
     {
     case model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT:
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS,
             RefMultiNonContained.class, msgs);
+      }
       return basicSetParent((RefMultiNonContained)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -225,7 +243,9 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
       return getName();
     case model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT:
       if (resolve)
+      {
         return getParent();
+      }
       return basicGetParent();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -294,7 +314,9 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java
index b2a0259fdb..90540a204e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java
@@ -39,7 +39,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -58,7 +58,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getParent()
    * @generated
    * @ordered
@@ -110,8 +110,10 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME,
           oldName, name));
+    }
   }
 
   /**
@@ -127,8 +129,10 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
       if (parent != oldParent)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, parent));
+        }
       }
     }
     return parent;
@@ -158,9 +162,13 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, newParent, !oldParentESet);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -175,22 +183,30 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
     {
       NotificationChain msgs = null;
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this,
             model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this,
             model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else
     {
       boolean oldParentESet = parentESet;
       parentESet = true;
       if (eNotificationRequired())
+      {
         eNotify(new ENotificationImpl(this, Notification.SET,
             model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, newParent, newParent, !oldParentESet));
+      }
     }
   }
 
@@ -209,9 +225,13 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
       ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
           model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, null, oldParentESet);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -229,15 +249,19 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
           RefMultiNonContainedUnsettable.class, msgs);
       msgs = basicUnsetParent(msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else
     {
       boolean oldParentESet = parentESet;
       parentESet = false;
       if (eNotificationRequired())
+      {
         eNotify(new ENotificationImpl(this, Notification.UNSET,
             model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, null, null, oldParentESet));
+      }
     }
   }
 
@@ -261,8 +285,10 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
     {
     case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT:
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this,
             model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs);
+      }
       return basicSetParent((RefMultiNonContainedUnsettable)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -296,7 +322,9 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
       return getName();
     case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT:
       if (resolve)
+      {
         return getParent();
+      }
       return basicGetParent();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -365,7 +393,9 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java
index 97944dff84..47185d7bde 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java
@@ -89,7 +89,9 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R
   public void unsetElements()
   {
     if (elements != null)
+    {
       ((InternalEList.Unsettable<?>)elements).unset();
+    }
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java
index b3809e9928..1d8fe38f0b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java
@@ -86,9 +86,13 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -103,18 +107,26 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
     {
       NotificationChain msgs = null;
       if (element != null)
+      {
         msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT,
             SingleContainedElement.class, msgs);
+      }
       if (newElement != null)
+      {
         msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT,
             SingleContainedElement.class, msgs);
+      }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, newElement,
           newElement));
+    }
   }
 
   /**
@@ -128,8 +140,10 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont
     {
     case model4Package.REF_SINGLE_CONTAINED__ELEMENT:
       if (element != null)
-        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - model4Package.REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)element).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED__ELEMENT, null, msgs);
+      }
       return basicSetElement((SingleContainedElement)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java
index 4ee13ec771..a9a6744965 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java
@@ -86,9 +86,13 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, oldElement, newElement);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -103,18 +107,26 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC
     {
       NotificationChain msgs = null;
       if (element != null)
-        msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)element).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs);
+      }
       if (newElement != null)
-        msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)newElement).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs);
+      }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT,
-          newElement, newElement));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, newElement,
+          newElement));
+    }
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java
index dc11015649..56abceede8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java
@@ -77,8 +77,10 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
       if (element != oldElement)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT,
               oldElement, element));
+        }
       }
     }
     return element;
@@ -106,9 +108,13 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, newElement);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -123,18 +129,26 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
     {
       NotificationChain msgs = null;
       if (element != null)
+      {
         msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
             SingleNonContainedElement.class, msgs);
+      }
       if (newElement != null)
+      {
         msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
             SingleNonContainedElement.class, msgs);
+      }
       msgs = basicSetElement(newElement, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT,
-          newElement, newElement));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, newElement,
+          newElement));
+    }
   }
 
   /**
@@ -148,8 +162,10 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
     {
     case model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT:
       if (element != null)
+      {
         msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
             SingleNonContainedElement.class, msgs);
+      }
       return basicSetElement((SingleNonContainedElement)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -181,7 +197,9 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN
     {
     case model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT:
       if (resolve)
+      {
         return getElement();
+      }
       return basicGetElement();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java
index 5f601bbd1b..74f0e98141 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java
@@ -76,8 +76,10 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
       if (element != oldElement)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, oldElement, element));
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT,
+              oldElement, element));
+        }
       }
     }
     return element;
@@ -101,8 +103,10 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
     ContainedElementNoOpposite oldElement = element;
     element = newElement;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT,
           oldElement, element));
+    }
   }
 
   /**
@@ -116,7 +120,9 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing
     {
     case model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT:
       if (resolve)
+      {
         return getElement();
+      }
       return basicGetElement();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java
index 3d1e5c0f4a..d3fb0744ca 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java
@@ -40,7 +40,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -93,7 +93,10 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__NAME, oldName, name));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__NAME, oldName, name));
+    }
   }
 
   /**
@@ -103,7 +106,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
   public RefSingleContained getParent()
   {
     if (eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT)
+    {
       return null;
+    }
     return (RefSingleContained)eContainer();
   }
 
@@ -124,23 +129,33 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
   public void setParent(RefSingleContained newParent)
   {
     if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT && newParent != null))
+        || eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_CONTAINED__ELEMENT,
             RefSingleContained.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, newParent,
           newParent));
+    }
   }
 
   /**
@@ -154,7 +169,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
     {
     case model4Package.SINGLE_CONTAINED_ELEMENT__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((RefSingleContained)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -271,7 +288,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java
index b71652cd6b..ac77c11eef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java
@@ -39,7 +39,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -58,7 +58,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
   /**
    * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getParent()
    * @generated
    * @ordered
@@ -102,8 +102,10 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__NAME, oldName,
           name));
+    }
   }
 
   /**
@@ -119,8 +121,10 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
       if (parent != oldParent)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
               oldParent, parent));
+        }
       }
     }
     return parent;
@@ -148,9 +152,13 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -165,18 +173,26 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
     {
       NotificationChain msgs = null;
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT,
             RefSingleNonContained.class, msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT,
             RefSingleNonContained.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT,
           newParent, newParent));
+    }
   }
 
   /**
@@ -190,8 +206,10 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
     {
     case model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT:
       if (parent != null)
+      {
         msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT,
             RefSingleNonContained.class, msgs);
+      }
       return basicSetParent((RefSingleNonContained)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -225,7 +243,9 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
       return getName();
     case model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT:
       if (resolve)
+      {
         return getParent();
+      }
       return basicGetParent();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -294,7 +314,9 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/StringToEObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/StringToEObjectImpl.java
index 7efaa03a69..6257cff8b3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/StringToEObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/StringToEObjectImpl.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<String, EObject>
@@ -38,7 +38,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
   /**
    * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -48,7 +48,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
   /**
    * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getTypedKey()
    * @generated
    * @ordered
@@ -102,7 +102,9 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
     String oldKey = key;
     key = newKey;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.STRING_TO_EOBJECT__KEY, oldKey, key));
+    }
   }
 
   /**
@@ -123,7 +125,9 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
     EObject oldValue = value;
     value = newValue;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, model4Package.STRING_TO_EOBJECT__VALUE, oldValue, value));
+    }
   }
 
   /**
@@ -206,7 +210,9 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (key: ");
@@ -230,7 +236,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java
index 6bf8c7840e..43d83170ff 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java
@@ -279,7 +279,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#eNS_URI
    * @see #init()
@@ -298,7 +298,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link model4Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -311,11 +311,13 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
   public static model4Package init()
   {
     if (isInited)
+    {
       return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new model4PackageImpl());
+    model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4PackageImpl());
 
     isInited = true;
 
@@ -963,7 +965,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -1085,7 +1089,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -1104,13 +1110,13 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     // Add supertypes to classes
     implSingleRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainer());
     implSingleRefContainedElementEClass.getESuperTypes()
-        .add(themodel4interfacesPackage.getISingleRefContainedElement());
+    .add(themodel4interfacesPackage.getISingleRefContainedElement());
     implSingleRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefNonContainer());
-    implSingleRefNonContainedElementEClass.getESuperTypes().add(
-        themodel4interfacesPackage.getISingleRefNonContainedElement());
+    implSingleRefNonContainedElementEClass.getESuperTypes()
+        .add(themodel4interfacesPackage.getISingleRefNonContainedElement());
     implMultiRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefNonContainer());
-    implMultiRefNonContainedElementEClass.getESuperTypes().add(
-        themodel4interfacesPackage.getIMultiRefNonContainedElement());
+    implMultiRefNonContainedElementEClass.getESuperTypes()
+        .add(themodel4interfacesPackage.getIMultiRefNonContainedElement());
     implMultiRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainer());
     implMultiRefContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainedElement());
     implSingleRefContainerNPLEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainerNPL());
@@ -1123,25 +1129,23 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     // Initialize classes and features; add operations and parameters
     initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContained_Element(), this.getSingleContainedElement(),
-        this.getSingleContainedElement_Parent(), "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(),
+        "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleContainedElement_Parent(), this.getRefSingleContained(),
-        this.getRefSingleContained_Element(), "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(),
+        "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(),
-        this.getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT,
+    initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(),
+        getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -1150,91 +1154,88 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(),
-        this.getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
+    initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(),
+        getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContained_Elements(), this.getMultiContainedElement(),
-        this.getMultiContainedElement_Parent(), "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(),
+        "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiContainedElement_Parent(), this.getRefMultiContained(),
-        this.getRefMultiContained_Elements(), "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), "parent",
+        null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(),
-        this.getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT,
+    initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(),
+        getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
-    initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiNonContainedElement_Parent(), this.getRefMultiNonContained(),
-        this.getRefMultiNonContained_Elements(), "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(),
+        "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class,
         "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(),
-        this.getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1,
-        RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(),
+        getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class,
         "MultiNonContainedUnsettableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiNonContainedUnsettableElement_Parent(), this.getRefMultiNonContainedUnsettable(),
-        this.getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1,
-        MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(),
+        getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, 0,
-        1, RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
+        RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null,
-        0, 1, RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
+        RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, 0,
-        -1, RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1,
+        RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null,
-        0, -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0,
+        -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getContainedElementNoOpposite_Name(), ecorePackage.getEString(), "name", null, 0, 1,
-        ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(genRefSingleContainedEClass, GenRefSingleContained.class, "GenRefSingleContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1242,8 +1243,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
         GenRefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getGenRefSingleNonContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1,
         GenRefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1278,8 +1279,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
         ImplSingleRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(implMultiRefNonContainedElementEClass, ImplMultiRefNonContainedElement.class,
         "ImplMultiRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1302,8 +1303,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     initEClass(implSingleRefNonContainerNPLEClass, ImplSingleRefNonContainerNPL.class, "ImplSingleRefNonContainerNPL",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-    initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL",
-        !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", !IS_ABSTRACT,
+        !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
     initEClass(implMultiRefNonContainerNPLEClass, ImplMultiRefNonContainerNPL.class, "ImplMultiRefNonContainerNPL",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1314,12 +1315,12 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     initEClass(genRefMultiNUNonContainedEClass, GenRefMultiNUNonContained.class, "GenRefMultiNUNonContained",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getGenRefMultiNUNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1,
-        GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getGenRefMapNonContained_Elements(), this.getStringToEObject(), null, "elements", null, 0, -1,
+    initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1,
         GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java
index da1e0080bf..60f2f8f140 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java
@@ -660,7 +660,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
+  int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplSingleRefNonContainerImpl <em>Impl Single Ref Non Container</em>}' class.
@@ -711,7 +712,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
+  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 0;
 
   /**
    * The number of structural features of the '<em>Impl Single Ref Non Contained Element</em>' class. <!--
@@ -720,7 +722,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
+  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplMultiRefNonContainerImpl <em>Impl Multi Ref Non Container</em>}' class.
@@ -771,7 +774,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
+  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 0;
 
   /**
    * The number of structural features of the '<em>Impl Multi Ref Non Contained Element</em>' class.
@@ -780,7 +784,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
+  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplMultiRefContainerImpl <em>Impl Multi Ref Container</em>}' class.
@@ -841,7 +846,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
+  int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplSingleRefContainerNPLImpl <em>Impl Single Ref Container NPL</em>}' class.
@@ -894,7 +900,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
+  int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT
+      + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplMultiRefContainerNPLImpl <em>Impl Multi Ref Container NPL</em>}' class.
@@ -947,7 +954,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
+  int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT
+      + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplContainedElementNPLImpl <em>Impl Contained Element NPL</em>}' class.
@@ -973,7 +981,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model
    * @generated
    * @ordered
    */
-  int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + 1;
+  int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.GenRefMultiNUNonContainedImpl <em>Gen Ref Multi NU Non Contained</em>}' class.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java
index 1617538456..6d54ac6ba5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java
@@ -153,7 +153,9 @@ public class model4Switch<T>
       RefSingleContained refSingleContained = (RefSingleContained)theEObject;
       T result = caseRefSingleContained(refSingleContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.SINGLE_CONTAINED_ELEMENT:
@@ -161,7 +163,9 @@ public class model4Switch<T>
       SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject;
       T result = caseSingleContainedElement(singleContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_SINGLE_NON_CONTAINED:
@@ -169,7 +173,9 @@ public class model4Switch<T>
       RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject;
       T result = caseRefSingleNonContained(refSingleNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.SINGLE_NON_CONTAINED_ELEMENT:
@@ -177,7 +183,9 @@ public class model4Switch<T>
       SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject;
       T result = caseSingleNonContainedElement(singleNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_CONTAINED:
@@ -185,7 +193,9 @@ public class model4Switch<T>
       RefMultiContained refMultiContained = (RefMultiContained)theEObject;
       T result = caseRefMultiContained(refMultiContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.MULTI_CONTAINED_ELEMENT:
@@ -193,7 +203,9 @@ public class model4Switch<T>
       MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject;
       T result = caseMultiContainedElement(multiContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_NON_CONTAINED:
@@ -201,7 +213,9 @@ public class model4Switch<T>
       RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject;
       T result = caseRefMultiNonContained(refMultiNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.MULTI_NON_CONTAINED_ELEMENT:
@@ -209,7 +223,9 @@ public class model4Switch<T>
       MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject;
       T result = caseMultiNonContainedElement(multiNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE:
@@ -217,7 +233,9 @@ public class model4Switch<T>
       RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject;
       T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT:
@@ -225,7 +243,9 @@ public class model4Switch<T>
       MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject;
       T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_SINGLE_CONTAINED_NPL:
@@ -233,7 +253,9 @@ public class model4Switch<T>
       RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject;
       T result = caseRefSingleContainedNPL(refSingleContainedNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_SINGLE_NON_CONTAINED_NPL:
@@ -241,7 +263,9 @@ public class model4Switch<T>
       RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject;
       T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_CONTAINED_NPL:
@@ -249,7 +273,9 @@ public class model4Switch<T>
       RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject;
       T result = caseRefMultiContainedNPL(refMultiContainedNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_NON_CONTAINED_NPL:
@@ -257,7 +283,9 @@ public class model4Switch<T>
       RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject;
       T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE:
@@ -265,7 +293,9 @@ public class model4Switch<T>
       ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject;
       T result = caseContainedElementNoOpposite(containedElementNoOpposite);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_SINGLE_CONTAINED:
@@ -273,7 +303,9 @@ public class model4Switch<T>
       GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject;
       T result = caseGenRefSingleContained(genRefSingleContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_SINGLE_NON_CONTAINED:
@@ -281,7 +313,9 @@ public class model4Switch<T>
       GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject;
       T result = caseGenRefSingleNonContained(genRefSingleNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MULTI_CONTAINED:
@@ -289,7 +323,9 @@ public class model4Switch<T>
       GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject;
       T result = caseGenRefMultiContained(genRefMultiContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MULTI_NON_CONTAINED:
@@ -297,7 +333,9 @@ public class model4Switch<T>
       GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject;
       T result = caseGenRefMultiNonContained(genRefMultiNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_CONTAINER:
@@ -305,9 +343,13 @@ public class model4Switch<T>
       ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject;
       T result = caseImplSingleRefContainer(implSingleRefContainer);
       if (result == null)
+      {
         result = caseISingleRefContainer(implSingleRefContainer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT:
@@ -315,9 +357,13 @@ public class model4Switch<T>
       ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject;
       T result = caseImplSingleRefContainedElement(implSingleRefContainedElement);
       if (result == null)
+      {
         result = caseISingleRefContainedElement(implSingleRefContainedElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER:
@@ -325,9 +371,13 @@ public class model4Switch<T>
       ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject;
       T result = caseImplSingleRefNonContainer(implSingleRefNonContainer);
       if (result == null)
+      {
         result = caseISingleRefNonContainer(implSingleRefNonContainer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT:
@@ -335,9 +385,13 @@ public class model4Switch<T>
       ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject;
       T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement);
       if (result == null)
+      {
         result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_NON_CONTAINER:
@@ -345,9 +399,13 @@ public class model4Switch<T>
       ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject;
       T result = caseImplMultiRefNonContainer(implMultiRefNonContainer);
       if (result == null)
+      {
         result = caseIMultiRefNonContainer(implMultiRefNonContainer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT:
@@ -355,9 +413,13 @@ public class model4Switch<T>
       ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject;
       T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement);
       if (result == null)
+      {
         result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_CONTAINER:
@@ -365,9 +427,13 @@ public class model4Switch<T>
       ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject;
       T result = caseImplMultiRefContainer(implMultiRefContainer);
       if (result == null)
+      {
         result = caseIMultiRefContainer(implMultiRefContainer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT:
@@ -375,9 +441,13 @@ public class model4Switch<T>
       ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject;
       T result = caseImplMultiRefContainedElement(implMultiRefContainedElement);
       if (result == null)
+      {
         result = caseIMultiRefContainedElement(implMultiRefContainedElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL:
@@ -385,9 +455,13 @@ public class model4Switch<T>
       ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject;
       T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL);
       if (result == null)
+      {
         result = caseISingleRefContainerNPL(implSingleRefContainerNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL:
@@ -395,9 +469,13 @@ public class model4Switch<T>
       ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject;
       T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL);
       if (result == null)
+      {
         result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_CONTAINER_NPL:
@@ -405,9 +483,13 @@ public class model4Switch<T>
       ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject;
       T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL);
       if (result == null)
+      {
         result = caseIMultiRefContainerNPL(implMultiRefContainerNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL:
@@ -415,9 +497,13 @@ public class model4Switch<T>
       ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject;
       T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
       if (result == null)
+      {
         result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_CONTAINED_ELEMENT_NPL:
@@ -425,11 +511,17 @@ public class model4Switch<T>
       ImplContainedElementNPL implContainedElementNPL = (ImplContainedElementNPL)theEObject;
       T result = caseImplContainedElementNPL(implContainedElementNPL);
       if (result == null)
+      {
         result = caseIContainedElementNoParentLink(implContainedElementNPL);
+      }
       if (result == null)
+      {
         result = caseINamedElement(implContainedElementNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MULTI_NU_NON_CONTAINED:
@@ -437,7 +529,9 @@ public class model4Switch<T>
       GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject;
       T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MAP_NON_CONTAINED:
@@ -445,7 +539,9 @@ public class model4Switch<T>
       GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject;
       T result = caseGenRefMapNonContained(genRefMapNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.STRING_TO_EOBJECT:
@@ -454,7 +550,9 @@ public class model4Switch<T>
       Map.Entry<String, EObject> stringToEObject = (Map.Entry<String, EObject>)theEObject;
       T result = caseStringToEObject(stringToEObject);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java
index 61a75bb05b..942359ee88 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -54,7 +54,7 @@ public interface model4Factory extends EFactory
   /**
    * Returns a new object of class '<em>Single Non Contained Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>Single Non Contained Element</em>'.
    * @generated
    */
@@ -121,7 +121,7 @@ public interface model4Factory extends EFactory
   /**
    * Returns a new object of class '<em>Ref Single Non Contained NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>Ref Single Non Contained NPL</em>'.
    * @generated
    */
@@ -146,7 +146,7 @@ public interface model4Factory extends EFactory
   /**
    * Returns a new object of class '<em>Contained Element No Opposite</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>Contained Element No Opposite</em>'.
    * @generated
    */
@@ -163,7 +163,7 @@ public interface model4Factory extends EFactory
   /**
    * Returns a new object of class '<em>Gen Ref Single Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>Gen Ref Single Non Contained</em>'.
    * @generated
    */
@@ -205,7 +205,7 @@ public interface model4Factory extends EFactory
   /**
    * Returns a new object of class '<em>Impl Single Ref Non Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>Impl Single Ref Non Container</em>'.
    * @generated
    */
@@ -223,7 +223,7 @@ public interface model4Factory extends EFactory
   /**
    * Returns a new object of class '<em>Impl Multi Ref Non Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>Impl Multi Ref Non Container</em>'.
    * @generated
    */
@@ -258,7 +258,7 @@ public interface model4Factory extends EFactory
   /**
    * Returns a new object of class '<em>Impl Single Ref Container NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>Impl Single Ref Container NPL</em>'.
    * @generated
    */
@@ -276,7 +276,7 @@ public interface model4Factory extends EFactory
   /**
    * Returns a new object of class '<em>Impl Multi Ref Container NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>Impl Multi Ref Container NPL</em>'.
    * @generated
    */
@@ -302,7 +302,7 @@ public interface model4Factory extends EFactory
   /**
    * Returns a new object of class '<em>Gen Ref Multi NU Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @return a new object of class '<em>Gen Ref Multi NU Non Contained</em>'.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java
index 486ef5b7cb..b48842b34f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -72,7 +72,7 @@ public interface model4Package extends EPackage
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -356,7 +356,7 @@ public interface model4Package extends EPackage
   /**
    * The number of structural features of the '<em>Multi Non Contained Unsettable Element</em>' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -374,7 +374,7 @@ public interface model4Package extends EPackage
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -506,7 +506,7 @@ public interface model4Package extends EPackage
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -612,7 +612,7 @@ public interface model4Package extends EPackage
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -659,7 +659,8 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
+  int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl <em>Impl Single Ref Non Container</em>}' class.
@@ -710,16 +711,18 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
+  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 0;
 
   /**
    * The number of structural features of the '<em>Impl Single Ref Non Contained Element</em>' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
+  int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl <em>Impl Multi Ref Non Container</em>}' class.
@@ -770,7 +773,8 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
+  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 0;
 
   /**
    * The number of structural features of the '<em>Impl Multi Ref Non Contained Element</em>' class.
@@ -779,7 +783,8 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
+  int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl <em>Impl Multi Ref Container</em>}' class.
@@ -840,7 +845,8 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
+  int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl <em>Impl Single Ref Container NPL</em>}' class.
@@ -854,7 +860,7 @@ public interface model4Package extends EPackage
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -893,7 +899,8 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
+  int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT
+      + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl <em>Impl Multi Ref Container NPL</em>}' class.
@@ -946,7 +953,8 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
+  int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT
+      + 0;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl <em>Impl Contained Element NPL</em>}' class.
@@ -972,7 +980,8 @@ public interface model4Package extends EPackage
    * @generated
    * @ordered
    */
-  int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + 1;
+  int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT
+      + 1;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl <em>Gen Ref Multi NU Non Contained</em>}' class.
@@ -1275,7 +1284,7 @@ public interface model4Package extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedUnsettable#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedUnsettable#getElements()
    * @see #getRefMultiNonContainedUnsettable()
@@ -1296,7 +1305,7 @@ public interface model4Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement#getName()
    * @see #getMultiNonContainedUnsettableElement()
@@ -1308,7 +1317,7 @@ public interface model4Package extends EPackage
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement#getParent()
    * @see #getMultiNonContainedUnsettableElement()
@@ -1389,7 +1398,7 @@ public interface model4Package extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL#getElements()
    * @see #getRefMultiNonContainedNPL()
@@ -1490,7 +1499,7 @@ public interface model4Package extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained#getElements()
    * @see #getGenRefMultiNonContained()
@@ -1549,7 +1558,7 @@ public interface model4Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement#getName()
    * @see #getImplSingleRefNonContainedElement()
@@ -1579,7 +1588,7 @@ public interface model4Package extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement#getName()
    * @see #getImplMultiRefNonContainedElement()
@@ -1674,7 +1683,7 @@ public interface model4Package extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained#getElements()
    * @see #getGenRefMultiNUNonContained()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
index 315caa4126..2512bd8dc7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
@@ -143,7 +143,9 @@ public class model4Switch<T>
       RefSingleContained refSingleContained = (RefSingleContained)theEObject;
       T result = caseRefSingleContained(refSingleContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.SINGLE_CONTAINED_ELEMENT:
@@ -151,7 +153,9 @@ public class model4Switch<T>
       SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject;
       T result = caseSingleContainedElement(singleContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_SINGLE_NON_CONTAINED:
@@ -159,7 +163,9 @@ public class model4Switch<T>
       RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject;
       T result = caseRefSingleNonContained(refSingleNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.SINGLE_NON_CONTAINED_ELEMENT:
@@ -167,7 +173,9 @@ public class model4Switch<T>
       SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject;
       T result = caseSingleNonContainedElement(singleNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_CONTAINED:
@@ -175,7 +183,9 @@ public class model4Switch<T>
       RefMultiContained refMultiContained = (RefMultiContained)theEObject;
       T result = caseRefMultiContained(refMultiContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.MULTI_CONTAINED_ELEMENT:
@@ -183,7 +193,9 @@ public class model4Switch<T>
       MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject;
       T result = caseMultiContainedElement(multiContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_NON_CONTAINED:
@@ -191,7 +203,9 @@ public class model4Switch<T>
       RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject;
       T result = caseRefMultiNonContained(refMultiNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.MULTI_NON_CONTAINED_ELEMENT:
@@ -199,7 +213,9 @@ public class model4Switch<T>
       MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject;
       T result = caseMultiNonContainedElement(multiNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE:
@@ -207,7 +223,9 @@ public class model4Switch<T>
       RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject;
       T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT:
@@ -215,7 +233,9 @@ public class model4Switch<T>
       MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject;
       T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_SINGLE_CONTAINED_NPL:
@@ -223,7 +243,9 @@ public class model4Switch<T>
       RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject;
       T result = caseRefSingleContainedNPL(refSingleContainedNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_SINGLE_NON_CONTAINED_NPL:
@@ -231,7 +253,9 @@ public class model4Switch<T>
       RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject;
       T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_CONTAINED_NPL:
@@ -239,7 +263,9 @@ public class model4Switch<T>
       RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject;
       T result = caseRefMultiContainedNPL(refMultiContainedNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_NON_CONTAINED_NPL:
@@ -247,7 +273,9 @@ public class model4Switch<T>
       RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject;
       T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE:
@@ -255,7 +283,9 @@ public class model4Switch<T>
       ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject;
       T result = caseContainedElementNoOpposite(containedElementNoOpposite);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_SINGLE_CONTAINED:
@@ -263,7 +293,9 @@ public class model4Switch<T>
       GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject;
       T result = caseGenRefSingleContained(genRefSingleContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_SINGLE_NON_CONTAINED:
@@ -271,7 +303,9 @@ public class model4Switch<T>
       GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject;
       T result = caseGenRefSingleNonContained(genRefSingleNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MULTI_CONTAINED:
@@ -279,7 +313,9 @@ public class model4Switch<T>
       GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject;
       T result = caseGenRefMultiContained(genRefMultiContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MULTI_NON_CONTAINED:
@@ -287,7 +323,9 @@ public class model4Switch<T>
       GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject;
       T result = caseGenRefMultiNonContained(genRefMultiNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_CONTAINER:
@@ -295,9 +333,13 @@ public class model4Switch<T>
       ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject;
       T result = caseImplSingleRefContainer(implSingleRefContainer);
       if (result == null)
+      {
         result = caseISingleRefContainer(implSingleRefContainer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT:
@@ -305,9 +347,13 @@ public class model4Switch<T>
       ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject;
       T result = caseImplSingleRefContainedElement(implSingleRefContainedElement);
       if (result == null)
+      {
         result = caseISingleRefContainedElement(implSingleRefContainedElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER:
@@ -315,9 +361,13 @@ public class model4Switch<T>
       ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject;
       T result = caseImplSingleRefNonContainer(implSingleRefNonContainer);
       if (result == null)
+      {
         result = caseISingleRefNonContainer(implSingleRefNonContainer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT:
@@ -325,9 +375,13 @@ public class model4Switch<T>
       ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject;
       T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement);
       if (result == null)
+      {
         result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_NON_CONTAINER:
@@ -335,9 +389,13 @@ public class model4Switch<T>
       ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject;
       T result = caseImplMultiRefNonContainer(implMultiRefNonContainer);
       if (result == null)
+      {
         result = caseIMultiRefNonContainer(implMultiRefNonContainer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT:
@@ -345,9 +403,13 @@ public class model4Switch<T>
       ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject;
       T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement);
       if (result == null)
+      {
         result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_CONTAINER:
@@ -355,9 +417,13 @@ public class model4Switch<T>
       ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject;
       T result = caseImplMultiRefContainer(implMultiRefContainer);
       if (result == null)
+      {
         result = caseIMultiRefContainer(implMultiRefContainer);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT:
@@ -365,9 +431,13 @@ public class model4Switch<T>
       ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject;
       T result = caseImplMultiRefContainedElement(implMultiRefContainedElement);
       if (result == null)
+      {
         result = caseIMultiRefContainedElement(implMultiRefContainedElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL:
@@ -375,9 +445,13 @@ public class model4Switch<T>
       ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject;
       T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL);
       if (result == null)
+      {
         result = caseISingleRefContainerNPL(implSingleRefContainerNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL:
@@ -385,9 +459,13 @@ public class model4Switch<T>
       ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject;
       T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL);
       if (result == null)
+      {
         result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_CONTAINER_NPL:
@@ -395,9 +473,13 @@ public class model4Switch<T>
       ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject;
       T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL);
       if (result == null)
+      {
         result = caseIMultiRefContainerNPL(implMultiRefContainerNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL:
@@ -405,9 +487,13 @@ public class model4Switch<T>
       ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject;
       T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
       if (result == null)
+      {
         result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_CONTAINED_ELEMENT_NPL:
@@ -415,11 +501,17 @@ public class model4Switch<T>
       ImplContainedElementNPL implContainedElementNPL = (ImplContainedElementNPL)theEObject;
       T result = caseImplContainedElementNPL(implContainedElementNPL);
       if (result == null)
+      {
         result = caseIContainedElementNoParentLink(implContainedElementNPL);
+      }
       if (result == null)
+      {
         result = caseINamedElement(implContainedElementNPL);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MULTI_NU_NON_CONTAINED:
@@ -427,7 +519,9 @@ public class model4Switch<T>
       GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject;
       T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MAP_NON_CONTAINED:
@@ -435,7 +529,9 @@ public class model4Switch<T>
       GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject;
       T result = caseGenRefMapNonContained(genRefMapNonContained);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.STRING_TO_EOBJECT:
@@ -444,7 +540,9 @@ public class model4Switch<T>
       Map.Entry<String, EObject> stringToEObject = (Map.Entry<String, EObject>)theEObject;
       T result = caseStringToEObject(stringToEObject);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF
index ac3f4a984b..a8bc0b44de 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model4interfaces;singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.tests.model4interfaces;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4interfaces.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4interfaces.legacy;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4interfaces.legacy.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4interfaces.legacy.util;version="3.0.400",
- org.eclipse.emf.cdo.tests.model4interfaces.util;version="3.0.400"
+Export-Package: org.eclipse.emf.cdo.tests.model4interfaces;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4interfaces.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4interfaces.legacy;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4interfaces.legacy.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4interfaces.legacy.util;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model4interfaces.util;version="3.0.500"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
index 15af3c38c7..910312a42f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
index e9c2bdfe69..7ed4209e35 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -38,7 +38,7 @@ public interface IMultiRefContainedElement extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Parent</em>' container reference.
    * @see #setParent(IMultiRefContainer)
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainedElement_Parent()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
index de564c0ef5..9ba17f3a08 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -40,7 +40,7 @@ public interface IMultiRefContainer extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Elements</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainer_Elements()
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement#getParent
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
index 7707f2b966..4c8f48f9af 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
index 2444360b25..b0dafa4b4b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -38,7 +38,7 @@ public interface IMultiRefNonContainedElement extends EObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Parent</em>' reference.
    * @see #setParent(IMultiRefNonContainer)
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainedElement_Parent()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
index c3081b483c..77517bd545 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
index c11d738dc4..257552a13c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
index b91ffe4965..7ce989b2ba 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
index 2a28a8fbca..2b4917f2a0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -38,7 +38,7 @@ public interface ISingleRefContainedElement extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Parent</em>' container reference.
    * @see #setParent(ISingleRefContainer)
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainedElement_Parent()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
index 1d49d503e5..6069091ea3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -38,7 +38,7 @@ public interface ISingleRefContainer extends EObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Element</em>' containment reference.
    * @see #setElement(ISingleRefContainedElement)
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainer_Element()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
index 8af60d7517..5841dd7d1c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
index 076b228678..4ace7fda6f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -37,7 +37,7 @@ public interface ISingleRefNonContainedElement extends EObject
    * If the meaning of the '<em>Parent</em>' reference isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Parent</em>' reference.
    * @see #setParent(ISingleRefNonContainer)
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainedElement_Parent()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
index 9efcf12c8f..2b732c604c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -38,7 +38,7 @@ public interface ISingleRefNonContainer extends EObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Element</em>' reference.
    * @see #setElement(ISingleRefNonContainedElement)
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainer_Element()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
index 01bb1a9711..271c918b64 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
index 50311d6a80..7daaefa948 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -130,7 +130,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#eNS_URI
    * @see #init()
@@ -153,7 +153,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
    * This method is used to initialize {@link model4interfacesPackage#eINSTANCE} when that field is accessed. Clients
    * should not invoke it directly. Instead, they should simply access that field to obtain the package. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -162,12 +162,14 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public static model4interfacesPackage init()
   {
     if (isInited)
+    {
       return (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE
         .get(eNS_URI) instanceof model4interfacesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-        : new model4interfacesPackageImpl());
+            : new model4interfacesPackageImpl());
 
     isInited = true;
 
@@ -452,7 +454,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -513,7 +517,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -530,59 +536,57 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
     // Initialize classes and features; add operations and parameters
     initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainer_Element(), this.getISingleRefContainedElement(),
-        this.getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
+    initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(),
+        getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainedElement_Parent(), this.getISingleRefContainer(),
-        this.getISingleRefContainer_Element(), "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(),
+        "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(),
-        this.getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(),
+        getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class,
         "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(),
-        this.getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(),
+        getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(),
-        this.getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
+    initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(),
+        getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainedElement_Parent(), this.getIMultiRefContainer(),
-        this.getIMultiRefContainer_Elements(), "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(),
+        "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(),
-        this.getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(),
+        getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(),
-        this.getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(),
+        getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
@@ -594,26 +598,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
     initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", null,
-        0, 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, 1,
+        ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element",
-        null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0,
+        1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements",
-        null, 0, -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0,
+        -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements",
-        null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null,
+        0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/impl/model4interfacesPackageImpl.java
index 75b53bbeda..22a79fa91b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/impl/model4interfacesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/impl/model4interfacesPackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -130,7 +130,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#eNS_URI
    * @see #init()
@@ -153,7 +153,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
    * This method is used to initialize {@link model4interfacesPackage#eINSTANCE} when that field is accessed. Clients
    * should not invoke it directly. Instead, they should simply access that field to obtain the package. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -162,12 +162,14 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public static model4interfacesPackage init()
   {
     if (isInited)
+    {
       return (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE
         .get(eNS_URI) instanceof model4interfacesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-        : new model4interfacesPackageImpl());
+            : new model4interfacesPackageImpl());
 
     isInited = true;
 
@@ -452,7 +454,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -513,7 +517,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -530,59 +536,57 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
     // Initialize classes and features; add operations and parameters
     initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainer_Element(), this.getISingleRefContainedElement(),
-        this.getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
+    initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(),
+        getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainedElement_Parent(), this.getISingleRefContainer(),
-        this.getISingleRefContainer_Element(), "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(),
+        "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(),
-        this.getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(),
+        getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class,
         "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(),
-        this.getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(),
+        getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(),
-        this.getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
+    initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(),
+        getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainedElement_Parent(), this.getIMultiRefContainer(),
-        this.getIMultiRefContainer_Elements(), "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(),
+        "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(),
-        this.getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(),
+        getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(),
-        this.getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(),
+        getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
@@ -594,26 +598,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
     initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", null,
-        0, 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, 1,
+        ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element",
-        null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0,
+        1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements",
-        null, 0, -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0,
+        -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements",
-        null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null,
+        0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesPackage.java
index b1040cca07..f7dbcb9456 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/model4interfacesPackage.java
@@ -29,8 +29,8 @@ import org.eclipse.emf.ecore.EReference;
  * @model kind="package"
  * @generated
  */
-public interface model4interfacesPackage extends EPackage,
-    org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage
+public interface model4interfacesPackage
+    extends EPackage, org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage
 {
   /**
    * The package name.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java
index a10f389bfc..2a13bbaaba 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/legacy/util/model4interfacesSwitch.java
@@ -118,7 +118,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject;
       T result = caseISingleRefContainer(iSingleRefContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT:
@@ -126,7 +128,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject;
       T result = caseISingleRefContainedElement(iSingleRefContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER:
@@ -134,7 +138,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject;
       T result = caseISingleRefNonContainer(iSingleRefNonContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT:
@@ -142,7 +148,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject;
       T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINER:
@@ -150,7 +158,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject;
       T result = caseIMultiRefContainer(iMultiRefContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT:
@@ -158,7 +168,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject;
       T result = caseIMultiRefContainedElement(iMultiRefContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINER:
@@ -166,7 +178,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject;
       T result = caseIMultiRefNonContainer(iMultiRefNonContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT:
@@ -174,7 +188,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject;
       T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.INAMED_ELEMENT:
@@ -182,7 +198,9 @@ public class model4interfacesSwitch<T>
       INamedElement iNamedElement = (INamedElement)theEObject;
       T result = caseINamedElement(iNamedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK:
@@ -190,7 +208,9 @@ public class model4interfacesSwitch<T>
       IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject;
       T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL:
@@ -198,7 +218,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject;
       T result = caseISingleRefContainerNPL(iSingleRefContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL:
@@ -206,7 +228,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject;
       T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL:
@@ -214,7 +238,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject;
       T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL:
@@ -222,7 +248,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject;
       T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java
index 131590aba8..d293f71a84 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java
index 6691b90341..033097b3a8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -71,7 +71,7 @@ public interface model4interfacesPackage extends EPackage
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -289,7 +289,7 @@ public interface model4interfacesPackage extends EPackage
   /**
    * The number of structural features of the '<em>INamed Element</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -325,7 +325,7 @@ public interface model4interfacesPackage extends EPackage
   /**
    * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -432,7 +432,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the containment reference '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer#getElement()
    * @see #getISingleRefContainer()
@@ -453,7 +453,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement#getParent()
    * @see #getISingleRefContainedElement()
@@ -474,7 +474,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer#getElement()
    * @see #getISingleRefNonContainer()
@@ -495,7 +495,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement#getParent()
    * @see #getISingleRefNonContainedElement()
@@ -516,7 +516,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer#getElements()
    * @see #getIMultiRefContainer()
@@ -537,7 +537,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the container reference '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement#getParent()
    * @see #getIMultiRefContainedElement()
@@ -558,7 +558,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer#getElements()
    * @see #getIMultiRefNonContainer()
@@ -579,7 +579,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent()
    * @see #getIMultiRefNonContainedElement()
@@ -628,7 +628,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the containment reference '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL#getElement()
    * @see #getISingleRefContainerNPL()
@@ -649,7 +649,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL#getElement <em>Element</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Element</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL#getElement()
    * @see #getISingleRefNonContainerNPL()
@@ -670,7 +670,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL#getElements()
    * @see #getIMultiRefContainerNPL()
@@ -691,7 +691,7 @@ public interface model4interfacesPackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL#getElements <em>Elements</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL#getElements()
    * @see #getIMultiRefNonContainerNPL()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
index 61faf17bf6..5132a4ba0f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
@@ -108,7 +108,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject;
       T result = caseISingleRefContainer(iSingleRefContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT:
@@ -116,7 +118,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject;
       T result = caseISingleRefContainedElement(iSingleRefContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER:
@@ -124,7 +128,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject;
       T result = caseISingleRefNonContainer(iSingleRefNonContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT:
@@ -132,7 +138,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject;
       T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINER:
@@ -140,7 +148,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject;
       T result = caseIMultiRefContainer(iMultiRefContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT:
@@ -148,7 +158,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject;
       T result = caseIMultiRefContainedElement(iMultiRefContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINER:
@@ -156,7 +168,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject;
       T result = caseIMultiRefNonContainer(iMultiRefNonContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT:
@@ -164,7 +178,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject;
       T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.INAMED_ELEMENT:
@@ -172,7 +188,9 @@ public class model4interfacesSwitch<T>
       INamedElement iNamedElement = (INamedElement)theEObject;
       T result = caseINamedElement(iNamedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK:
@@ -180,7 +198,9 @@ public class model4interfacesSwitch<T>
       IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject;
       T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL:
@@ -188,7 +208,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject;
       T result = caseISingleRefContainerNPL(iSingleRefContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL:
@@ -196,7 +218,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject;
       T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL:
@@ -204,7 +228,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject;
       T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL:
@@ -212,7 +238,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject;
       T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF
index 5ade73b27c..022e34f3e9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model5;singleton:=true
-Bundle-Version: 3.0.400.qualifier
+Bundle-Version: 3.0.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,9 +10,9 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.model5;version="3.0.400",
- org.eclipse.emf.cdo.tests.model5.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model5.legacy;version="3.0.400",
- org.eclipse.emf.cdo.tests.model5.legacy.impl;version="3.0.400",
- org.eclipse.emf.cdo.tests.model5.legacy.util;version="3.0.400",
- org.eclipse.emf.cdo.tests.model5.util;version="3.0.400"
+Export-Package: org.eclipse.emf.cdo.tests.model5;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model5.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model5.legacy;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model5.legacy.impl;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model5.legacy.util;version="3.0.500",
+ org.eclipse.emf.cdo.tests.model5.util;version="3.0.500"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java
index 8e80fafb68..5b50bb637b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA) - initial API and implementation
  */
@@ -91,11 +91,11 @@ public interface Child extends EObject
   /**
    * Returns the value of the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-  	 * <p>
-  	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-  	 * there really should be more of a description here...
-  	 * </p>
-  	 * <!-- end-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild_Name()
@@ -107,7 +107,7 @@ public interface Child extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model5.Child#getName <em>Name</em>}' attribute.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @param value the new value of the '<em>Name</em>' attribute.
    * @see #getName()
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java
index caf389a9e9..10ce726ace 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java
index e470951302..797bce5705 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfBoolean#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfBoolean()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java
index e46ead19cf..3ffbfc6d67 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfChar#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfChar()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java
index aebd8b13ee..aafee4ca99 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -24,7 +24,7 @@ import java.util.Date;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfDate#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfDate()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java
index f9c67249a9..de0f31ee4d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfDouble#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfDouble()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java
index 2e4e2bf3a9..222af455d1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfFloat#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfFloat()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java
index 9bc5952505..47f04476d2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java
index 3cf7dd9070..a75b6583d3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java
index e89442c01d..a2ff0c47f7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfInteger#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInteger()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java
index a7a50fcebe..c2772c17fb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfLong#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfLong()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java
index 0a0bee707a..9c99307844 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfShort#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfShort()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java
index 2fe9923676..a5998f005c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfString#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfString()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java
index 162796b3fa..a0057059b6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java
index b322de8dfa..f8af18b9bb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -143,7 +143,7 @@ public interface Model5Factory extends EFactory
   /**
    * Returns a new object of class '<em>Child</em>'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return a new object of class '<em>Child</em>'.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
index 8ecdc36901..701b847bfe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -104,7 +104,7 @@ public interface Model5Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl <em>Manager</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getManager()
    * @generated
@@ -122,7 +122,7 @@ public interface Model5Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.DoctorImpl <em>Doctor</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model5.impl.DoctorImpl
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getDoctor()
    * @generated
@@ -436,7 +436,7 @@ public interface Model5Package extends EPackage
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -445,7 +445,7 @@ public interface Model5Package extends EPackage
   /**
    * The feature id for the '<em><b>Favourite</b></em>' reference.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -463,7 +463,7 @@ public interface Model5Package extends EPackage
   /**
    * The number of structural features of the '<em>Parent</em>' class.
    * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -472,7 +472,7 @@ public interface Model5Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.ChildImpl <em>Child</em>}' class.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.model5.impl.ChildImpl
    * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getChild()
    * @generated
@@ -482,7 +482,7 @@ public interface Model5Package extends EPackage
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -491,7 +491,7 @@ public interface Model5Package extends EPackage
   /**
    * The feature id for the '<em><b>Preferred By</b></em>' reference.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -509,7 +509,7 @@ public interface Model5Package extends EPackage
   /**
    * The number of structural features of the '<em>Child</em>' class.
    * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -565,7 +565,7 @@ public interface Model5Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.Manager <em>Manager</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Manager</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Manager
    * @generated
@@ -575,7 +575,7 @@ public interface Model5Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.Doctor <em>Doctor</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Doctor</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Doctor
    * @generated
@@ -789,7 +789,7 @@ public interface Model5Package extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model5.Parent#getChildren <em>Children</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the containment reference list '<em>Children</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Parent#getChildren()
    * @see #getParent()
@@ -800,7 +800,7 @@ public interface Model5Package extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model5.Parent#getFavourite <em>Favourite</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Favourite</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Parent#getFavourite()
    * @see #getParent()
@@ -822,7 +822,7 @@ public interface Model5Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.Child <em>Child</em>}'.
    * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for class '<em>Child</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Child
    * @generated
@@ -832,7 +832,7 @@ public interface Model5Package extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model5.Child#getParent <em>Parent</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the container reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Child#getParent()
    * @see #getChild()
@@ -843,7 +843,7 @@ public interface Model5Package extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy <em>Preferred By</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Preferred By</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy()
    * @see #getChild()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java
index 0eedff762c..b156ac7163 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA) - initial API and implementation
  */
@@ -82,11 +82,11 @@ public interface Parent extends EObject
   /**
    * Returns the value of the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-  	 * <p>
-  	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-  	 * there really should be more of a description here...
-  	 * </p>
-  	 * <!-- end-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent_Name()
@@ -98,7 +98,7 @@ public interface Parent extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model5.Parent#getName <em>Name</em>}' attribute.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @param value the new value of the '<em>Name</em>' attribute.
    * @see #getName()
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
index dda3f2e405..e301c46d58 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople <em>People</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ChildImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ChildImpl.java
index 7e5bd715c5..1161cc31d2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ChildImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ChildImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA) - initial API and implementation
  */
@@ -110,7 +110,7 @@ public class ChildImpl extends CDOObjectImpl implements Child
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public String getName()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java
index 5d87dd3a60..6c924b5e60 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java
index d43e7cd121..2bf160b86e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java
index f3aee734c5..8dafa4f1b5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfCharImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfCharImpl extends CDOObjectImpl implements GenListOfChar
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java
index 03858a7eb6..661e201872 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -29,7 +29,7 @@ import java.util.Date;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfDateImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfDateImpl extends CDOObjectImpl implements GenListOfDate
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java
index 8aed9175b4..dd6cf39e8b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfDoubleImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfDoubleImpl extends CDOObjectImpl implements GenListOfDouble
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java
index a824841155..715d75c83c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfFloatImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfFloatImpl extends CDOObjectImpl implements GenListOfFloat
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java
index 015e8af889..3299a9784b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java
index e100e9a871..3f6f2cc0cb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfIntImpl extends CDOObjectImpl implements GenListOfInt
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java
index 7bcb1c2f52..be4fed3516 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java
index 2bdb8995ab..1d229e83e4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfLongImpl extends CDOObjectImpl implements GenListOfLong
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java
index 36acd63cc5..c53305f56e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfShortImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfShortImpl extends CDOObjectImpl implements GenListOfShort
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java
index 91c379616a..55f1921ad3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfStringImpl extends CDOObjectImpl implements GenListOfString
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java
index 9b99a7f891..69715c23e8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java
index 5c5d0be8a7..e2721e1aa5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java
@@ -297,7 +297,7 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public Child createChild()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
index 00410dd7b6..fac72f3d47 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -129,7 +129,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   private EClass childEClass = null;
@@ -153,7 +153,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#eNS_URI
    * @see #init()
@@ -172,7 +172,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Model5Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -185,11 +185,13 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   public static Model5Package init()
   {
     if (isInited)
+    {
       return (Model5Package)EPackage.Registry.INSTANCE.getEPackage(Model5Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model5PackageImpl());
+    Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model5PackageImpl());
 
     isInited = true;
 
@@ -453,7 +455,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EReference getParent_Children()
@@ -463,7 +465,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EReference getParent_Favourite()
@@ -483,7 +485,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EClass getChild()
@@ -493,7 +495,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EReference getChild_Parent()
@@ -503,7 +505,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EReference getChild_PreferredBy()
@@ -572,7 +574,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -647,7 +651,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -664,10 +670,10 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     // Initialize classes and features; add operations and parameters
     initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTestFeatureMap_Managers(), this.getManager(), null, "managers", null, 0, -1,
-        TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTestFeatureMap_Doctors(), this.getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class,
+    initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class,
+        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class,
         IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1,
@@ -736,27 +742,26 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
     initEClass(genListOfIntArrayEClass, GenListOfIntArray.class, "GenListOfIntArray", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGenListOfIntArray_Elements(), this.getIntArray(), "elements", null, 0, -1,
-        GenListOfIntArray.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getGenListOfIntArray_Elements(), getIntArray(), "elements", null, 0, -1, GenListOfIntArray.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(parentEClass, Parent.class, "Parent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getParent_Children(), this.getChild(), this.getChild_Parent(), "children", null, 0, -1,
-        Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getParent_Favourite(), this.getChild(), this.getChild_PreferredBy(), "favourite", null, 0, 1,
-        Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getParent_Children(), getChild(), getChild_Parent(), "children", null, 0, -1, Parent.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getParent_Favourite(), getChild(), getChild_PreferredBy(), "favourite", null, 0, 1, Parent.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
     initEAttribute(getParent_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parent.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(childEClass, Child.class, "Child", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getChild_Parent(), this.getParent(), this.getParent_Children(), "parent", null, 0, 1, Child.class,
+    initEReference(getChild_Parent(), getParent(), getParent_Children(), "parent", null, 0, 1, Child.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getChild_PreferredBy(), this.getParent(), this.getParent_Favourite(), "preferredBy", null, 0, 1,
-        Child.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getChild_PreferredBy(), getParent(), getParent_Favourite(), "preferredBy", null, 0, 1, Child.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
     initEAttribute(getChild_Name(), ecorePackage.getEString(), "name", null, 0, 1, Child.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ParentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ParentImpl.java
index 10a301d0c4..6ec1154dd3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ParentImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ParentImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA) - initial API and implementation
  */
@@ -102,7 +102,7 @@ public class ParentImpl extends CDOObjectImpl implements Parent
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public String getName()
@@ -112,7 +112,7 @@ public class ParentImpl extends CDOObjectImpl implements Parent
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public void setNameGen(String newName)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java
index 07ac5f56f1..d17f6cedaf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.util.FeatureMap;
  * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl#getPeople <em>People</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
@@ -88,7 +88,7 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public FeatureMap getPeople()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Factory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Factory.java
index d64fe6d94e..ebe0d47930 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Factory.java
@@ -170,7 +170,7 @@ public interface Model5Factory extends EFactory, org.eclipse.emf.cdo.tests.model
   /**
    * Returns a new object of class '<em>Child</em>'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return a new object of class '<em>Child</em>'.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Package.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Package.java
index 906f5df0db..65ab368fe5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/Model5Package.java
@@ -435,7 +435,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * The feature id for the '<em><b>Children</b></em>' containment reference list.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -444,7 +444,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * The feature id for the '<em><b>Favourite</b></em>' reference.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -462,7 +462,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * The number of structural features of the '<em>Parent</em>' class.
    * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -471,7 +471,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.impl.ChildImpl <em>Child</em>}' class.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.ChildImpl
    * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getChild()
    * @generated
@@ -481,7 +481,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * The feature id for the '<em><b>Parent</b></em>' container reference.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -490,7 +490,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * The feature id for the '<em><b>Preferred By</b></em>' reference.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -508,7 +508,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * The number of structural features of the '<em>Child</em>' class.
    * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -820,7 +820,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model5.Parent#getChildren <em>Children</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the containment reference list '<em>Children</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Parent#getChildren()
    * @see #getParent()
@@ -831,7 +831,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model5.Parent#getFavourite <em>Favourite</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Favourite</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Parent#getFavourite()
    * @see #getParent()
@@ -853,7 +853,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.Child <em>Child</em>}'.
    * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for class '<em>Child</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Child
    * @generated
@@ -863,7 +863,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model5.Child#getParent <em>Parent</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the container reference '<em>Parent</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Child#getParent()
    * @see #getChild()
@@ -874,7 +874,7 @@ public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy <em>Preferred By</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Preferred By</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy()
    * @see #getChild()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ChildImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ChildImpl.java
index 310cd46aae..7733c88b64 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ChildImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ChildImpl.java
@@ -63,7 +63,7 @@ public class ChildImpl extends EObjectImpl implements Child
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @see #getName()
    * @generated
    * @ordered
@@ -72,7 +72,7 @@ public class ChildImpl extends EObjectImpl implements Child
 
   /**
    * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   protected ChildImpl()
@@ -257,7 +257,7 @@ public class ChildImpl extends EObjectImpl implements Child
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public void setNameGen(String newName)
@@ -278,7 +278,7 @@ public class ChildImpl extends EObjectImpl implements Child
 
   /**
    * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -428,7 +428,7 @@ public class ChildImpl extends EObjectImpl implements Child
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java
index 1476d524b5..bb52de5a4c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5FactoryImpl.java
@@ -307,7 +307,7 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public Child createChild()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java
index 06d78a00bd..a3bf1e349d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/Model5PackageImpl.java
@@ -135,7 +135,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   private EClass childEClass = null;
@@ -190,8 +190,8 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     }
 
     // Obtain or create and register package
-    Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model5PackageImpl());
+    Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model5PackageImpl());
 
     isInited = true;
 
@@ -473,7 +473,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EReference getParent_Children()
@@ -483,7 +483,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EReference getParent_Favourite()
@@ -503,7 +503,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EClass getChild()
@@ -513,7 +513,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EReference getChild_Parent()
@@ -523,7 +523,7 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EReference getChild_PreferredBy()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ParentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ParentImpl.java
index 21c951d16f..1b6e3fe0aa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ParentImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/impl/ParentImpl.java
@@ -77,7 +77,7 @@ public class ParentImpl extends EObjectImpl implements Parent
   /**
    * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @see #getName()
    * @generated
    * @ordered
@@ -86,7 +86,7 @@ public class ParentImpl extends EObjectImpl implements Parent
 
   /**
    * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   protected ParentImpl()
@@ -204,7 +204,8 @@ public class ParentImpl extends EObjectImpl implements Parent
     }
     else if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__FAVOURITE, newFavourite, newFavourite));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__FAVOURITE, newFavourite, newFavourite));
     }
   }
 
@@ -226,7 +227,7 @@ public class ParentImpl extends EObjectImpl implements Parent
 
   /**
    * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public void setNameGen(String newName)
@@ -247,7 +248,7 @@ public class ParentImpl extends EObjectImpl implements Parent
 
   /**
    * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -380,7 +381,7 @@ public class ParentImpl extends EObjectImpl implements Parent
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/IsLoadingTestFixture.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/IsLoadingTestFixture.java
index 1da46185a7..ac6663de55 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/IsLoadingTestFixture.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/IsLoadingTestFixture.java
@@ -13,13 +13,13 @@ package org.eclipse.emf.cdo.tests.model5.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 
+import org.junit.Assert;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.junit.Assert;
-
 /**
  * Test fixture for the CDO resource "is loading" tests. Bug 393164.
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java
index 54df7a1f4a..705304d260 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java
@@ -400,9 +400,9 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.Child <em>Child</em>}'.
    * <!-- begin-user-doc -->
-  	 * This default implementation returns null so that we can easily ignore cases;
-  	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-  	 * <!-- end-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model5.Child
    * @generated
@@ -415,8 +415,8 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfString <em>Gen List Of String</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can
-     * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-     * end-user-doc -->
+   * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+   * end-user-doc -->
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfString
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
index 28b143eb30..9f4b959de2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
@@ -110,7 +110,9 @@ public class Model5Switch<T>
       TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject;
       T result = caseTestFeatureMap(testFeatureMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.MANAGER:
@@ -118,7 +120,9 @@ public class Model5Switch<T>
       Manager manager = (Manager)theEObject;
       T result = caseManager(manager);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.DOCTOR:
@@ -126,7 +130,9 @@ public class Model5Switch<T>
       Doctor doctor = (Doctor)theEObject;
       T result = caseDoctor(doctor);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_STRING:
@@ -134,7 +140,9 @@ public class Model5Switch<T>
       GenListOfString genListOfString = (GenListOfString)theEObject;
       T result = caseGenListOfString(genListOfString);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INT:
@@ -142,7 +150,9 @@ public class Model5Switch<T>
       GenListOfInt genListOfInt = (GenListOfInt)theEObject;
       T result = caseGenListOfInt(genListOfInt);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INTEGER:
@@ -150,7 +160,9 @@ public class Model5Switch<T>
       GenListOfInteger genListOfInteger = (GenListOfInteger)theEObject;
       T result = caseGenListOfInteger(genListOfInteger);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_LONG:
@@ -158,7 +170,9 @@ public class Model5Switch<T>
       GenListOfLong genListOfLong = (GenListOfLong)theEObject;
       T result = caseGenListOfLong(genListOfLong);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_BOOLEAN:
@@ -166,7 +180,9 @@ public class Model5Switch<T>
       GenListOfBoolean genListOfBoolean = (GenListOfBoolean)theEObject;
       T result = caseGenListOfBoolean(genListOfBoolean);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_SHORT:
@@ -174,7 +190,9 @@ public class Model5Switch<T>
       GenListOfShort genListOfShort = (GenListOfShort)theEObject;
       T result = caseGenListOfShort(genListOfShort);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_FLOAT:
@@ -182,7 +200,9 @@ public class Model5Switch<T>
       GenListOfFloat genListOfFloat = (GenListOfFloat)theEObject;
       T result = caseGenListOfFloat(genListOfFloat);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_DOUBLE:
@@ -190,7 +210,9 @@ public class Model5Switch<T>
       GenListOfDouble genListOfDouble = (GenListOfDouble)theEObject;
       T result = caseGenListOfDouble(genListOfDouble);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_DATE:
@@ -198,7 +220,9 @@ public class Model5Switch<T>
       GenListOfDate genListOfDate = (GenListOfDate)theEObject;
       T result = caseGenListOfDate(genListOfDate);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_CHAR:
@@ -206,7 +230,9 @@ public class Model5Switch<T>
       GenListOfChar genListOfChar = (GenListOfChar)theEObject;
       T result = caseGenListOfChar(genListOfChar);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INT_ARRAY:
@@ -214,7 +240,9 @@ public class Model5Switch<T>
       GenListOfIntArray genListOfIntArray = (GenListOfIntArray)theEObject;
       T result = caseGenListOfIntArray(genListOfIntArray);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.PARENT:
@@ -222,7 +250,9 @@ public class Model5Switch<T>
       Parent parent = (Parent)theEObject;
       T result = caseParent(parent);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.CHILD:
@@ -230,7 +260,9 @@ public class Model5Switch<T>
       Child child = (Child)theEObject;
       T result = caseChild(child);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -441,9 +473,9 @@ public class Model5Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Child</em>'.
    * <!-- begin-user-doc -->
-  	 * This implementation returns null;
-  	 * returning a non-null result will terminate the switch.
-  	 * <!-- end-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
    * @param object the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Child</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -457,7 +489,7 @@ public class Model5Switch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Gen List Of String</em>'.
    * <!-- begin-user-doc
-     * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+   * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
    * @param object the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Gen List Of String</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF
index d38b783cd1..6bf5d083b2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model6;singleton:=true
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.tests.model6;version="4.0.200";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
- org.eclipse.emf.cdo.tests.model6.impl;version="4.0.200";
+Export-Package: org.eclipse.emf.cdo.tests.model6;version="4.0.300";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.eclipse.emf.cdo.tests.model6.impl;version="4.0.300";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.common.util,
    org.eclipse.emf.internal.cdo,
    org.eclipse.emf.ecore.impl,
    org.eclipse.emf.cdo.tests.model6",
- org.eclipse.emf.cdo.tests.model6.legacy;version="4.0.200";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
- org.eclipse.emf.cdo.tests.model6.legacy.impl;version="4.0.200";
+ org.eclipse.emf.cdo.tests.model6.legacy;version="4.0.300";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.eclipse.emf.cdo.tests.model6.legacy.impl;version="4.0.300";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.common.util,
    org.eclipse.emf.cdo.tests.legacy.model6,
    org.eclipse.emf.common.notify,
    org.eclipse.emf.ecore.impl",
- org.eclipse.emf.cdo.tests.model6.legacy.util;version="4.0.200",
- org.eclipse.emf.cdo.tests.model6.util;version="4.0.200";
+ org.eclipse.emf.cdo.tests.model6.legacy.util;version="4.0.300",
+ org.eclipse.emf.cdo.tests.model6.util;version="4.0.300";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.common.notify.impl,
    org.eclipse.emf.cdo.tests.model6,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java
index 0570b2a72e..2afc37ce61 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/CanReferenceLegacy.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/CanReferenceLegacy.java
index badb00fe1b..f198d6ab5a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/CanReferenceLegacy.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/CanReferenceLegacy.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.cdo.tests.model6;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java
index df88b05736..9e3276d2fc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList <em>Containment List</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java
index 15c65b79c3..16775c929d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -224,11 +224,11 @@ public interface Model6Factory extends EFactory
   CanReferenceLegacy createCanReferenceLegacy();
 
   /**
-  	 * Returns the package supported by this factory.
-  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-  	 * @return the package supported by this factory.
-  	 * @generated
-  	 */
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @return the package supported by this factory.
+   * @generated
+   */
   Model6Package getModel6Package();
 
 } // Model6Factory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java
index e3d40ce9a8..9bb4a378f6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -63,7 +63,7 @@ public interface Model6Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl <em>Root</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model6.impl.RootImpl
    * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getRoot()
    * @generated
@@ -126,7 +126,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute Optional</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -135,7 +135,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute Required</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -144,7 +144,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute List</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -153,7 +153,7 @@ public interface Model6Package extends EPackage
   /**
    * The number of structural features of the '<em>Base Object</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -171,7 +171,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute Optional</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -180,7 +180,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute Required</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -189,7 +189,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute List</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -198,7 +198,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Reference Optional</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -207,7 +207,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Reference List</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -234,7 +234,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute Optional</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -243,7 +243,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute Required</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -252,7 +252,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute List</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -314,7 +314,7 @@ public interface Model6Package extends EPackage
   /**
    * The number of structural features of the '<em>Unordered List</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -434,7 +434,7 @@ public interface Model6Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.AImpl <em>A</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model6.impl.AImpl
    * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getA()
    * @generated
@@ -470,7 +470,7 @@ public interface Model6Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BImpl <em>B</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model6.impl.BImpl
    * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getB()
    * @generated
@@ -480,7 +480,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Owned C</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -497,7 +497,7 @@ public interface Model6Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.CImpl <em>C</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model6.impl.CImpl
    * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getC()
    * @generated
@@ -515,7 +515,7 @@ public interface Model6Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.DImpl <em>D</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model6.impl.DImpl
    * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getD()
    * @generated
@@ -541,7 +541,7 @@ public interface Model6Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.EImpl <em>E</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model6.impl.EImpl
    * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getE()
    * @generated
@@ -568,7 +568,7 @@ public interface Model6Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.FImpl <em>F</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.tests.model6.impl.FImpl
    * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getF()
    * @generated
@@ -865,7 +865,7 @@ public interface Model6Package extends EPackage
   /**
    * The feature id for the '<em><b>Attribute</b></em>' attribute.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -874,7 +874,7 @@ public interface Model6Package extends EPackage
   /**
    * The number of structural features of the '<em>Empty String Default Unsettable</em>' class.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -1117,58 +1117,58 @@ public interface Model6Package extends EPackage
   int CAN_REFERENCE_LEGACY = 24;
 
   /**
-  	 * The feature id for the '<em><b>Single Containment</b></em>' containment reference.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The feature id for the '<em><b>Single Containment</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT = 0;
 
   /**
-  	 * The feature id for the '<em><b>Multiple Containment</b></em>' containment reference list.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The feature id for the '<em><b>Multiple Containment</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY__MULTIPLE_CONTAINMENT = 1;
 
   /**
-  	 * The feature id for the '<em><b>Single Reference</b></em>' reference.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The feature id for the '<em><b>Single Reference</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY__SINGLE_REFERENCE = 2;
 
   /**
-  	 * The feature id for the '<em><b>Multiple Reference</b></em>' reference list.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The feature id for the '<em><b>Multiple Reference</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY__MULTIPLE_REFERENCE = 3;
 
   /**
-  	 * The number of structural features of the '<em>Can Reference Legacy</em>' class.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The number of structural features of the '<em>Can Reference Legacy</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY_FEATURE_COUNT = 4;
 
   /**
-  	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}' enum.
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @see org.eclipse.emf.cdo.tests.model6.MyEnum
-  	 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnum()
-  	 * @generated
-  	 */
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnum
+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnum()
+   * @generated
+   */
   int MY_ENUM = 25;
 
   /**
@@ -1184,7 +1184,7 @@ public interface Model6Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.Root <em>Root</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Root</em>'.
    * @see org.eclipse.emf.cdo.tests.model6.Root
    * @generated
@@ -1234,7 +1234,7 @@ public interface Model6Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.BaseObject <em>Base Object</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Base Object</em>'.
    * @see org.eclipse.emf.cdo.tests.model6.BaseObject
    * @generated
@@ -1285,7 +1285,7 @@ public interface Model6Package extends EPackage
    * Returns the meta object for the reference '
    * {@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Reference Optional</em>'.
    * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional()
    * @see #getReferenceObject()
@@ -1297,7 +1297,7 @@ public interface Model6Package extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList <em>Reference List</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Reference List</em>'.
    * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList()
    * @see #getReferenceObject()
@@ -1328,7 +1328,7 @@ public interface Model6Package extends EPackage
    * Returns the meta object for the containment reference list '
    * {@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList <em>Containment List</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Containment List</em>'.
    * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList()
    * @see #getContainmentObject()
@@ -1788,7 +1788,7 @@ public interface Model6Package extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.EmptyStringDefaultUnsettable#getAttribute <em>Attribute</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Attribute</em>'.
    * @see org.eclipse.emf.cdo.tests.model6.EmptyStringDefaultUnsettable#getAttribute()
    * @see #getEmptyStringDefaultUnsettable()
@@ -2070,57 +2070,57 @@ public interface Model6Package extends EPackage
   EClass getCanReferenceLegacy();
 
   /**
-  	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleContainment <em>Single Containment</em>}'.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @return the meta object for the containment reference '<em>Single Containment</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleContainment()
-  	 * @see #getCanReferenceLegacy()
-  	 * @generated
-  	 */
+   * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleContainment <em>Single Containment</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Single Containment</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleContainment()
+   * @see #getCanReferenceLegacy()
+   * @generated
+   */
   EReference getCanReferenceLegacy_SingleContainment();
 
   /**
-  	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleContainment <em>Multiple Containment</em>}'.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @return the meta object for the containment reference list '<em>Multiple Containment</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleContainment()
-  	 * @see #getCanReferenceLegacy()
-  	 * @generated
-  	 */
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleContainment <em>Multiple Containment</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Multiple Containment</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleContainment()
+   * @see #getCanReferenceLegacy()
+   * @generated
+   */
   EReference getCanReferenceLegacy_MultipleContainment();
 
   /**
-  	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleReference <em>Single Reference</em>}'.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @return the meta object for the reference '<em>Single Reference</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleReference()
-  	 * @see #getCanReferenceLegacy()
-  	 * @generated
-  	 */
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleReference <em>Single Reference</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Single Reference</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleReference()
+   * @see #getCanReferenceLegacy()
+   * @generated
+   */
   EReference getCanReferenceLegacy_SingleReference();
 
   /**
-  	 * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleReference <em>Multiple Reference</em>}'.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @return the meta object for the reference list '<em>Multiple Reference</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleReference()
-  	 * @see #getCanReferenceLegacy()
-  	 * @generated
-  	 */
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleReference <em>Multiple Reference</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>Multiple Reference</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleReference()
+   * @see #getCanReferenceLegacy()
+   * @generated
+   */
   EReference getCanReferenceLegacy_MultipleReference();
 
   /**
-  	 * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}'.
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @return the meta object for enum '<em>My Enum</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.MyEnum
-  	 * @generated
-  	 */
+   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for enum '<em>My Enum</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnum
+   * @generated
+   */
   EEnum getMyEnum();
 
   /**
@@ -2669,7 +2669,7 @@ public interface Model6Package extends EPackage
     /**
      * The meta object literal for the '<em><b>Attribute</b></em>' attribute feature.
      * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     EAttribute EMPTY_STRING_DEFAULT_UNSETTABLE__ATTRIBUTE = eINSTANCE.getEmptyStringDefaultUnsettable_Attribute();
@@ -2879,45 +2879,45 @@ public interface Model6Package extends EPackage
     EClass CAN_REFERENCE_LEGACY = eINSTANCE.getCanReferenceLegacy();
 
     /**
-    	 * The meta object literal for the '<em><b>Single Containment</b></em>' containment reference feature.
-    	 * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
-    	 * @generated
-    	 */
+     * The meta object literal for the '<em><b>Single Containment</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     EReference CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT = eINSTANCE.getCanReferenceLegacy_SingleContainment();
 
     /**
-    	 * The meta object literal for the '<em><b>Multiple Containment</b></em>' containment reference list feature.
-    	 * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
-    	 * @generated
-    	 */
+     * The meta object literal for the '<em><b>Multiple Containment</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     EReference CAN_REFERENCE_LEGACY__MULTIPLE_CONTAINMENT = eINSTANCE.getCanReferenceLegacy_MultipleContainment();
 
     /**
-    	 * The meta object literal for the '<em><b>Single Reference</b></em>' reference feature.
-    	 * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
-    	 * @generated
-    	 */
+     * The meta object literal for the '<em><b>Single Reference</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     EReference CAN_REFERENCE_LEGACY__SINGLE_REFERENCE = eINSTANCE.getCanReferenceLegacy_SingleReference();
 
     /**
-    	 * The meta object literal for the '<em><b>Multiple Reference</b></em>' reference list feature.
-    	 * <!-- begin-user-doc -->
-    	 * <!-- end-user-doc -->
-    	 * @generated
-    	 */
+     * The meta object literal for the '<em><b>Multiple Reference</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     EReference CAN_REFERENCE_LEGACY__MULTIPLE_REFERENCE = eINSTANCE.getCanReferenceLegacy_MultipleReference();
 
     /**
-    	 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}' enum.
-    	 * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-    	 * @see org.eclipse.emf.cdo.tests.model6.MyEnum
-    	 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnum()
-    	 * @generated
-    	 */
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}' enum.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.cdo.tests.model6.MyEnum
+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getMyEnum()
+     * @generated
+     */
     EEnum MY_ENUM = eINSTANCE.getMyEnum();
 
     /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java
index b3b8f8af52..66e0d60e8a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList <em>Reference List</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java
index 52ae2f2964..77b90d672e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java
index dca275f981..107c7070ce 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CanReferenceLegacyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CanReferenceLegacyImpl.java
index d806253274..b4f86a6469 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CanReferenceLegacyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CanReferenceLegacyImpl.java
@@ -13,13 +13,12 @@ package org.eclipse.emf.cdo.tests.model6.impl;
 import org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy;
 import org.eclipse.emf.cdo.tests.model6.Model6Package;
 
-import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
-
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Can Reference Legacy</b></em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java
index fdf39b10b0..b02fd1b3d5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl#getContainmentList <em>Containment List</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ContainmentObjectImpl extends BaseObjectImpl implements ContainmentObject
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java
index dae40dfc86..2f05291978 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java
@@ -441,16 +441,18 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public MyEnum createMyEnumFromString(EDataType eDataType, String initialValue)
   {
     MyEnum result = MyEnum.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java
index 29e4c8c7dc..8de141b4d1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -213,10 +213,10 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   private EClass canReferenceLegacyEClass = null;
 
   /**
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   private EEnum myEnumEEnum = null;
 
   /**
@@ -233,7 +233,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.tests.model6.Model6Package#eNS_URI
    * @see #init()
@@ -252,7 +252,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Model6Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -265,11 +265,13 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   public static Model6Package init()
   {
     if (isInited)
+    {
       return (Model6Package)EPackage.Registry.INSTANCE.getEPackage(Model6Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model6PackageImpl());
+    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model6PackageImpl());
 
     isInited = true;
 
@@ -839,7 +841,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EAttribute getEmptyStringDefaultUnsettable_Attribute()
@@ -1098,50 +1100,50 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EReference getCanReferenceLegacy_SingleContainment()
   {
     return (EReference)canReferenceLegacyEClass.getEStructuralFeatures().get(0);
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EReference getCanReferenceLegacy_MultipleContainment()
   {
     return (EReference)canReferenceLegacyEClass.getEStructuralFeatures().get(1);
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EReference getCanReferenceLegacy_SingleReference()
   {
     return (EReference)canReferenceLegacyEClass.getEStructuralFeatures().get(2);
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EReference getCanReferenceLegacy_MultipleReference()
   {
     return (EReference)canReferenceLegacyEClass.getEStructuralFeatures().get(3);
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EEnum getMyEnum()
   {
     return myEnumEEnum;
@@ -1181,7 +1183,9 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -1320,7 +1324,9 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -1333,23 +1339,23 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    referenceObjectEClass.getESuperTypes().add(this.getBaseObject());
-    containmentObjectEClass.getESuperTypes().add(this.getBaseObject());
-    holderEClass.getESuperTypes().add(this.getHoldable());
-    thingEClass.getESuperTypes().add(this.getHoldable());
+    referenceObjectEClass.getESuperTypes().add(getBaseObject());
+    containmentObjectEClass.getESuperTypes().add(getBaseObject());
+    holderEClass.getESuperTypes().add(getHoldable());
+    thingEClass.getESuperTypes().add(getHoldable());
 
     // Initialize classes and features; add operations and parameters
     initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRoot_ListA(), this.getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListA(), getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
-    initEReference(getRoot_ListB(), this.getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListB(), getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
-    initEReference(getRoot_ListC(), this.getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListC(), getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
-    initEReference(getRoot_ListD(), this.getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListD(), getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -1367,28 +1373,28 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(referenceObjectEClass, ReferenceObject.class, "ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getReferenceObject_ReferenceOptional(), this.getBaseObject(), null, "referenceOptional", null, 0, 1,
+    initEReference(getReferenceObject_ReferenceOptional(), getBaseObject(), null, "referenceOptional", null, 0, 1,
         ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getReferenceObject_ReferenceList(), this.getBaseObject(), null, "referenceList", null, 0, -1,
+    initEReference(getReferenceObject_ReferenceList(), getBaseObject(), null, "referenceList", null, 0, -1,
         ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getContainmentObject_ContainmentOptional(), this.getBaseObject(), null, "containmentOptional", null,
-        0, 1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getContainmentObject_ContainmentOptional(), getBaseObject(), null, "containmentOptional", null, 0, 1,
+        ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getContainmentObject_ContainmentList(), this.getBaseObject(), null, "containmentList", null, 0, -1,
+    initEReference(getContainmentObject_ContainmentList(), getBaseObject(), null, "containmentList", null, 0, -1,
         ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(unorderedListEClass, UnorderedList.class, "UnorderedList", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getUnorderedList_Contained(), this.getUnorderedList(), null, "contained", null, 0, -1,
+    initEReference(getUnorderedList_Contained(), getUnorderedList(), null, "contained", null, 0, -1,
         UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-    initEReference(getUnorderedList_Referenced(), this.getUnorderedList(), null, "referenced", null, 0, -1,
+    initEReference(getUnorderedList_Referenced(), getUnorderedList(), null, "referenced", null, 0, -1,
         UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
@@ -1396,10 +1402,10 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPropertiesMap_Label(), ecorePackage.getEString(), "label", null, 0, 1, PropertiesMap.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_PersistentMap(), this.getPropertiesMapEntry(), null, "persistentMap", null, 0, -1,
+    initEReference(getPropertiesMap_PersistentMap(), getPropertiesMapEntry(), null, "persistentMap", null, 0, -1,
         PropertiesMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_TransientMap(), this.getPropertiesMapEntry(), null, "transientMap", null, 0, -1,
+    initEReference(getPropertiesMap_TransientMap(), getPropertiesMapEntry(), null, "transientMap", null, 0, -1,
         PropertiesMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1407,7 +1413,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
         !IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPropertiesMapEntry_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMapEntry_Value(), this.getPropertiesMapEntryValue(), null, "value", null, 0, 1,
+    initEReference(getPropertiesMapEntry_Value(), getPropertiesMapEntryValue(), null, "value", null, 0, 1,
         Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1419,16 +1425,16 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(aEClass, org.eclipse.emf.cdo.tests.model6.A.class, "A", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getA_OwnedDs(), this.getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
+    initEReference(getA_OwnedDs(), getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getA_OwnedBs(), this.getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
+    initEReference(getA_OwnedBs(), getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(bEClass, org.eclipse.emf.cdo.tests.model6.B.class, "B", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getB_OwnedC(), this.getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class,
+    initEReference(getB_OwnedC(), getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
@@ -1443,13 +1449,13 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(eEClass, org.eclipse.emf.cdo.tests.model6.E.class, "E", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getE_OwnedAs(), this.getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class,
+    initEReference(getE_OwnedAs(), getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(fEClass, org.eclipse.emf.cdo.tests.model6.F.class, "F", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getF_OwnedEs(), this.getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class,
+    initEReference(getF_OwnedEs(), getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
@@ -1458,12 +1464,12 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     initEAttribute(getG_Dummy(), ecorePackage.getEString(), "dummy", null, 1, 1,
         org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getG_Reference(), this.getBaseObject(), null, "reference", null, 1, 1,
-        org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getG_List(), this.getBaseObject(), null, "list", null, 0, -1,
+    initEReference(getG_Reference(), getBaseObject(), null, "reference", null, 1, 1,
         org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getG_List(), getBaseObject(), null, "list", null, 0, -1, org.eclipse.emf.cdo.tests.model6.G.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     addEOperation(gEClass, ecorePackage.getEBoolean(), "isAttributeModified", 1, 1, IS_UNIQUE, IS_ORDERED);
 
@@ -1473,20 +1479,18 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(myEnumListEClass, MyEnumList.class, "MyEnumList", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumList_MyEnum(), this.getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT,
+    initEAttribute(getMyEnumList_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(myEnumListUnsettableEClass, MyEnumListUnsettable.class, "MyEnumListUnsettable", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumListUnsettable_MyEnum(), this.getMyEnum(), "myEnum", null, 0, -1,
-        MyEnumListUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMyEnumListUnsettable_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumListUnsettable.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(holderEClass, Holder.class, "Holder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getHolder_Held(), this.getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getHolder_Owned(), this.getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT,
+    initEReference(getHolder_Held(), getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEReference(getHolder_Owned(), getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -1498,7 +1502,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(hasNillableAttributeEClass, HasNillableAttribute.class, "HasNillableAttribute", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getHasNillableAttribute_Nillable(), this.getMyString(), "nillable", null, 0, 1,
+    initEAttribute(getHasNillableAttribute_Nillable(), getMyString(), "nillable", null, 0, 1,
         HasNillableAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
@@ -1567,9 +1571,8 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass());
     EGenericType g2 = createEGenericType();
     g1.getETypeArguments().add(g2);
-    initEAttribute(getUnsettableAttributes_AttrJavaClass(), g1, "attrJavaClass", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrJavaClass(), g1, "attrJavaClass", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getUnsettableAttributes_AttrJavaObject(), ecorePackage.getEJavaObject(), "attrJavaObject", null, 0,
         1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
@@ -1597,8 +1600,8 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     initEReference(getCanReferenceLegacy_MultipleContainment(), ecorePackage.getEObject(), null, "multipleContainment",
         null, 0, -1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCanReferenceLegacy_SingleReference(), ecorePackage.getEObject(), null, "singleReference", null,
-        0, 1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getCanReferenceLegacy_SingleReference(), ecorePackage.getEObject(), null, "singleReference", null, 0,
+        1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getCanReferenceLegacy_MultipleReference(), ecorePackage.getEObject(), null, "multipleReference",
         null, 0, -1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryImpl.java
index 578b4bd403..c50f2916ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryImpl.java
@@ -125,7 +125,7 @@ public class PropertiesMapEntryImpl extends CDOObjectImpl implements BasicEMap.E
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java
index 74b691fc18..f4c2cb14fe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EClass;
  * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl#getReferenceList <em>Reference List</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObject
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java
index 71e1699204..43a8769d75 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/UnsettableAttributesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/UnsettableAttributesImpl.java
index 54b81428ff..2d739e4a8f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/UnsettableAttributesImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/UnsettableAttributesImpl.java
@@ -777,7 +777,7 @@ public class UnsettableAttributesImpl extends CDOObjectImpl implements Unsettabl
    */
   public Object getAttrJavaObject()
   {
-    return (Object)eGet(Model6Package.Literals.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_OBJECT, true);
+    return eGet(Model6Package.Literals.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_OBJECT, true);
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Factory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Factory.java
index 5b190e7f9e..74f4c73ba7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Factory.java
@@ -263,12 +263,12 @@ public interface Model6Factory extends EFactory, org.eclipse.emf.cdo.tests.model
   CanReferenceLegacy createCanReferenceLegacy();
 
   /**
-  	 * Returns the package supported by this factory.
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @return the package supported by this factory.
-  	 * @generated
-  	 */
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the package supported by this factory.
+   * @generated
+   */
   Model6Package getModel6Package();
 
 } // Model6Factory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Package.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Package.java
index 1041c43a60..4762106362 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/Model6Package.java
@@ -885,7 +885,7 @@ public interface Model6Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * The feature id for the '<em><b>Attribute</b></em>' attribute.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -894,7 +894,7 @@ public interface Model6Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * The number of structural features of the '<em>Empty String Default Unsettable</em>' class.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -1137,58 +1137,58 @@ public interface Model6Package extends EPackage, org.eclipse.emf.cdo.tests.model
   int CAN_REFERENCE_LEGACY = 24;
 
   /**
-  	 * The feature id for the '<em><b>Single Containment</b></em>' containment reference.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The feature id for the '<em><b>Single Containment</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT = 0;
 
   /**
-  	 * The feature id for the '<em><b>Multiple Containment</b></em>' containment reference list.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The feature id for the '<em><b>Multiple Containment</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY__MULTIPLE_CONTAINMENT = 1;
 
   /**
-  	 * The feature id for the '<em><b>Single Reference</b></em>' reference.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The feature id for the '<em><b>Single Reference</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY__SINGLE_REFERENCE = 2;
 
   /**
-  	 * The feature id for the '<em><b>Multiple Reference</b></em>' reference list.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The feature id for the '<em><b>Multiple Reference</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY__MULTIPLE_REFERENCE = 3;
 
   /**
-  	 * The number of structural features of the '<em>Can Reference Legacy</em>' class.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * The number of structural features of the '<em>Can Reference Legacy</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
   int CAN_REFERENCE_LEGACY_FEATURE_COUNT = 4;
 
   /**
-  	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}' enum.
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @see org.eclipse.emf.cdo.tests.model6.MyEnum
-  	 * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getMyEnum()
-  	 * @generated
-  	 */
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnum
+   * @see org.eclipse.emf.cdo.tests.model6.legacy.impl.Model6PackageImpl#getMyEnum()
+   * @generated
+   */
   int MY_ENUM = 25;
 
   /**
@@ -1821,7 +1821,7 @@ public interface Model6Package extends EPackage, org.eclipse.emf.cdo.tests.model
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.EmptyStringDefaultUnsettable#getAttribute <em>Attribute</em>}'.
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Attribute</em>'.
    * @see org.eclipse.emf.cdo.tests.model6.EmptyStringDefaultUnsettable#getAttribute()
    * @see #getEmptyStringDefaultUnsettable()
@@ -2103,57 +2103,57 @@ public interface Model6Package extends EPackage, org.eclipse.emf.cdo.tests.model
   EClass getCanReferenceLegacy();
 
   /**
-  	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleContainment <em>Single Containment</em>}'.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @return the meta object for the containment reference '<em>Single Containment</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleContainment()
-  	 * @see #getCanReferenceLegacy()
-  	 * @generated
-  	 */
+   * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleContainment <em>Single Containment</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Single Containment</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleContainment()
+   * @see #getCanReferenceLegacy()
+   * @generated
+   */
   EReference getCanReferenceLegacy_SingleContainment();
 
   /**
-  	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleContainment <em>Multiple Containment</em>}'.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @return the meta object for the containment reference list '<em>Multiple Containment</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleContainment()
-  	 * @see #getCanReferenceLegacy()
-  	 * @generated
-  	 */
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleContainment <em>Multiple Containment</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Multiple Containment</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleContainment()
+   * @see #getCanReferenceLegacy()
+   * @generated
+   */
   EReference getCanReferenceLegacy_MultipleContainment();
 
   /**
-  	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleReference <em>Single Reference</em>}'.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @return the meta object for the reference '<em>Single Reference</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleReference()
-  	 * @see #getCanReferenceLegacy()
-  	 * @generated
-  	 */
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleReference <em>Single Reference</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Single Reference</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getSingleReference()
+   * @see #getCanReferenceLegacy()
+   * @generated
+   */
   EReference getCanReferenceLegacy_SingleReference();
 
   /**
-  	 * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleReference <em>Multiple Reference</em>}'.
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @return the meta object for the reference list '<em>Multiple Reference</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleReference()
-  	 * @see #getCanReferenceLegacy()
-  	 * @generated
-  	 */
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleReference <em>Multiple Reference</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference list '<em>Multiple Reference</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy#getMultipleReference()
+   * @see #getCanReferenceLegacy()
+   * @generated
+   */
   EReference getCanReferenceLegacy_MultipleReference();
 
   /**
-  	 * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}'.
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @return the meta object for enum '<em>My Enum</em>'.
-  	 * @see org.eclipse.emf.cdo.tests.model6.MyEnum
-  	 * @generated
-  	 */
+   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model6.MyEnum <em>My Enum</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for enum '<em>My Enum</em>'.
+   * @see org.eclipse.emf.cdo.tests.model6.MyEnum
+   * @generated
+   */
   EEnum getMyEnum();
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java
index 5d2206095c..a190ca42e1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BImpl.java
@@ -76,16 +76,20 @@ public class BImpl extends EObjectImpl implements B
       if (ownedC != oldOwnedC)
       {
         InternalEObject newOwnedC = (InternalEObject)ownedC;
-        NotificationChain msgs = oldOwnedC.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C,
-            null, null);
+        NotificationChain msgs = oldOwnedC.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null,
+            null);
         if (newOwnedC.eInternalContainer() == null)
         {
           msgs = newOwnedC.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null, msgs);
         }
         if (msgs != null)
+        {
           msgs.dispatch();
+        }
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.B__OWNED_C, oldOwnedC, ownedC));
+        }
       }
     }
     return ownedC;
@@ -114,9 +118,13 @@ public class BImpl extends EObjectImpl implements B
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.B__OWNED_C,
           oldOwnedC, newOwnedC);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -131,17 +139,25 @@ public class BImpl extends EObjectImpl implements B
     {
       NotificationChain msgs = null;
       if (ownedC != null)
+      {
         msgs = ((InternalEObject)ownedC).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null,
             msgs);
+      }
       if (newOwnedC != null)
+      {
         msgs = ((InternalEObject)newOwnedC).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null,
             msgs);
+      }
       msgs = basicSetOwnedC(newOwnedC, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.B__OWNED_C, newOwnedC, newOwnedC));
+    }
   }
 
   /**
@@ -170,7 +186,9 @@ public class BImpl extends EObjectImpl implements B
     {
     case Model6Package.B__OWNED_C:
       if (resolve)
+      {
         return getOwnedC();
+      }
       return basicGetOwnedC();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java
index 37bc45d4e7..04edd401a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/BaseObjectImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -40,7 +40,7 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
   /**
    * The default value of the '{@link #getAttributeOptional() <em>Attribute Optional</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getAttributeOptional()
    * @generated
    * @ordered
@@ -50,7 +50,7 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
   /**
    * The cached value of the '{@link #getAttributeOptional() <em>Attribute Optional</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getAttributeOptional()
    * @generated
    * @ordered
@@ -60,7 +60,7 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
   /**
    * The default value of the '{@link #getAttributeRequired() <em>Attribute Required</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getAttributeRequired()
    * @generated
    * @ordered
@@ -70,7 +70,7 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
   /**
    * The cached value of the '{@link #getAttributeRequired() <em>Attribute Required</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getAttributeRequired()
    * @generated
    * @ordered
@@ -124,8 +124,10 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
     String oldAttributeOptional = attributeOptional;
     attributeOptional = newAttributeOptional;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL,
           oldAttributeOptional, attributeOptional));
+    }
   }
 
   /**
@@ -146,8 +148,10 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
     String oldAttributeRequired = attributeRequired;
     attributeRequired = newAttributeRequired;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED,
           oldAttributeRequired, attributeRequired));
+    }
   }
 
   /**
@@ -238,11 +242,11 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
     switch (featureID)
     {
     case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:
-      return ATTRIBUTE_OPTIONAL_EDEFAULT == null ? attributeOptional != null : !ATTRIBUTE_OPTIONAL_EDEFAULT
-          .equals(attributeOptional);
+      return ATTRIBUTE_OPTIONAL_EDEFAULT == null ? attributeOptional != null
+          : !ATTRIBUTE_OPTIONAL_EDEFAULT.equals(attributeOptional);
     case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:
-      return ATTRIBUTE_REQUIRED_EDEFAULT == null ? attributeRequired != null : !ATTRIBUTE_REQUIRED_EDEFAULT
-          .equals(attributeRequired);
+      return ATTRIBUTE_REQUIRED_EDEFAULT == null ? attributeRequired != null
+          : !ATTRIBUTE_REQUIRED_EDEFAULT.equals(attributeRequired);
     case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:
       return attributeList != null && !attributeList.isEmpty();
     }
@@ -257,7 +261,9 @@ public class BaseObjectImpl extends EObjectImpl implements BaseObject
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (attributeOptional: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CanReferenceLegacyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CanReferenceLegacyImpl.java
index 93d4a3ca7b..0da29b3eed 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CanReferenceLegacyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/CanReferenceLegacyImpl.java
@@ -10,28 +10,23 @@
  */
 package org.eclipse.emf.cdo.tests.model6.legacy.impl;
 
-import java.util.Collection;
-
 import org.eclipse.emf.cdo.tests.model6.CanReferenceLegacy;
-
 import org.eclipse.emf.cdo.tests.model6.legacy.Model6Package;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
+import java.util.Collection;
+
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Can Reference Legacy</b></em>'.
@@ -125,18 +120,22 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
       if (singleContainment != oldSingleContainment)
       {
         InternalEObject newSingleContainment = (InternalEObject)singleContainment;
-        NotificationChain msgs = oldSingleContainment.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, null);
+        NotificationChain msgs = oldSingleContainment.eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, null);
         if (newSingleContainment.eInternalContainer() == null)
         {
-          msgs = newSingleContainment.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-              - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
+          msgs = newSingleContainment.eInverseAdd(this,
+              EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
         }
         if (msgs != null)
+        {
           msgs.dispatch();
+        }
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, oldSingleContainment, singleContainment));
+        }
       }
     }
     return singleContainment;
@@ -166,9 +165,13 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, oldSingleContainment, newSingleContainment);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -184,18 +187,26 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
     {
       NotificationChain msgs = null;
       if (singleContainment != null)
-        msgs = ((InternalEObject)singleContainment).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)singleContainment).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
+      }
       if (newSingleContainment != null)
-        msgs = ((InternalEObject)newSingleContainment).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
+      {
+        msgs = ((InternalEObject)newSingleContainment).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT, null, msgs);
+      }
       msgs = basicSetSingleContainment(newSingleContainment, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT,
           newSingleContainment, newSingleContainment));
+    }
   }
 
   /**
@@ -227,8 +238,10 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
       if (singleReference != oldSingleReference)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Model6Package.CAN_REFERENCE_LEGACY__SINGLE_REFERENCE, oldSingleReference, singleReference));
+        }
       }
     }
     return singleReference;
@@ -254,8 +267,10 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
     EObject oldSingleReference = singleReference;
     singleReference = newSingleReference;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CAN_REFERENCE_LEGACY__SINGLE_REFERENCE,
           oldSingleReference, singleReference));
+    }
   }
 
   /**
@@ -303,13 +318,17 @@ public class CanReferenceLegacyImpl extends EObjectImpl implements CanReferenceL
     {
     case Model6Package.CAN_REFERENCE_LEGACY__SINGLE_CONTAINMENT:
       if (resolve)
+      {
         return getSingleContainment();
+      }
       return basicGetSingleContainment();
     case Model6Package.CAN_REFERENCE_LEGACY__MULTIPLE_CONTAINMENT:
       return getMultipleContainment();
     case Model6Package.CAN_REFERENCE_LEGACY__SINGLE_REFERENCE:
       if (resolve)
+      {
         return getSingleReference();
+      }
       return basicGetSingleReference();
     case Model6Package.CAN_REFERENCE_LEGACY__MULTIPLE_REFERENCE:
       return getMultipleReference();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java
index f4c8d09dcb..f695e243f9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ContainmentObjectImpl.java
@@ -91,18 +91,22 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
       if (containmentOptional != oldContainmentOptional)
       {
         InternalEObject newContainmentOptional = (InternalEObject)containmentOptional;
-        NotificationChain msgs = oldContainmentOptional.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, null);
+        NotificationChain msgs = oldContainmentOptional.eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, null);
         if (newContainmentOptional.eInternalContainer() == null)
         {
-          msgs = newContainmentOptional.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-              - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
+          msgs = newContainmentOptional.eInverseAdd(this,
+              EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
         }
         if (msgs != null)
+        {
           msgs.dispatch();
+        }
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, oldContainmentOptional, containmentOptional));
+        }
       }
     }
     return containmentOptional;
@@ -131,9 +135,13 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, oldContainmentOptional, newContainmentOptional);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -148,18 +156,26 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
     {
       NotificationChain msgs = null;
       if (containmentOptional != null)
-        msgs = ((InternalEObject)containmentOptional).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
+      {
+        msgs = ((InternalEObject)containmentOptional).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
+      }
       if (newContainmentOptional != null)
-        msgs = ((InternalEObject)newContainmentOptional).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
+      {
+        msgs = ((InternalEObject)newContainmentOptional).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);
+      }
       msgs = basicSetContainmentOptional(newContainmentOptional, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,
           newContainmentOptional, newContainmentOptional));
+    }
   }
 
   /**
@@ -204,7 +220,9 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment
     {
     case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:
       if (resolve)
+      {
         return getContainmentOptional();
+      }
       return basicGetContainmentOptional();
     case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:
       return getContainmentList();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java
index ed033e08d5..324f59d26b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/DImpl.java
@@ -85,9 +85,13 @@ public class DImpl extends EObjectImpl implements D
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.D__DATA, oldData,
           newData);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -102,15 +106,23 @@ public class DImpl extends EObjectImpl implements D
     {
       NotificationChain msgs = null;
       if (data != null)
+      {
         msgs = ((InternalEObject)data).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.D__DATA, null, msgs);
+      }
       if (newData != null)
+      {
         msgs = ((InternalEObject)newData).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.D__DATA, null, msgs);
+      }
       msgs = basicSetData(newData, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.D__DATA, newData, newData));
+    }
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultImpl.java
index 8ca8881302..81f0aa37e2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultImpl.java
@@ -94,8 +94,10 @@ public class EmptyStringDefaultImpl extends EObjectImpl implements EmptyStringDe
     String oldAttribute = attribute;
     attribute = newAttribute;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.EMPTY_STRING_DEFAULT__ATTRIBUTE,
-          oldAttribute, attribute));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.EMPTY_STRING_DEFAULT__ATTRIBUTE, oldAttribute,
+          attribute));
+    }
   }
 
   /**
@@ -173,7 +175,9 @@ public class EmptyStringDefaultImpl extends EObjectImpl implements EmptyStringDe
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (attribute: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultUnsettableImpl.java
index 8501eae57d..84272ac364 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/EmptyStringDefaultUnsettableImpl.java
@@ -105,8 +105,10 @@ public class EmptyStringDefaultUnsettableImpl extends EObjectImpl implements Emp
     boolean oldAttributeESet = attributeESet;
     attributeESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.EMPTY_STRING_DEFAULT_UNSETTABLE__ATTRIBUTE,
           oldAttribute, attribute, !oldAttributeESet));
+    }
   }
 
   /**
@@ -121,8 +123,10 @@ public class EmptyStringDefaultUnsettableImpl extends EObjectImpl implements Emp
     attribute = ATTRIBUTE_EDEFAULT;
     attributeESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.EMPTY_STRING_DEFAULT_UNSETTABLE__ATTRIBUTE,
           oldAttribute, ATTRIBUTE_EDEFAULT, oldAttributeESet));
+    }
   }
 
   /**
@@ -210,14 +214,20 @@ public class EmptyStringDefaultUnsettableImpl extends EObjectImpl implements Emp
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (attribute: ");
     if (attributeESet)
+    {
       result.append(attribute);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java
index 3f25dd4e6d..e79b10824d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/GImpl.java
@@ -177,7 +177,9 @@ public class GImpl extends EObjectImpl implements G
     String oldDummy = dummy;
     dummy = newDummy;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.G__DUMMY, oldDummy, dummy));
+    }
   }
 
   /**
@@ -194,7 +196,10 @@ public class GImpl extends EObjectImpl implements G
       if (reference != oldReference)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.G__REFERENCE, oldReference, reference));
+        {
+          eNotify(
+              new ENotificationImpl(this, Notification.RESOLVE, Model6Package.G__REFERENCE, oldReference, reference));
+        }
       }
     }
     return reference;
@@ -220,7 +225,9 @@ public class GImpl extends EObjectImpl implements G
     BaseObject oldReference = reference;
     reference = newReference;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.G__REFERENCE, oldReference, reference));
+    }
   }
 
   /**
@@ -289,7 +296,9 @@ public class GImpl extends EObjectImpl implements G
       return getDummy();
     case Model6Package.G__REFERENCE:
       if (resolve)
+      {
         return getReference();
+      }
       return basicGetReference();
     case Model6Package.G__LIST:
       return getList();
@@ -374,7 +383,9 @@ public class GImpl extends EObjectImpl implements G
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (dummy: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java
index c94c1eef6a..6ad71bb0df 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HasNillableAttributeImpl.java
@@ -105,8 +105,10 @@ public class HasNillableAttributeImpl extends EObjectImpl implements HasNillable
     boolean oldNillableESet = nillableESet;
     nillableESet = true;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.HAS_NILLABLE_ATTRIBUTE__NILLABLE,
-          oldNillable, nillable, !oldNillableESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.HAS_NILLABLE_ATTRIBUTE__NILLABLE, oldNillable,
+          nillable, !oldNillableESet));
+    }
   }
 
   /**
@@ -121,8 +123,10 @@ public class HasNillableAttributeImpl extends EObjectImpl implements HasNillable
     nillable = NILLABLE_EDEFAULT;
     nillableESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.HAS_NILLABLE_ATTRIBUTE__NILLABLE,
           oldNillable, NILLABLE_EDEFAULT, oldNillableESet));
+    }
   }
 
   /**
@@ -210,14 +214,20 @@ public class HasNillableAttributeImpl extends EObjectImpl implements HasNillable
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (nillable: ");
     if (nillableESet)
+    {
       result.append(nillable);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HoldableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HoldableImpl.java
index 37f24fcc27..740cddec34 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HoldableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/HoldableImpl.java
@@ -94,7 +94,9 @@ public abstract class HoldableImpl extends EObjectImpl implements Holdable
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.HOLDABLE__NAME, oldName, name));
+    }
   }
 
   /**
@@ -172,7 +174,9 @@ public abstract class HoldableImpl extends EObjectImpl implements Holdable
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java
index 865e33da22..22652674de 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6FactoryImpl.java
@@ -441,16 +441,18 @@ public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public MyEnum createMyEnumFromString(EDataType eDataType, String initialValue)
   {
     MyEnum result = MyEnum.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java
index b72dc3dc9b..eba3155eee 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/Model6PackageImpl.java
@@ -213,10 +213,10 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   private EClass canReferenceLegacyEClass = null;
 
   /**
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   private EEnum myEnumEEnum = null;
 
   /**
@@ -252,7 +252,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Model6Package#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -265,11 +265,13 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   public static Model6Package init()
   {
     if (isInited)
+    {
       return (Model6Package)EPackage.Registry.INSTANCE.getEPackage(Model6Package.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Model6PackageImpl());
+    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model6PackageImpl());
 
     isInited = true;
 
@@ -839,7 +841,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
   /**
    * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
   public EAttribute getEmptyStringDefaultUnsettable_Attribute()
@@ -1098,50 +1100,50 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EReference getCanReferenceLegacy_SingleContainment()
   {
     return (EReference)canReferenceLegacyEClass.getEStructuralFeatures().get(0);
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EReference getCanReferenceLegacy_MultipleContainment()
   {
     return (EReference)canReferenceLegacyEClass.getEStructuralFeatures().get(1);
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EReference getCanReferenceLegacy_SingleReference()
   {
     return (EReference)canReferenceLegacyEClass.getEStructuralFeatures().get(2);
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-  	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EReference getCanReferenceLegacy_MultipleReference()
   {
     return (EReference)canReferenceLegacyEClass.getEStructuralFeatures().get(3);
   }
 
   /**
-  	 * <!-- begin-user-doc -->
-       * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
   public EEnum getMyEnum()
   {
     return myEnumEEnum;
@@ -1181,7 +1183,9 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -1320,7 +1324,9 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -1333,23 +1339,23 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    referenceObjectEClass.getESuperTypes().add(this.getBaseObject());
-    containmentObjectEClass.getESuperTypes().add(this.getBaseObject());
-    holderEClass.getESuperTypes().add(this.getHoldable());
-    thingEClass.getESuperTypes().add(this.getHoldable());
+    referenceObjectEClass.getESuperTypes().add(getBaseObject());
+    containmentObjectEClass.getESuperTypes().add(getBaseObject());
+    holderEClass.getESuperTypes().add(getHoldable());
+    thingEClass.getESuperTypes().add(getHoldable());
 
     // Initialize classes and features; add operations and parameters
     initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRoot_ListA(), this.getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListA(), getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
-    initEReference(getRoot_ListB(), this.getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListB(), getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
-    initEReference(getRoot_ListC(), this.getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListC(), getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
-    initEReference(getRoot_ListD(), this.getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
+    initEReference(getRoot_ListD(), getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -1367,28 +1373,28 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(referenceObjectEClass, ReferenceObject.class, "ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getReferenceObject_ReferenceOptional(), this.getBaseObject(), null, "referenceOptional", null, 0, 1,
+    initEReference(getReferenceObject_ReferenceOptional(), getBaseObject(), null, "referenceOptional", null, 0, 1,
         ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getReferenceObject_ReferenceList(), this.getBaseObject(), null, "referenceList", null, 0, -1,
+    initEReference(getReferenceObject_ReferenceList(), getBaseObject(), null, "referenceList", null, 0, -1,
         ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getContainmentObject_ContainmentOptional(), this.getBaseObject(), null, "containmentOptional", null,
-        0, 1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getContainmentObject_ContainmentOptional(), getBaseObject(), null, "containmentOptional", null, 0, 1,
+        ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getContainmentObject_ContainmentList(), this.getBaseObject(), null, "containmentList", null, 0, -1,
+    initEReference(getContainmentObject_ContainmentList(), getBaseObject(), null, "containmentList", null, 0, -1,
         ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(unorderedListEClass, UnorderedList.class, "UnorderedList", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getUnorderedList_Contained(), this.getUnorderedList(), null, "contained", null, 0, -1,
+    initEReference(getUnorderedList_Contained(), getUnorderedList(), null, "contained", null, 0, -1,
         UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-    initEReference(getUnorderedList_Referenced(), this.getUnorderedList(), null, "referenced", null, 0, -1,
+    initEReference(getUnorderedList_Referenced(), getUnorderedList(), null, "referenced", null, 0, -1,
         UnorderedList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
@@ -1396,10 +1402,10 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPropertiesMap_Label(), ecorePackage.getEString(), "label", null, 0, 1, PropertiesMap.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_PersistentMap(), this.getPropertiesMapEntry(), null, "persistentMap", null, 0, -1,
+    initEReference(getPropertiesMap_PersistentMap(), getPropertiesMapEntry(), null, "persistentMap", null, 0, -1,
         PropertiesMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMap_TransientMap(), this.getPropertiesMapEntry(), null, "transientMap", null, 0, -1,
+    initEReference(getPropertiesMap_TransientMap(), getPropertiesMapEntry(), null, "transientMap", null, 0, -1,
         PropertiesMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1407,7 +1413,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
         !IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPropertiesMapEntry_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPropertiesMapEntry_Value(), this.getPropertiesMapEntryValue(), null, "value", null, 0, 1,
+    initEReference(getPropertiesMapEntry_Value(), getPropertiesMapEntryValue(), null, "value", null, 0, 1,
         Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1419,16 +1425,16 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(aEClass, org.eclipse.emf.cdo.tests.model6.A.class, "A", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getA_OwnedDs(), this.getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
+    initEReference(getA_OwnedDs(), getD(), null, "ownedDs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getA_OwnedBs(), this.getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
+    initEReference(getA_OwnedBs(), getB(), null, "ownedBs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.A.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(bEClass, org.eclipse.emf.cdo.tests.model6.B.class, "B", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getB_OwnedC(), this.getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class,
+    initEReference(getB_OwnedC(), getC(), null, "ownedC", null, 0, 1, org.eclipse.emf.cdo.tests.model6.B.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
@@ -1443,13 +1449,13 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(eEClass, org.eclipse.emf.cdo.tests.model6.E.class, "E", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getE_OwnedAs(), this.getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class,
+    initEReference(getE_OwnedAs(), getA(), null, "ownedAs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.E.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
     initEClass(fEClass, org.eclipse.emf.cdo.tests.model6.F.class, "F", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getF_OwnedEs(), this.getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class,
+    initEReference(getF_OwnedEs(), getE(), null, "ownedEs", null, 0, -1, org.eclipse.emf.cdo.tests.model6.F.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
@@ -1458,12 +1464,12 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     initEAttribute(getG_Dummy(), ecorePackage.getEString(), "dummy", null, 1, 1,
         org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getG_Reference(), this.getBaseObject(), null, "reference", null, 1, 1,
-        org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getG_List(), this.getBaseObject(), null, "list", null, 0, -1,
+    initEReference(getG_Reference(), getBaseObject(), null, "reference", null, 1, 1,
         org.eclipse.emf.cdo.tests.model6.G.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getG_List(), getBaseObject(), null, "list", null, 0, -1, org.eclipse.emf.cdo.tests.model6.G.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     addEOperation(gEClass, ecorePackage.getEBoolean(), "isAttributeModified", 1, 1, IS_UNIQUE, IS_ORDERED);
 
@@ -1473,20 +1479,18 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(myEnumListEClass, MyEnumList.class, "MyEnumList", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumList_MyEnum(), this.getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT,
+    initEAttribute(getMyEnumList_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumList.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(myEnumListUnsettableEClass, MyEnumListUnsettable.class, "MyEnumListUnsettable", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMyEnumListUnsettable_MyEnum(), this.getMyEnum(), "myEnum", null, 0, -1,
-        MyEnumListUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMyEnumListUnsettable_MyEnum(), getMyEnum(), "myEnum", null, 0, -1, MyEnumListUnsettable.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(holderEClass, Holder.class, "Holder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getHolder_Held(), this.getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED,
-        IS_ORDERED);
-    initEReference(getHolder_Owned(), this.getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT,
+    initEReference(getHolder_Held(), getHoldable(), null, "held", null, 0, -1, Holder.class, IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEReference(getHolder_Owned(), getHoldable(), null, "owned", null, 0, -1, Holder.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -1498,7 +1502,7 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
 
     initEClass(hasNillableAttributeEClass, HasNillableAttribute.class, "HasNillableAttribute", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getHasNillableAttribute_Nillable(), this.getMyString(), "nillable", null, 0, 1,
+    initEAttribute(getHasNillableAttribute_Nillable(), getMyString(), "nillable", null, 0, 1,
         HasNillableAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
@@ -1567,9 +1571,8 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass());
     EGenericType g2 = createEGenericType();
     g1.getETypeArguments().add(g2);
-    initEAttribute(getUnsettableAttributes_AttrJavaClass(), g1, "attrJavaClass", null, 0, 1,
-        UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getUnsettableAttributes_AttrJavaClass(), g1, "attrJavaClass", null, 0, 1, UnsettableAttributes.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getUnsettableAttributes_AttrJavaObject(), ecorePackage.getEJavaObject(), "attrJavaObject", null, 0,
         1, UnsettableAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
@@ -1597,8 +1600,8 @@ public class Model6PackageImpl extends EPackageImpl implements Model6Package
     initEReference(getCanReferenceLegacy_MultipleContainment(), ecorePackage.getEObject(), null, "multipleContainment",
         null, 0, -1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCanReferenceLegacy_SingleReference(), ecorePackage.getEObject(), null, "singleReference", null,
-        0, 1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getCanReferenceLegacy_SingleReference(), ecorePackage.getEObject(), null, "singleReference", null, 0,
+        1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getCanReferenceLegacy_MultipleReference(), ecorePackage.getEObject(), null, "multipleReference",
         null, 0, -1, CanReferenceLegacy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListImpl.java
index 0892eab87c..72a292f0e0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListImpl.java
@@ -158,7 +158,9 @@ public class MyEnumListImpl extends EObjectImpl implements MyEnumList
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (myEnum: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java
index 03b02b0e2d..a39f9eb218 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/MyEnumListUnsettableImpl.java
@@ -91,7 +91,9 @@ public class MyEnumListUnsettableImpl extends EObjectImpl implements MyEnumListU
   public void unsetMyEnum()
   {
     if (myEnum != null)
+    {
       ((InternalEList.Unsettable<?>)myEnum).unset();
+    }
   }
 
   /**
@@ -181,7 +183,9 @@ public class MyEnumListUnsettableImpl extends EObjectImpl implements MyEnumListU
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (myEnum: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java
index 80a928dc5f..1176c3dd1f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryImpl.java
@@ -110,7 +110,9 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
     String oldKey = key;
     key = newKey;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY__KEY, oldKey, key));
+    }
   }
 
   /**
@@ -127,18 +129,22 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
       if (value != oldValue)
       {
         InternalEObject newValue = (InternalEObject)value;
-        NotificationChain msgs = oldValue.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, null);
+        NotificationChain msgs = oldValue.eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, null);
         if (newValue.eInternalContainer() == null)
         {
           msgs = newValue.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null,
               msgs);
         }
         if (msgs != null)
+        {
           msgs.dispatch();
+        }
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.PROPERTIES_MAP_ENTRY__VALUE,
-              oldValue, value));
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, oldValue,
+              value));
+        }
       }
     }
     return value;
@@ -168,9 +174,13 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model6Package.PROPERTIES_MAP_ENTRY__VALUE, oldValue, newValue);
       if (msgs == null)
+      {
         msgs = notification;
+      }
       else
+      {
         msgs.add(notification);
+      }
     }
     return msgs;
   }
@@ -186,18 +196,26 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
     {
       NotificationChain msgs = null;
       if (value != null)
-        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-            - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs);
+      {
+        msgs = ((InternalEObject)value).eInverseRemove(this,
+            EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs);
+      }
       if (newValue != null)
-        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-            - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs);
+      {
+        msgs = ((InternalEObject)newValue).eInverseAdd(this,
+            EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs);
+      }
       msgs = basicSetTypedValue(newValue, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, newValue,
-          newValue));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, newValue, newValue));
+    }
   }
 
   /**
@@ -230,7 +248,9 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
       return getTypedKey();
     case Model6Package.PROPERTIES_MAP_ENTRY__VALUE:
       if (resolve)
+      {
         return getTypedValue();
+      }
       return basicGetTypedValue();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -303,7 +323,9 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (key: ");
@@ -329,7 +351,7 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent
     if (hash == -1)
     {
       Object theKey = getKey();
-      hash = (theKey == null ? 0 : theKey.hashCode());
+      hash = theKey == null ? 0 : theKey.hashCode();
     }
     return hash;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java
index 9da1b2a28c..e4a71001cf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapEntryValueImpl.java
@@ -94,8 +94,10 @@ public class PropertiesMapEntryValueImpl extends EObjectImpl implements Properti
     String oldLabel = label;
     label = newLabel;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY_VALUE__LABEL, oldLabel,
           label));
+    }
   }
 
   /**
@@ -173,7 +175,9 @@ public class PropertiesMapEntryValueImpl extends EObjectImpl implements Properti
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (label: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java
index 62a7845ce4..453527a0c5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/PropertiesMapImpl.java
@@ -123,7 +123,9 @@ public class PropertiesMapImpl extends EObjectImpl implements PropertiesMap
     String oldLabel = label;
     label = newLabel;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP__LABEL, oldLabel, label));
+    }
   }
 
   /**
@@ -188,14 +190,22 @@ public class PropertiesMapImpl extends EObjectImpl implements PropertiesMap
       return getLabel();
     case Model6Package.PROPERTIES_MAP__PERSISTENT_MAP:
       if (coreType)
+      {
         return getPersistentMap();
+      }
       else
+      {
         return getPersistentMap().map();
+      }
     case Model6Package.PROPERTIES_MAP__TRANSIENT_MAP:
       if (coreType)
+      {
         return getTransientMap();
+      }
       else
+      {
         return getTransientMap().map();
+      }
     }
     return super.eGet(featureID, resolve, coreType);
   }
@@ -275,7 +285,9 @@ public class PropertiesMapImpl extends EObjectImpl implements PropertiesMap
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (label: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java
index d21ede2b12..3a27441a84 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/ReferenceObjectImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -37,7 +37,7 @@ import java.util.Collection;
  * </li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObject
@@ -45,7 +45,7 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje
   /**
    * The cached value of the '{@link #getReferenceOptional() <em>Reference Optional</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getReferenceOptional()
    * @generated
    * @ordered
@@ -94,8 +94,10 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje
       if (referenceOptional != oldReferenceOptional)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL,
               oldReferenceOptional, referenceOptional));
+        }
       }
     }
     return referenceOptional;
@@ -119,8 +121,10 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje
     BaseObject oldReferenceOptional = referenceOptional;
     referenceOptional = newReferenceOptional;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL,
           oldReferenceOptional, referenceOptional));
+    }
   }
 
   /**
@@ -148,7 +152,9 @@ public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObje
     {
     case Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL:
       if (resolve)
+      {
         return getReferenceOptional();
+      }
       return basicGetReferenceOptional();
     case Model6Package.REFERENCE_OBJECT__REFERENCE_LIST:
       return getReferenceList();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/RootImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/RootImpl.java
index e4150e60c7..4a62c8b806 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/RootImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/RootImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnsettableAttributesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnsettableAttributesImpl.java
index 1859a8cda5..0e70ce5829 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnsettableAttributesImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/impl/UnsettableAttributesImpl.java
@@ -759,8 +759,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrBigDecimalESet = attrBigDecimalESet;
     attrBigDecimalESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_DECIMAL,
           oldAttrBigDecimal, attrBigDecimal, !oldAttrBigDecimalESet));
+    }
   }
 
   /**
@@ -775,8 +777,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBigDecimal = ATTR_BIG_DECIMAL_EDEFAULT;
     attrBigDecimalESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_DECIMAL,
           oldAttrBigDecimal, ATTR_BIG_DECIMAL_EDEFAULT, oldAttrBigDecimalESet));
+    }
   }
 
   /**
@@ -811,8 +815,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrBigIntegerESet = attrBigIntegerESet;
     attrBigIntegerESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_INTEGER,
           oldAttrBigInteger, attrBigInteger, !oldAttrBigIntegerESet));
+    }
   }
 
   /**
@@ -827,8 +833,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBigInteger = ATTR_BIG_INTEGER_EDEFAULT;
     attrBigIntegerESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BIG_INTEGER,
           oldAttrBigInteger, ATTR_BIG_INTEGER_EDEFAULT, oldAttrBigIntegerESet));
+    }
   }
 
   /**
@@ -863,8 +871,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrBooleanESet = attrBooleanESet;
     attrBooleanESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN,
           oldAttrBoolean, attrBoolean, !oldAttrBooleanESet));
+    }
   }
 
   /**
@@ -879,8 +889,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBoolean = ATTR_BOOLEAN_EDEFAULT;
     attrBooleanESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN,
           oldAttrBoolean, ATTR_BOOLEAN_EDEFAULT, oldAttrBooleanESet));
+    }
   }
 
   /**
@@ -915,8 +927,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrBooleanObjectESet = attrBooleanObjectESet;
     attrBooleanObjectESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN_OBJECT,
           oldAttrBooleanObject, attrBooleanObject, !oldAttrBooleanObjectESet));
+    }
   }
 
   /**
@@ -931,8 +945,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrBooleanObject = ATTR_BOOLEAN_OBJECT_EDEFAULT;
     attrBooleanObjectESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BOOLEAN_OBJECT,
           oldAttrBooleanObject, ATTR_BOOLEAN_OBJECT_EDEFAULT, oldAttrBooleanObjectESet));
+    }
   }
 
   /**
@@ -967,8 +983,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrByteESet = attrByteESet;
     attrByteESet = true;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE,
-          oldAttrByte, attrByte, !oldAttrByteESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE, oldAttrByte,
+          attrByte, !oldAttrByteESet));
+    }
   }
 
   /**
@@ -983,8 +1001,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrByte = ATTR_BYTE_EDEFAULT;
     attrByteESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE,
           oldAttrByte, ATTR_BYTE_EDEFAULT, oldAttrByteESet));
+    }
   }
 
   /**
@@ -1019,8 +1039,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrByteArrayESet = attrByteArrayESet;
     attrByteArrayESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_ARRAY,
           oldAttrByteArray, attrByteArray, !oldAttrByteArrayESet));
+    }
   }
 
   /**
@@ -1035,8 +1057,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrByteArray = ATTR_BYTE_ARRAY_EDEFAULT;
     attrByteArrayESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_ARRAY,
           oldAttrByteArray, ATTR_BYTE_ARRAY_EDEFAULT, oldAttrByteArrayESet));
+    }
   }
 
   /**
@@ -1071,8 +1095,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrByteObjectESet = attrByteObjectESet;
     attrByteObjectESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_OBJECT,
           oldAttrByteObject, attrByteObject, !oldAttrByteObjectESet));
+    }
   }
 
   /**
@@ -1087,8 +1113,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrByteObject = ATTR_BYTE_OBJECT_EDEFAULT;
     attrByteObjectESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_BYTE_OBJECT,
           oldAttrByteObject, ATTR_BYTE_OBJECT_EDEFAULT, oldAttrByteObjectESet));
+    }
   }
 
   /**
@@ -1123,8 +1151,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrCharESet = attrCharESet;
     attrCharESet = true;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHAR,
-          oldAttrChar, attrChar, !oldAttrCharESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHAR, oldAttrChar,
+          attrChar, !oldAttrCharESet));
+    }
   }
 
   /**
@@ -1139,8 +1169,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrChar = ATTR_CHAR_EDEFAULT;
     attrCharESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHAR,
           oldAttrChar, ATTR_CHAR_EDEFAULT, oldAttrCharESet));
+    }
   }
 
   /**
@@ -1175,8 +1207,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrCharacterObjectESet = attrCharacterObjectESet;
     attrCharacterObjectESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHARACTER_OBJECT,
           oldAttrCharacterObject, attrCharacterObject, !oldAttrCharacterObjectESet));
+    }
   }
 
   /**
@@ -1191,9 +1225,11 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrCharacterObject = ATTR_CHARACTER_OBJECT_EDEFAULT;
     attrCharacterObjectESet = false;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET,
-          Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHARACTER_OBJECT, oldAttrCharacterObject,
-          ATTR_CHARACTER_OBJECT_EDEFAULT, oldAttrCharacterObjectESet));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_CHARACTER_OBJECT,
+              oldAttrCharacterObject, ATTR_CHARACTER_OBJECT_EDEFAULT, oldAttrCharacterObjectESet));
+    }
   }
 
   /**
@@ -1228,8 +1264,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrDateESet = attrDateESet;
     attrDateESet = true;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DATE,
-          oldAttrDate, attrDate, !oldAttrDateESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DATE, oldAttrDate,
+          attrDate, !oldAttrDateESet));
+    }
   }
 
   /**
@@ -1244,8 +1282,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrDate = ATTR_DATE_EDEFAULT;
     attrDateESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DATE,
           oldAttrDate, ATTR_DATE_EDEFAULT, oldAttrDateESet));
+    }
   }
 
   /**
@@ -1280,8 +1320,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrDoubleESet = attrDoubleESet;
     attrDoubleESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE,
           oldAttrDouble, attrDouble, !oldAttrDoubleESet));
+    }
   }
 
   /**
@@ -1296,8 +1338,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrDouble = ATTR_DOUBLE_EDEFAULT;
     attrDoubleESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE,
           oldAttrDouble, ATTR_DOUBLE_EDEFAULT, oldAttrDoubleESet));
+    }
   }
 
   /**
@@ -1332,8 +1376,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrDoubleObjectESet = attrDoubleObjectESet;
     attrDoubleObjectESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE_OBJECT,
           oldAttrDoubleObject, attrDoubleObject, !oldAttrDoubleObjectESet));
+    }
   }
 
   /**
@@ -1348,8 +1394,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrDoubleObject = ATTR_DOUBLE_OBJECT_EDEFAULT;
     attrDoubleObjectESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_DOUBLE_OBJECT,
           oldAttrDoubleObject, ATTR_DOUBLE_OBJECT_EDEFAULT, oldAttrDoubleObjectESet));
+    }
   }
 
   /**
@@ -1384,8 +1432,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrFloatESet = attrFloatESet;
     attrFloatESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT,
           oldAttrFloat, attrFloat, !oldAttrFloatESet));
+    }
   }
 
   /**
@@ -1400,8 +1450,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrFloat = ATTR_FLOAT_EDEFAULT;
     attrFloatESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT,
           oldAttrFloat, ATTR_FLOAT_EDEFAULT, oldAttrFloatESet));
+    }
   }
 
   /**
@@ -1436,8 +1488,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrFloatObjectESet = attrFloatObjectESet;
     attrFloatObjectESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT_OBJECT,
           oldAttrFloatObject, attrFloatObject, !oldAttrFloatObjectESet));
+    }
   }
 
   /**
@@ -1452,8 +1506,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrFloatObject = ATTR_FLOAT_OBJECT_EDEFAULT;
     attrFloatObjectESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_FLOAT_OBJECT,
           oldAttrFloatObject, ATTR_FLOAT_OBJECT_EDEFAULT, oldAttrFloatObjectESet));
+    }
   }
 
   /**
@@ -1488,8 +1544,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrIntESet = attrIntESet;
     attrIntESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INT, oldAttrInt,
           attrInt, !oldAttrIntESet));
+    }
   }
 
   /**
@@ -1504,8 +1562,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrInt = ATTR_INT_EDEFAULT;
     attrIntESet = false;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INT,
-          oldAttrInt, ATTR_INT_EDEFAULT, oldAttrIntESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INT, oldAttrInt,
+          ATTR_INT_EDEFAULT, oldAttrIntESet));
+    }
   }
 
   /**
@@ -1540,8 +1600,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrIntegerObjectESet = attrIntegerObjectESet;
     attrIntegerObjectESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INTEGER_OBJECT,
           oldAttrIntegerObject, attrIntegerObject, !oldAttrIntegerObjectESet));
+    }
   }
 
   /**
@@ -1556,8 +1618,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrIntegerObject = ATTR_INTEGER_OBJECT_EDEFAULT;
     attrIntegerObjectESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_INTEGER_OBJECT,
           oldAttrIntegerObject, ATTR_INTEGER_OBJECT_EDEFAULT, oldAttrIntegerObjectESet));
+    }
   }
 
   /**
@@ -1592,8 +1656,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrJavaClassESet = attrJavaClassESet;
     attrJavaClassESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_CLASS,
           oldAttrJavaClass, attrJavaClass, !oldAttrJavaClassESet));
+    }
   }
 
   /**
@@ -1608,8 +1674,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrJavaClass = null;
     attrJavaClassESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_CLASS,
           oldAttrJavaClass, null, oldAttrJavaClassESet));
+    }
   }
 
   /**
@@ -1644,8 +1712,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrJavaObjectESet = attrJavaObjectESet;
     attrJavaObjectESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_OBJECT,
           oldAttrJavaObject, attrJavaObject, !oldAttrJavaObjectESet));
+    }
   }
 
   /**
@@ -1660,8 +1730,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrJavaObject = ATTR_JAVA_OBJECT_EDEFAULT;
     attrJavaObjectESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_JAVA_OBJECT,
           oldAttrJavaObject, ATTR_JAVA_OBJECT_EDEFAULT, oldAttrJavaObjectESet));
+    }
   }
 
   /**
@@ -1696,8 +1768,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrLongESet = attrLongESet;
     attrLongESet = true;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG,
-          oldAttrLong, attrLong, !oldAttrLongESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG, oldAttrLong,
+          attrLong, !oldAttrLongESet));
+    }
   }
 
   /**
@@ -1712,8 +1786,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrLong = ATTR_LONG_EDEFAULT;
     attrLongESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG,
           oldAttrLong, ATTR_LONG_EDEFAULT, oldAttrLongESet));
+    }
   }
 
   /**
@@ -1748,8 +1824,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrLongObjectESet = attrLongObjectESet;
     attrLongObjectESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG_OBJECT,
           oldAttrLongObject, attrLongObject, !oldAttrLongObjectESet));
+    }
   }
 
   /**
@@ -1764,8 +1842,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrLongObject = ATTR_LONG_OBJECT_EDEFAULT;
     attrLongObjectESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_LONG_OBJECT,
           oldAttrLongObject, ATTR_LONG_OBJECT_EDEFAULT, oldAttrLongObjectESet));
+    }
   }
 
   /**
@@ -1800,8 +1880,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrShortESet = attrShortESet;
     attrShortESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT,
           oldAttrShort, attrShort, !oldAttrShortESet));
+    }
   }
 
   /**
@@ -1816,8 +1898,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrShort = ATTR_SHORT_EDEFAULT;
     attrShortESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT,
           oldAttrShort, ATTR_SHORT_EDEFAULT, oldAttrShortESet));
+    }
   }
 
   /**
@@ -1852,8 +1936,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrShortObjectESet = attrShortObjectESet;
     attrShortObjectESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT_OBJECT,
           oldAttrShortObject, attrShortObject, !oldAttrShortObjectESet));
+    }
   }
 
   /**
@@ -1868,8 +1954,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrShortObject = ATTR_SHORT_OBJECT_EDEFAULT;
     attrShortObjectESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_SHORT_OBJECT,
           oldAttrShortObject, ATTR_SHORT_OBJECT_EDEFAULT, oldAttrShortObjectESet));
+    }
   }
 
   /**
@@ -1904,8 +1992,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     boolean oldAttrStringESet = attrStringESet;
     attrStringESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_STRING,
           oldAttrString, attrString, !oldAttrStringESet));
+    }
   }
 
   /**
@@ -1920,8 +2010,10 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
     attrString = ATTR_STRING_EDEFAULT;
     attrStringESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model6Package.UNSETTABLE_ATTRIBUTES__ATTR_STRING,
           oldAttrString, ATTR_STRING_EDEFAULT, oldAttrStringESet));
+    }
   }
 
   /**
@@ -2229,124 +2321,218 @@ public class UnsettableAttributesImpl extends EObjectImpl implements UnsettableA
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (attrBigDecimal: ");
     if (attrBigDecimalESet)
+    {
       result.append(attrBigDecimal);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrBigInteger: ");
     if (attrBigIntegerESet)
+    {
       result.append(attrBigInteger);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrBoolean: ");
     if (attrBooleanESet)
+    {
       result.append(attrBoolean);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrBooleanObject: ");
     if (attrBooleanObjectESet)
+    {
       result.append(attrBooleanObject);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrByte: ");
     if (attrByteESet)
+    {
       result.append(attrByte);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrByteArray: ");
     if (attrByteArrayESet)
+    {
       result.append(attrByteArray);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrByteObject: ");
     if (attrByteObjectESet)
+    {
       result.append(attrByteObject);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrChar: ");
     if (attrCharESet)
+    {
       result.append(attrChar);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrCharacterObject: ");
     if (attrCharacterObjectESet)
+    {
       result.append(attrCharacterObject);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrDate: ");
     if (attrDateESet)
+    {
       result.append(attrDate);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrDouble: ");
     if (attrDoubleESet)
+    {
       result.append(attrDouble);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrDoubleObject: ");
     if (attrDoubleObjectESet)
+    {
       result.append(attrDoubleObject);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrFloat: ");
     if (attrFloatESet)
+    {
       result.append(attrFloat);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrFloatObject: ");
     if (attrFloatObjectESet)
+    {
       result.append(attrFloatObject);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrInt: ");
     if (attrIntESet)
+    {
       result.append(attrInt);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrIntegerObject: ");
     if (attrIntegerObjectESet)
+    {
       result.append(attrIntegerObject);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrJavaClass: ");
     if (attrJavaClassESet)
+    {
       result.append(attrJavaClass);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrJavaObject: ");
     if (attrJavaObjectESet)
+    {
       result.append(attrJavaObject);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrLong: ");
     if (attrLongESet)
+    {
       result.append(attrLong);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrLongObject: ");
     if (attrLongObjectESet)
+    {
       result.append(attrLongObject);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrShort: ");
     if (attrShortESet)
+    {
       result.append(attrShort);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrShortObject: ");
     if (attrShortObjectESet)
+    {
       result.append(attrShortObject);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", attrString: ");
     if (attrStringESet)
+    {
       result.append(attrString);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java
index 1f6acccfca..5a813a1073 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6AdapterFactory.java
@@ -654,13 +654,13 @@ public class Model6AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-  	 * Creates a new adapter for the default case.
-  	 * <!-- begin-user-doc -->
-       * This default implementation returns null.
-       * <!-- end-user-doc -->
-  	 * @return the new adapter.
-  	 * @generated
-  	 */
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @generated
+   */
   public Adapter createEObjectAdapter()
   {
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java
index 378100e3f3..9614aea757 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/legacy/util/Model6Switch.java
@@ -129,7 +129,9 @@ public class Model6Switch<T>
       Root root = (Root)theEObject;
       T result = caseRoot(root);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.BASE_OBJECT:
@@ -137,7 +139,9 @@ public class Model6Switch<T>
       BaseObject baseObject = (BaseObject)theEObject;
       T result = caseBaseObject(baseObject);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.REFERENCE_OBJECT:
@@ -145,9 +149,13 @@ public class Model6Switch<T>
       ReferenceObject referenceObject = (ReferenceObject)theEObject;
       T result = caseReferenceObject(referenceObject);
       if (result == null)
+      {
         result = caseBaseObject(referenceObject);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.CONTAINMENT_OBJECT:
@@ -155,9 +163,13 @@ public class Model6Switch<T>
       ContainmentObject containmentObject = (ContainmentObject)theEObject;
       T result = caseContainmentObject(containmentObject);
       if (result == null)
+      {
         result = caseBaseObject(containmentObject);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.UNORDERED_LIST:
@@ -165,7 +177,9 @@ public class Model6Switch<T>
       UnorderedList unorderedList = (UnorderedList)theEObject;
       T result = caseUnorderedList(unorderedList);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.PROPERTIES_MAP:
@@ -173,7 +187,9 @@ public class Model6Switch<T>
       PropertiesMap propertiesMap = (PropertiesMap)theEObject;
       T result = casePropertiesMap(propertiesMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.PROPERTIES_MAP_ENTRY:
@@ -182,7 +198,9 @@ public class Model6Switch<T>
       Map.Entry<String, PropertiesMapEntryValue> propertiesMapEntry = (Map.Entry<String, PropertiesMapEntryValue>)theEObject;
       T result = casePropertiesMapEntry(propertiesMapEntry);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.PROPERTIES_MAP_ENTRY_VALUE:
@@ -190,7 +208,9 @@ public class Model6Switch<T>
       PropertiesMapEntryValue propertiesMapEntryValue = (PropertiesMapEntryValue)theEObject;
       T result = casePropertiesMapEntryValue(propertiesMapEntryValue);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.A:
@@ -198,7 +218,9 @@ public class Model6Switch<T>
       A a = (A)theEObject;
       T result = caseA(a);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.B:
@@ -206,7 +228,9 @@ public class Model6Switch<T>
       B b = (B)theEObject;
       T result = caseB(b);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.C:
@@ -214,7 +238,9 @@ public class Model6Switch<T>
       C c = (C)theEObject;
       T result = caseC(c);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.D:
@@ -222,7 +248,9 @@ public class Model6Switch<T>
       D d = (D)theEObject;
       T result = caseD(d);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.E:
@@ -230,7 +258,9 @@ public class Model6Switch<T>
       E e = (E)theEObject;
       T result = caseE(e);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.F:
@@ -238,7 +268,9 @@ public class Model6Switch<T>
       F f = (F)theEObject;
       T result = caseF(f);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.G:
@@ -246,7 +278,9 @@ public class Model6Switch<T>
       G g = (G)theEObject;
       T result = caseG(g);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.MY_ENUM_LIST:
@@ -254,7 +288,9 @@ public class Model6Switch<T>
       MyEnumList myEnumList = (MyEnumList)theEObject;
       T result = caseMyEnumList(myEnumList);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.MY_ENUM_LIST_UNSETTABLE:
@@ -262,7 +298,9 @@ public class Model6Switch<T>
       MyEnumListUnsettable myEnumListUnsettable = (MyEnumListUnsettable)theEObject;
       T result = caseMyEnumListUnsettable(myEnumListUnsettable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.HOLDER:
@@ -270,9 +308,13 @@ public class Model6Switch<T>
       Holder holder = (Holder)theEObject;
       T result = caseHolder(holder);
       if (result == null)
+      {
         result = caseHoldable(holder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.THING:
@@ -280,9 +322,13 @@ public class Model6Switch<T>
       Thing thing = (Thing)theEObject;
       T result = caseThing(thing);
       if (result == null)
+      {
         result = caseHoldable(thing);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.HOLDABLE:
@@ -290,7 +336,9 @@ public class Model6Switch<T>
       Holdable holdable = (Holdable)theEObject;
       T result = caseHoldable(holdable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.HAS_NILLABLE_ATTRIBUTE:
@@ -298,7 +346,9 @@ public class Model6Switch<T>
       HasNillableAttribute hasNillableAttribute = (HasNillableAttribute)theEObject;
       T result = caseHasNillableAttribute(hasNillableAttribute);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.EMPTY_STRING_DEFAULT:
@@ -306,7 +356,9 @@ public class Model6Switch<T>
       EmptyStringDefault emptyStringDefault = (EmptyStringDefault)theEObject;
       T result = caseEmptyStringDefault(emptyStringDefault);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.EMPTY_STRING_DEFAULT_UNSETTABLE:
@@ -314,7 +366,9 @@ public class Model6Switch<T>
       EmptyStringDefaultUnsettable emptyStringDefaultUnsettable = (EmptyStringDefaultUnsettable)theEObject;
       T result = caseEmptyStringDefaultUnsettable(emptyStringDefaultUnsettable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.UNSETTABLE_ATTRIBUTES:
@@ -322,7 +376,9 @@ public class Model6Switch<T>
       UnsettableAttributes unsettableAttributes = (UnsettableAttributes)theEObject;
       T result = caseUnsettableAttributes(unsettableAttributes);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.CAN_REFERENCE_LEGACY:
@@ -330,7 +386,9 @@ public class Model6Switch<T>
       CanReferenceLegacy canReferenceLegacy = (CanReferenceLegacy)theEObject;
       T result = caseCanReferenceLegacy(canReferenceLegacy);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -739,16 +797,16 @@ public class Model6Switch<T>
   }
 
   /**
-  	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-  	 * <!-- begin-user-doc -->
-       * This implementation returns null;
-       * returning a non-null result will terminate the switch, but this is the last case anyway.
-       * <!-- end-user-doc -->
-  	 * @param object the target of the switch.
-  	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-  	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-  	 * @generated
-  	 */
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch, but this is the last case anyway.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
   public T defaultCase(EObject object)
   {
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java
index 6ef8bbd9d6..0c97015e44 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java
@@ -634,12 +634,12 @@ public class Model6AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-  	 * Creates a new adapter for the default case.
-  	 * <!-- begin-user-doc --> This default implementation returns null. <!--
-       * end-user-doc -->
-  	 * @return the new adapter.
-  	 * @generated
-  	 */
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc --> This default implementation returns null. <!--
+   * end-user-doc -->
+   * @return the new adapter.
+   * @generated
+   */
   public Adapter createEObjectAdapter()
   {
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java
index 1e86020a37..1265b31cfc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java
@@ -119,7 +119,9 @@ public class Model6Switch<T>
       Root root = (Root)theEObject;
       T result = caseRoot(root);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.BASE_OBJECT:
@@ -127,7 +129,9 @@ public class Model6Switch<T>
       BaseObject baseObject = (BaseObject)theEObject;
       T result = caseBaseObject(baseObject);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.REFERENCE_OBJECT:
@@ -135,9 +139,13 @@ public class Model6Switch<T>
       ReferenceObject referenceObject = (ReferenceObject)theEObject;
       T result = caseReferenceObject(referenceObject);
       if (result == null)
+      {
         result = caseBaseObject(referenceObject);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.CONTAINMENT_OBJECT:
@@ -145,9 +153,13 @@ public class Model6Switch<T>
       ContainmentObject containmentObject = (ContainmentObject)theEObject;
       T result = caseContainmentObject(containmentObject);
       if (result == null)
+      {
         result = caseBaseObject(containmentObject);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.UNORDERED_LIST:
@@ -155,7 +167,9 @@ public class Model6Switch<T>
       UnorderedList unorderedList = (UnorderedList)theEObject;
       T result = caseUnorderedList(unorderedList);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.PROPERTIES_MAP:
@@ -163,7 +177,9 @@ public class Model6Switch<T>
       PropertiesMap propertiesMap = (PropertiesMap)theEObject;
       T result = casePropertiesMap(propertiesMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.PROPERTIES_MAP_ENTRY:
@@ -172,7 +188,9 @@ public class Model6Switch<T>
       Map.Entry<String, PropertiesMapEntryValue> propertiesMapEntry = (Map.Entry<String, PropertiesMapEntryValue>)theEObject;
       T result = casePropertiesMapEntry(propertiesMapEntry);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.PROPERTIES_MAP_ENTRY_VALUE:
@@ -180,7 +198,9 @@ public class Model6Switch<T>
       PropertiesMapEntryValue propertiesMapEntryValue = (PropertiesMapEntryValue)theEObject;
       T result = casePropertiesMapEntryValue(propertiesMapEntryValue);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.A:
@@ -188,7 +208,9 @@ public class Model6Switch<T>
       A a = (A)theEObject;
       T result = caseA(a);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.B:
@@ -196,7 +218,9 @@ public class Model6Switch<T>
       B b = (B)theEObject;
       T result = caseB(b);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.C:
@@ -204,7 +228,9 @@ public class Model6Switch<T>
       C c = (C)theEObject;
       T result = caseC(c);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.D:
@@ -212,7 +238,9 @@ public class Model6Switch<T>
       D d = (D)theEObject;
       T result = caseD(d);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.E:
@@ -220,7 +248,9 @@ public class Model6Switch<T>
       E e = (E)theEObject;
       T result = caseE(e);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.F:
@@ -228,7 +258,9 @@ public class Model6Switch<T>
       F f = (F)theEObject;
       T result = caseF(f);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.G:
@@ -236,7 +268,9 @@ public class Model6Switch<T>
       G g = (G)theEObject;
       T result = caseG(g);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.MY_ENUM_LIST:
@@ -244,7 +278,9 @@ public class Model6Switch<T>
       MyEnumList myEnumList = (MyEnumList)theEObject;
       T result = caseMyEnumList(myEnumList);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.MY_ENUM_LIST_UNSETTABLE:
@@ -252,7 +288,9 @@ public class Model6Switch<T>
       MyEnumListUnsettable myEnumListUnsettable = (MyEnumListUnsettable)theEObject;
       T result = caseMyEnumListUnsettable(myEnumListUnsettable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.HOLDER:
@@ -260,9 +298,13 @@ public class Model6Switch<T>
       Holder holder = (Holder)theEObject;
       T result = caseHolder(holder);
       if (result == null)
+      {
         result = caseHoldable(holder);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.THING:
@@ -270,9 +312,13 @@ public class Model6Switch<T>
       Thing thing = (Thing)theEObject;
       T result = caseThing(thing);
       if (result == null)
+      {
         result = caseHoldable(thing);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.HOLDABLE:
@@ -280,7 +326,9 @@ public class Model6Switch<T>
       Holdable holdable = (Holdable)theEObject;
       T result = caseHoldable(holdable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.HAS_NILLABLE_ATTRIBUTE:
@@ -288,7 +336,9 @@ public class Model6Switch<T>
       HasNillableAttribute hasNillableAttribute = (HasNillableAttribute)theEObject;
       T result = caseHasNillableAttribute(hasNillableAttribute);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.EMPTY_STRING_DEFAULT:
@@ -296,7 +346,9 @@ public class Model6Switch<T>
       EmptyStringDefault emptyStringDefault = (EmptyStringDefault)theEObject;
       T result = caseEmptyStringDefault(emptyStringDefault);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.EMPTY_STRING_DEFAULT_UNSETTABLE:
@@ -304,7 +356,9 @@ public class Model6Switch<T>
       EmptyStringDefaultUnsettable emptyStringDefaultUnsettable = (EmptyStringDefaultUnsettable)theEObject;
       T result = caseEmptyStringDefaultUnsettable(emptyStringDefaultUnsettable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.UNSETTABLE_ATTRIBUTES:
@@ -312,7 +366,9 @@ public class Model6Switch<T>
       UnsettableAttributes unsettableAttributes = (UnsettableAttributes)theEObject;
       T result = caseUnsettableAttributes(unsettableAttributes);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model6Package.CAN_REFERENCE_LEGACY:
@@ -320,7 +376,9 @@ public class Model6Switch<T>
       CanReferenceLegacy canReferenceLegacy = (CanReferenceLegacy)theEObject;
       T result = caseCanReferenceLegacy(canReferenceLegacy);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -707,15 +765,15 @@ public class Model6Switch<T>
   }
 
   /**
-  	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-  	 * <!-- begin-user-doc --> This
-       * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
-       * anyway. <!-- end-user-doc -->
-  	 * @param object the target of the switch.
-  	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-  	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-  	 * @generated
-  	 */
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * <!-- begin-user-doc --> This
+   * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
+   * anyway. <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
   public T defaultCase(EObject object)
   {
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
index a5c6b136f4..3a40ca1208 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mongodb;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -20,5 +20,5 @@ Import-Package: com.mongodb;version="[2.0.0,3.0.0)",
  org.bson.io;version="[2.0.0,3.0.0)",
  org.bson.types;version="[2.0.0,3.0.0)",
  org.bson.util;version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.300";x-internal:=true,
- org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.400";x-internal:=true,
+ org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.400";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBInitialTest.java b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBInitialTest.java
index 2f9b8409ca..c59ab6b873 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBInitialTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBInitialTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/bundle/OM.java b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/bundle/OM.java
index 82c640acec..7cb9f7adf4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF
index a97b4be7e8..fb7ffc5d6b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.objectivity;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Require-Bundle: org.eclipse.emf.cdo.server.objectivity;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -18,4 +18,4 @@ Import-Package: com.objy.as;version="[4.0.0,5.0.0)",
  com.objy.pm.asapp;version="[4.0.0,5.0.0)",
  com.objy.pm.asexcep;version="[4.0.0,5.0.0)",
  com.objy.pm.tmi;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.objectivity;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.objectivity;version="4.0.400";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyArrayListTest.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyArrayListTest.java
index 5e68f640d9..88af60a2e3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyArrayListTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyArrayListTest.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 
 /**
  * Class to be used for testing, all persistence related calls are overriden by local ones.
- * 
+ *
  * @author ibrahim
  */
 class ObjyLocalArrayListLong extends ObjyArrayList<Long>
@@ -126,7 +126,7 @@ public class ObjyArrayListTest
   {
     //
     arrayListLong.remove((int)arrayListLong.size());
-    assertEquals((numItems - 1), arrayListLong.size());
+    assertEquals(numItems - 1, arrayListLong.size());
   }
 
   @Test
@@ -134,7 +134,7 @@ public class ObjyArrayListTest
   {
     //
     arrayListLong.remove(5);
-    assertEquals((numItems - 1), arrayListLong.size());
+    assertEquals(numItems - 1, arrayListLong.size());
   }
 
   @Test(expected = IndexOutOfBoundsException.class)
diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF
index 2328937e20..371b1e51e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.ui;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -19,5 +19,5 @@ Require-Bundle: org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)";vis
  org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)"
 Eclipse-BuddyPolicy: 
-Export-Package: org.eclipse.emf.cdo.tests.ui;version="4.0.300";x-friends:="org.eclipse.emf.cdo.dawn.tests",
- org.eclipse.emf.cdo.tests.ui.bundle;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.ui;version="4.0.400";x-friends:="org.eclipse.emf.cdo.dawn.tests",
+ org.eclipse.emf.cdo.tests.ui.bundle;version="4.0.400";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java
index cdc9ea3f15..6c7e7376e4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/CDOSessionsViewTest.java
@@ -58,7 +58,7 @@ public class CDOSessionsViewTest extends AbstractCDOUITest<SWTWorkbenchBot>
 
     // activeView.toolbarButton(OpenSessionDialog.TITLE).click();
     activeView.toolbarButton(org.eclipse.emf.cdo.internal.ui.messages.Messages.getString("OpenSessionAction.0"))
-        .click();
+    .click();
 
     SWTBotShell openSessionDialog = getBot().shell("Open Session");
     openSessionDialog.activate();
diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/bundle/OM.java
index 241491e51b..d61f7a99dd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
index 3d06e52a11..5b15b24e5b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.uml;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.2.0,5.0.0)",
  org.eclipse.uml2.uml;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.uml;version="4.2.100"
+Export-Package: org.eclipse.emf.cdo.tests.uml;version="4.2.200"
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/DynamicProfileTest.java b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/DynamicProfileTest.java
index 12eba538d1..4ee01c95b8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/DynamicProfileTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/DynamicProfileTest.java
@@ -95,8 +95,8 @@ public class DynamicProfileTest extends AbstractCDOTest
     // verify that using the UML API to access the applied stereotype works as usual
     assertEquals("Stereotype doesn't appear to be applied.", true, aClass.isStereotypeApplied(conceptStereotype));
     assertEquals("Wrong stereotype EClass.",
-        transaction.getResourceSet().getPackageRegistry().getEPackage(MY_PROFILE_URI).getEClassifier(S_CONCEPT), aClass
-            .getStereotypeApplication(conceptStereotype).eClass());
+        transaction.getResourceSet().getPackageRegistry().getEPackage(MY_PROFILE_URI).getEClassifier(S_CONCEPT),
+        aClass.getStereotypeApplication(conceptStereotype).eClass());
   }
 
   public void testInstancesOfLocalDynamicUMLProfile() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/BaseClass.java b/plugins/org.eclipse.emf.cdo.tests/model/base/BaseClass.java
index a0fee087c5..6402688809 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/BaseClass.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/BaseClass.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link base.BaseClass#getCouter <em>Couter</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see base.BasePackage#getBaseClass()
  * @model
  * @extends CDOObject
@@ -34,7 +34,7 @@ public interface BaseClass extends CDOObject
    * If the meaning of the '<em>Couter</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Couter</em>' attribute.
    * @see #setCouter(int)
    * @see base.BasePackage#getBaseClass_Couter()
@@ -46,7 +46,7 @@ public interface BaseClass extends CDOObject
   /**
    * Sets the value of the '{@link base.BaseClass#getCouter <em>Couter</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Couter</em>' attribute.
    * @see #getCouter()
@@ -56,7 +56,7 @@ public interface BaseClass extends CDOObject
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseSwitch.java
index dcc5e9ac21..db0f624913 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseSwitch.java
@@ -13,17 +13,17 @@ package base.util;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
+import java.util.List;
+
 import base.BaseClass;
 import base.BasePackage;
 
-import java.util.List;
-
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see base.BasePackage
  * @generated
  */
@@ -31,14 +31,14 @@ public class BaseSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static BasePackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public BaseSwitch()
@@ -52,7 +52,7 @@ public class BaseSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -64,7 +64,7 @@ public class BaseSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -84,7 +84,7 @@ public class BaseSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -110,7 +110,7 @@ public class BaseSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Class</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Class</em>'.
@@ -126,7 +126,7 @@ public class BaseSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedClass.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedClass.java
index 714a857696..7e699bad80 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedClass.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/DerivedClass.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import base.BaseClass;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Class</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * @see derived.DerivedPackage#getDerivedClass()
  * @model
  * @generated
@@ -23,7 +23,7 @@ public interface DerivedClass extends BaseClass
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedClassImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedClassImpl.java
index 6664a0b7e1..9c8876db21 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedClassImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedClassImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,14 +20,14 @@ import derived.DerivedPackage;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Class</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class DerivedClassImpl extends BaseClassImpl implements DerivedClass
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected DerivedClassImpl()
@@ -37,7 +37,7 @@ public class DerivedClassImpl extends BaseClassImpl implements DerivedClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -48,7 +48,7 @@ public class DerivedClassImpl extends BaseClassImpl implements DerivedClass
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void decrement()
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/InterfaceFactory.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/InterfaceFactory.java
index d33377502a..82dda05978 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/InterfaceFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/InterfaceFactory.java
@@ -4,7 +4,7 @@
  * 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,7 +15,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
+ *
  * @see interface_.InterfacePackage
  * @generated
  */
@@ -23,14 +23,14 @@ public interface InterfaceFactory extends EFactory
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   InterfaceFactory eINSTANCE = interface_.impl.InterfaceFactoryImpl.init();
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/InterfacePackage.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/InterfacePackage.java
index 4aa443abf1..daadf8880b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/InterfacePackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/InterfacePackage.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EPackage;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see interface_.InterfaceFactory
  * @model kind="package"
  * @generated
@@ -32,28 +32,28 @@ public interface InterfacePackage extends EPackage
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNAME = "interface";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_URI = "uuid://interface";
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_PREFIX = "interface";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   InterfacePackage eINSTANCE = interface_.impl.InterfacePackageImpl.init();
@@ -61,7 +61,7 @@ public interface InterfacePackage extends EPackage
   /**
    * The meta object id for the '{@link interface_.IInterface <em>IInterface</em>}' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see interface_.IInterface
    * @see interface_.impl.InterfacePackageImpl#getIInterface()
    * @generated
@@ -70,7 +70,7 @@ public interface InterfacePackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Test</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -78,7 +78,7 @@ public interface InterfacePackage extends EPackage
 
   /**
    * The number of structural features of the '<em>IInterface</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -87,7 +87,7 @@ public interface InterfacePackage extends EPackage
   /**
    * Returns the meta object for class '{@link interface_.IInterface <em>IInterface</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>IInterface</em>'.
    * @see interface_.IInterface
    * @generated
@@ -97,7 +97,7 @@ public interface InterfacePackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link interface_.IInterface#getTest <em>Test</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Test</em>'.
    * @see interface_.IInterface#getTest()
    * @see #getIInterface()
@@ -107,7 +107,7 @@ public interface InterfacePackage extends EPackage
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -122,7 +122,7 @@ public interface InterfacePackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   interface Literals
@@ -130,7 +130,7 @@ public interface InterfacePackage extends EPackage
     /**
      * The meta object literal for the '{@link interface_.IInterface <em>IInterface</em>}' class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see interface_.IInterface
      * @see interface_.impl.InterfacePackageImpl#getIInterface()
      * @generated
@@ -140,7 +140,7 @@ public interface InterfacePackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Test</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute IINTERFACE__TEST = eINSTANCE.getIInterface_Test();
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java
index 85d5781165..0122549a1b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -21,14 +21,14 @@ import interface_.InterfacePackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class InterfacePackageImpl extends EPackageImpl implements InterfacePackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass iInterfaceEClass = null;
@@ -40,7 +40,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see interface_.InterfacePackage#eNS_URI
    * @see #init()
@@ -53,7 +53,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static boolean isInited = false;
@@ -64,7 +64,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
    * This method is used to initialize {@link InterfacePackage#eINSTANCE} when that field is accessed. Clients should
    * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -78,8 +78,9 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
     }
 
     // Obtain or create and register package
-    InterfacePackageImpl theInterfacePackage = (InterfacePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InterfacePackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new InterfacePackageImpl());
+    InterfacePackageImpl theInterfacePackage = (InterfacePackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof InterfacePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new InterfacePackageImpl());
 
     isInited = true;
 
@@ -99,7 +100,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getIInterface()
@@ -109,7 +110,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getIInterface_Test()
@@ -119,7 +120,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InterfaceFactory getInterfaceFactory()
@@ -129,7 +130,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isCreated = false;
@@ -137,7 +138,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void createPackageContents()
@@ -155,7 +156,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isInitialized = false;
@@ -163,7 +164,7 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void initializePackageContents()
@@ -186,9 +187,10 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
     // Add supertypes to classes
 
     // Initialize classes and features; add operations and parameters
-    initEClass(iInterfaceEClass, IInterface.class, "IInterface", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getIInterface_Test(), ecorePackage.getEString(), "test", null, 0, 1, IInterface.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(iInterfaceEClass, IInterface.class, "IInterface", IS_ABSTRACT, IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getIInterface_Test(), ecorePackage.getEString(), "test", null, 0, 1, IInterface.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceFactoryImpl.java
index b74ac48616..296da3b383 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceFactoryImpl.java
@@ -22,14 +22,14 @@ import reference.ReferencePackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ReferenceFactoryImpl extends EFactoryImpl implements ReferenceFactory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static ReferenceFactory init()
@@ -52,7 +52,7 @@ public class ReferenceFactoryImpl extends EFactoryImpl implements ReferenceFacto
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ReferenceFactoryImpl()
@@ -62,17 +62,16 @@ public class ReferenceFactoryImpl extends EFactoryImpl implements ReferenceFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
-  @SuppressWarnings("cast")
   @Override
   public EObject create(EClass eClass)
   {
     switch (eClass.getClassifierID())
     {
     case ReferencePackage.REFERENCE:
-      return (EObject)createReference();
+      return createReference();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -80,7 +79,7 @@ public class ReferenceFactoryImpl extends EFactoryImpl implements ReferenceFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Reference createReference()
@@ -91,7 +90,7 @@ public class ReferenceFactoryImpl extends EFactoryImpl implements ReferenceFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ReferencePackage getReferencePackage()
@@ -101,7 +100,7 @@ public class ReferenceFactoryImpl extends EFactoryImpl implements ReferenceFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceImpl.java
index a9b870dced..8431b6151d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferenceImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,9 +14,9 @@ import org.eclipse.emf.internal.cdo.CDOObjectImpl;
 
 import org.eclipse.emf.ecore.EClass;
 
+import interface_.IInterface;
 import reference.Reference;
 import reference.ReferencePackage;
-import interface_.IInterface;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Reference</b></em>'. <!-- end-user-doc -->
@@ -26,14 +26,14 @@ import interface_.IInterface;
  * <li>{@link reference.impl.ReferenceImpl#getRef <em>Ref</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ReferenceImpl extends CDOObjectImpl implements Reference
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ReferenceImpl()
@@ -43,7 +43,7 @@ public class ReferenceImpl extends CDOObjectImpl implements Reference
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -54,7 +54,7 @@ public class ReferenceImpl extends CDOObjectImpl implements Reference
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -65,7 +65,7 @@ public class ReferenceImpl extends CDOObjectImpl implements Reference
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public IInterface getRef()
@@ -75,7 +75,7 @@ public class ReferenceImpl extends CDOObjectImpl implements Reference
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setRef(IInterface newRef)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
index 2043ec46df..f08a0c4d6d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
@@ -827,10 +827,10 @@ public class InvalidationTest extends AbstractCDOTest
     if (isRemoveRevision)
     {
       clearCache(getRepository().getRevisionManager());
-      getRepository().getRevisionManager().getCache()
-          .removeRevision(resourceA.cdoID(), resourceA.cdoRevision().getBranch().getVersion(1));
-      getRepository().getRevisionManager().getCache()
-          .removeRevision(resourceA.cdoID(), resourceA.cdoRevision().getBranch().getVersion(2));
+      getRepository().getRevisionManager().getCache().removeRevision(resourceA.cdoID(),
+          resourceA.cdoRevision().getBranch().getVersion(1));
+      getRepository().getRevisionManager().getCache().removeRevision(resourceA.cdoID(),
+          resourceA.cdoRevision().getBranch().getVersion(2));
     }
 
     assertEquals(0, testAdapter.getNotifications().length);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java
index 6586837aa9..9a0533acb1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java
@@ -39,8 +39,8 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add("Ottawa");
     list.add("Toronto");
     list.add("Berlin");
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfString(), getModel5Package()
-        .getGenListOfString_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfString(),
+        getModel5Package().getGenListOfString_Elements());
   }
 
   public void testListOfDate() throws Exception
@@ -49,8 +49,8 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add(new Date(1000));
     list.add(new Date());
     list.add(new Date(new Date().getTime() - 100));
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfDate(), getModel5Package()
-        .getGenListOfDate_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfDate(),
+        getModel5Package().getGenListOfDate_Elements());
   }
 
   public void testListOfInt() throws Exception
@@ -59,8 +59,8 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add(10);
     list.add(11);
     list.add(20);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInt(), getModel5Package()
-        .getGenListOfInt_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInt(),
+        getModel5Package().getGenListOfInt_Elements());
   }
 
   public void testListOfShort() throws Exception
@@ -69,8 +69,8 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add((short)10);
     list.add((short)11);
     list.add((short)20);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfShort(), getModel5Package()
-        .getGenListOfShort_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfShort(),
+        getModel5Package().getGenListOfShort_Elements());
   }
 
   public void testListOfFloat() throws Exception
@@ -79,8 +79,8 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add((float)10);
     list.add((float)11);
     list.add((float)20);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfFloat(), getModel5Package()
-        .getGenListOfFloat_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfFloat(),
+        getModel5Package().getGenListOfFloat_Elements());
   }
 
   public void testListOfChar() throws Exception
@@ -89,8 +89,8 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add('c');
     list.add('d');
     list.add('z');
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfChar(), getModel5Package()
-        .getGenListOfChar_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfChar(),
+        getModel5Package().getGenListOfChar_Elements());
   }
 
   public void testListOfBoolean() throws Exception
@@ -98,8 +98,8 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     List<Boolean> list = new ArrayList<Boolean>();
     list.add(true);
     list.add(false);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfBoolean(), getModel5Package()
-        .getGenListOfBoolean_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfBoolean(),
+        getModel5Package().getGenListOfBoolean_Elements());
   }
 
   public void testListOfDouble() throws Exception
@@ -108,8 +108,8 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest
     list.add(10.1928);
     list.add(11.12);
     list.add(20.99991);
-    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfDouble(), getModel5Package()
-        .getGenListOfDouble_Elements());
+    testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfDouble(),
+        getModel5Package().getGenListOfDouble_Elements());
   }
 
   public void testListOfInteger() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/NonCDOResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/NonCDOResourceTest.java
index 31a21ee96b..e2844f2075 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/NonCDOResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/NonCDOResourceTest.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 /**
  * See bug 201593
- * 
+ *
  * @author Simon McDuff
  */
 public class NonCDOResourceTest extends TestCase
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
index c4d96823bc..60c5547435 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
@@ -684,8 +684,8 @@ public class PackageRegistryTest extends AbstractCDOTest
 
     Map<EClass, List<EClass>> subTypes = registry.getSubTypes();
 
-    assertSubtypes((EClass)p1.getEClassifier("RootClass"), subTypes,
-        Arrays.asList("Child1", "Child4", "SubChild", "SubChild3", "Child5", "Child6", "SubChild2", "Child7", "Child8"));
+    assertSubtypes((EClass)p1.getEClassifier("RootClass"), subTypes, Arrays.asList("Child1", "Child4", "SubChild",
+        "SubChild3", "Child5", "Child6", "SubChild2", "Child7", "Child8"));
     assertSubtypes((EClass)p1.getEClassifier("RootAbstractClass"), subTypes,
         Arrays.asList("Child2", "Child4", "SubChild", "SubChild3", "Child6", "SubChild2", "Child8"));
     assertSubtypes((EClass)p1.getEClassifier("RootInterface"), subTypes,
@@ -718,8 +718,8 @@ public class PackageRegistryTest extends AbstractCDOTest
     registry.putEPackage(p2);
     subTypes = registry.getSubTypes();
 
-    assertSubtypes((EClass)p1.getEClassifier("RootClass"), subTypes,
-        Arrays.asList("Child1", "Child4", "SubChild", "SubChild3", "Child5", "Child6", "SubChild2", "Child7", "Child8"));
+    assertSubtypes((EClass)p1.getEClassifier("RootClass"), subTypes, Arrays.asList("Child1", "Child4", "SubChild",
+        "SubChild3", "Child5", "Child6", "SubChild2", "Child7", "Child8"));
     assertSubtypes((EClass)p1.getEClassifier("RootAbstractClass"), subTypes,
         Arrays.asList("Child2", "Child4", "SubChild", "SubChild3", "Child6", "SubChild2", "Child8"));
     assertSubtypes((EClass)p1.getEClassifier("RootInterface"), subTypes,
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java
index d7158301d5..9098d10815 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java
@@ -344,8 +344,8 @@ public class RepositoryTest extends AbstractCDOTest
       {
         EClass eClass = revision.getEClass();
         EPackage ePackage = eClass.getEPackage();
-        assertNotSame("Revision has dynamic package: " + ePackage.getName(), EPackageImpl.class.getName(), ePackage
-            .getClass().getName());
+        assertNotSame("Revision has dynamic package: " + ePackage.getName(), EPackageImpl.class.getName(),
+            ePackage.getClass().getName());
 
         if (eClass == customerClass)
         {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
index 9f8d4b626f..e9ce944eee 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
@@ -326,12 +326,12 @@ public class ResourceTest extends AbstractCDOTest
     assertEquals(cdoRootResource.cdoID(), cdoRootResource.cdoRevision().data().getResourceID());
     assertEquals(true, transaction.getResourceSet().getResources().contains(resource));
     assertEquals(false, transaction.getResourceSet().getResources().contains(transaction.getRootResource()));// Bug
-                                                                                                             // 346636
+    // 346636
 
     transaction.getRootResource().getContents().remove(resource);
     assertEquals(false, transaction.getResourceSet().getResources().contains(resource));
     assertEquals(false, transaction.getResourceSet().getResources().contains(transaction.getRootResource()));// Bug
-                                                                                                             // 346636
+    // 346636
   }
 
   public void testCreateNestedResource_FromResourceSet() throws Exception
@@ -434,8 +434,8 @@ public class ResourceTest extends AbstractCDOTest
     {
       CDOSession session = openSession();
       CDOTransaction transaction = session.openTransaction();
-      CDOResource resource = (CDOResource)transaction.getResourceSet().getResource(
-          CDOURIUtil.createResourceURI(transaction, getResourcePath("/test1")), true);
+      CDOResource resource = (CDOResource)transaction.getResourceSet()
+          .getResource(CDOURIUtil.createResourceURI(transaction, getResourcePath("/test1")), true);
       assertNotNull(resource);
       assertEquals(transaction.getResourceSet(), resource.getResourceSet());
       assertEquals(1, transaction.getResourceSet().getResources().size());
@@ -1757,8 +1757,8 @@ public class ResourceTest extends AbstractCDOTest
       CDOID idAfterChangePathOrder = CDOUtil.getCDOObject(order).cdoID();
       assertEquals(idBeforeChangePathOrder, idAfterChangePathOrder);
 
-      Resource resourceRenamed = transaction.getResourceSet().getResource(
-          CDOURIUtil.createResourceURI(session, newPath), false);
+      Resource resourceRenamed = transaction.getResourceSet()
+          .getResource(CDOURIUtil.createResourceURI(session, newPath), false);
 
       assertEquals(resource, resourceRenamed);
       assertClean(resource, transaction);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
index bff4f570ae..9ed5b87c0e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
@@ -47,7 +47,7 @@ import org.eclipse.emf.spi.cdo.InternalCDOTransaction;
 
 /**
  * See bug 201266
- * 
+ *
  * @author Simon McDuff
  */
 public class RevisionDeltaTest extends AbstractCDOTest
@@ -134,8 +134,8 @@ public class RevisionDeltaTest extends AbstractCDOTest
     transaction.close();
 
     CDOTransaction transaction2 = session.openTransaction();
-    SalesOrder salesOrder2 = (SalesOrder)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(salesOrder)
-        .cdoID(), true));
+    SalesOrder salesOrder2 = (SalesOrder)CDOUtil
+        .getEObject(transaction2.getObject(CDOUtil.getCDOObject(salesOrder).cdoID(), true));
     CDORevision salesRevision = CDOUtil.getCDOObject(salesOrder2).cdoRevision();
     EStructuralFeature customerFeature = getModel1Package().getSalesOrder_Customer();
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java
index 84f1ffec5c..24aac08fc3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException;
  * Make timeouts in read-access requests configurable
  * <p>
  * See bug 241464
- * 
+ *
  * @author Eike Stepper
  */
 public class Bugzilla_241464_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251263_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251263_Test.java
index 79e745896f..f40849ead8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251263_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251263_Test.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
  * EOpposite reference is not removed
  * <p>
  * See bug 251263
- * 
+ *
  * @author Victor Roldan Betancort
  */
 public class Bugzilla_251263_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258278_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258278_Test.java
index 31afa3a35e..1eb18abda4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258278_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258278_Test.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
  * : Multiple resources creation bug
  * <p>
  * See bug 258278
- * 
+ *
  * @author Simon McDuff
  */
 public class Bugzilla_258278_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259949_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259949_Test.java
index f19b9ce485..c15de8f17d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259949_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259949_Test.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.view.CDOView;
  * Make timeouts in read-access requests configurable
  * <p>
  * See bug 241464
- * 
+ *
  * @author Eike Stepper
  */
 public class Bugzilla_259949_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_272861_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_272861_Test.java
index ca3d908494..b86eb70417 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_272861_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_272861_Test.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 /**
  * Bug 272861
- * 
+ *
  * @author Simon McDuff
  */
 public class Bugzilla_272861_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_278900_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_278900_Test.java
index 8bbf5eaafd..f92a660f7d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_278900_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_278900_Test.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
  * EObjectValidator.validate_UniqueID broken for CDOObjects
  * <p>
  * See bug 278900
- * 
+ *
  * @author Simon McDuff
  */
 public class Bugzilla_278900_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_280102_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_280102_Test.java
index 808acf3ac8..609a881b60 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_280102_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_280102_Test.java
@@ -21,8 +21,8 @@ import org.eclipse.emf.cdo.view.CDOView;
  * 280102: CDOView.getRootResource() throws exception on an empty repository
  * <p>
  * See https://bugs.eclipse.org/280102
- * 
- * @author Víctor Roldan Betancort
+ *
+ * @author V�ctor Roldan Betancort
  */
 public class Bugzilla_280102_Test extends AbstractCDOTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java
index cb27a2c5d0..1f6b916742 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java
@@ -350,8 +350,8 @@ public class Bugzilla_319836_Test extends AbstractCDOTest
         sb.append(spacer).append("Delta revision(s):\n");
         for (InternalCDORevisionDelta item : dirtyObjects)
         {
-          String m = MessageFormat.format("{0}@{1}:{2}v{3}", item.getEClass().getName(), item.getID(), item.getBranch()
-              .getID(), item.getVersion());
+          String m = MessageFormat.format("{0}@{1}:{2}v{3}", item.getEClass().getName(), item.getID(),
+              item.getBranch().getID(), item.getVersion());
           sb.append(spacer).append(spacer).append(m).append("\n");
           // Feature deltas.
           for (CDOFeatureDelta delta : item.getFeatureDeltas())
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java
index c4514ce3db..a82871021d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.util.CommitException;
 
 /**
  * Bug 321699 - CDOViewImpl.getObject(CDOID, boolean) can return wrong object for temporary IDs.
- * 
+ *
  * @author Caspar De Groot
  */
 public class Bugzilla_321699_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329786_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329786_Test.java
index 5b85681abd..a982829b7c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329786_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329786_Test.java
@@ -63,9 +63,8 @@ public class Bugzilla_329786_Test extends AbstractCDOTest
   {
     ResourceSet resourceSet = new ResourceSetImpl();
 
-    URI sharedURI = URI.createURI(
-        CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME
-            + getResourcePath("/sharedResource")).appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
+    URI sharedURI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost:2036/" + RepositoryConfig.REPOSITORY_NAME
+        + getResourcePath("/sharedResource")).appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
     Resource sharedResource = resourceSet.createResource(sharedURI);
 
     URI localURI = URI.createFileURI(createTempFile("resource", ".model1").getCanonicalPath());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337054_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337054_Test.java
index 43f8582445..88c8a2eaef 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337054_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337054_Test.java
@@ -4,7 +4,7 @@
  * 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:
  *    Szabolcs Bardy - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337523_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337523_Test.java
index 9768c94c25..a212e50a1d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337523_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337523_Test.java
@@ -4,7 +4,7 @@
  * 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:
  *    Egidijus Vaisnora - initial API and implementation
  *    Caspar De Groot - initial API and implementation
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_339313_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_339313_Test.java
index 6c97d74da0..3463e8fdc1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_339313_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_339313_Test.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_341875_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_341875_Test.java
index e6ee2f9f03..e849821986 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_341875_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_341875_Test.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349793_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349793_Test.java
index 97b4cf5218..db8318fc58 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349793_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349793_Test.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349804_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349804_Test.java
index f48e9add4d..bd657a02e9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349804_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_349804_Test.java
@@ -165,7 +165,8 @@ public class Bugzilla_349804_Test extends AbstractCDOTest
       throw new IllegalArgumentException("Fail on purpose");
     }
 
-    public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext, OMMonitor monitor)
+    public void handleTransactionAfterCommitted(ITransaction transaction, CommitContext commitContext,
+        OMMonitor monitor)
     {
       // Do nothing
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_354395_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_354395_Test.java
index b7906d301f..23edb6b8d4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_354395_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_354395_Test.java
@@ -27,7 +27,7 @@ import java.util.Set;
  * ContainsAll with detached objects
  * <p>
  * See bug
- * 
+ *
  * @author Stefan Schedl
  */
 public class Bugzilla_354395_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_357441_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_357441_Test.java
index 343593ea1c..bef65ca35c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_357441_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_357441_Test.java
@@ -25,7 +25,7 @@ import org.eclipse.net4j.util.om.trace.PrintTraceHandler;
  * [DB] Range-based list mappings can be very slow.
  * <p>
  * See bug 357441
- * 
+ *
  * @author Eike Stepper
  * @since 4.1
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_395999_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_395999_Test.java
index fd32afecf4..bb4032c66a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_395999_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_395999_Test.java
@@ -35,8 +35,8 @@ public class Bugzilla_395999_Test extends AbstractCDOTest
 
     try
     {
-      URI uri = URI.createURI(getURIPrefix() + "/" + getRepository().getName() + getResourcePath("/res1")
-          + "?transactional=true");
+      URI uri = URI.createURI(
+          getURIPrefix() + "/" + getRepository().getName() + getResourcePath("/res1") + "?transactional=true");
 
       ResourceSet resourceSet = new ResourceSetImpl();
       Resource resource = resourceSet.createResource(uri);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416474_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416474_Test.java
index 086c2f8aa8..a5f77af7c1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416474_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_416474_Test.java
@@ -132,8 +132,9 @@ public class Bugzilla_416474_Test extends AbstractCDOTest
     String scopeClause = "e.eResource().oclAsType(eresource::CDOResource).path.startsWith(folderPath) and ";
 
     CDOView newView = session.openView();
-    CDOQuery ocl = newView.createQuery("ocl", "EModelElement.allInstances()->select(e | " + scopeClause
-        + "e.cdoMatches('.*bug416474.*'))", EcorePackage.Literals.EPACKAGE);
+    CDOQuery ocl = newView.createQuery("ocl",
+        "EModelElement.allInstances()->select(e | " + scopeClause + "e.cdoMatches('.*bug416474.*'))",
+        EcorePackage.Literals.EPACKAGE);
     ocl.setParameter("cdoImplicitRootClass", EcorePackage.Literals.EOBJECT);
     ocl.setParameter("folderPath", folderPath);
 
@@ -142,8 +143,9 @@ public class Bugzilla_416474_Test extends AbstractCDOTest
     assertEquals(true, results.contains(newView.getObject(nested)));
     assertEquals(2, results.size());
 
-    ocl = newView.createQuery("ocl", "EModelElement.allInstances()->select(e | " + scopeClause
-        + "e.cdoMatches('.*Nested.?'))", EcorePackage.Literals.EPACKAGE);
+    ocl = newView.createQuery("ocl",
+        "EModelElement.allInstances()->select(e | " + scopeClause + "e.cdoMatches('.*Nested.?'))",
+        EcorePackage.Literals.EPACKAGE);
     ocl.setParameter("cdoImplicitRootClass", EcorePackage.Literals.EOBJECT);
     ocl.setParameter("folderPath", folderPath);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417483_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417483_Test.java
index 9f18fe2559..2fb0816032 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417483_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_417483_Test.java
@@ -56,7 +56,7 @@ import java.util.concurrent.TimeUnit;
  * Bug 417483 - [Security] Issues in invalidation when missing write Permission.
  * <p>
  * Tests ensuring that the permissions are correctly computed, no matter what passive update mode is chosen.
- * 
+ *
  * @author Alex Lagarde
  */
 @CleanRepositoriesBefore(reason = "TEST_SECURITY_MANAGER")
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_422170_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_422170_Test.java
index 195863129a..fb66bb9529 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_422170_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_422170_Test.java
@@ -85,8 +85,8 @@ public class Bugzilla_422170_Test extends AbstractCDOTest
         User user2 = realm.addUser(USER_2_CREDENTIALS);
         user2.setDefaultAccessOverride(Access.READ);
         Role user2Role = realm.addRole("user2Role");
-        filterPermission = SecurityFactory.eINSTANCE.createFilterPermission(Access.WRITE, SecurityFactory.eINSTANCE
-            .createOrFilter(SecurityFactory.eINSTANCE.createPackageFilter(getModel1Package()),
+        filterPermission = SecurityFactory.eINSTANCE.createFilterPermission(Access.WRITE,
+            SecurityFactory.eINSTANCE.createOrFilter(SecurityFactory.eINSTANCE.createPackageFilter(getModel1Package()),
                 SecurityFactory.eINSTANCE.createPackageFilter(EresourcePackage.eINSTANCE),
                 SecurityFactory.eINSTANCE.createResourceFilter(getResourcePath(SHARED_RESOURCE_NAME)),
                 SecurityFactory.eINSTANCE.createResourceFilter(getResourcePath(RENAMED_SHARED_RESOURCE_NAME))));
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430251_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430251_Test.java
index 9ae7a48637..e67d13c2ce 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430251_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430251_Test.java
@@ -28,7 +28,6 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
  */
 public class Bugzilla_430251_Test extends AbstractCDOTest
 {
-
   /**
    * When the CDOTransaction is closed the ResourceSet should not reference it yet again,
    * because the CDOTransaction has a reference to the CDOSession which references the CDORevisionCache which can take many memory.
@@ -58,5 +57,4 @@ public class Bugzilla_430251_Test extends AbstractCDOTest
     }
     return cdoURIHandler;
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430794_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430794_Test.java
index 020f831e86..e28c9890d7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430794_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_430794_Test.java
@@ -67,5 +67,4 @@ public class Bugzilla_430794_Test extends AbstractCDOTest
 
     commitAndSync(transactionOfUser2, transactionOfUser1);
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_435532_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_435532_Test.java
index bd8aaffa19..8b8744fce7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_435532_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_435532_Test.java
@@ -88,8 +88,8 @@ public class Bugzilla_435532_Test extends AbstractCDOTest
   private void doTestDragChildren(int oldPosition, int newPosition) throws ConcurrentAccessException, CommitException
   {
     // Step 1: get children to move
-    List<Category> childrenToMove = new ArrayList<Category>(root.getCategories().subList(oldPosition,
-        oldPosition + CHILDREN_TO_MOVE_NUMBER));
+    List<Category> childrenToMove = new ArrayList<Category>(
+        root.getCategories().subList(oldPosition, oldPosition + CHILDREN_TO_MOVE_NUMBER));
     List<CDOID> childrenToMoveIds = new ArrayList<CDOID>();
     for (Category child : childrenToMove)
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java
index 68017009ad..c1b16aa72a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_436246_Test.java
@@ -94,7 +94,8 @@ public class Bugzilla_436246_Test extends AbstractCDOTest
     SignalCounter signalCounter = new SignalCounter(protocol);
 
     CDOBranch currentBranch = session.getBranchManager().getMainBranch();
-    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, NB_CATEGORY, true);
+    testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, NB_CATEGORY,
+        true);
 
     currentBranch = currentBranch.getBranch(B1_BRANCH_NAME);
     testCDORevisionFetchWithChangesOnAllBranches(session, currentBranch, signalCounter, companyCDOID, 2 * NB_CATEGORY,
@@ -286,7 +287,5 @@ public class Bugzilla_436246_Test extends AbstractCDOTest
     {
       return CDOUtil.createCollectionLoadingPolicy(Integer.MAX_VALUE, Integer.MAX_VALUE);
     }
-
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java
index fdb84f0218..3d02e77192 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java
@@ -109,8 +109,9 @@ public class Bugzilla_439337_Test extends AbstractCDOTest
         "3 load revisions request should have been sent, 2 first for CDORevisions of CDOResourceFolders to get resource path and another in prefetch to load all CDORevisions of CDOResource",
         3, signalCounter.getCountFor(LoadRevisionsRequest.class));
     int expectedNbLockStateRequestCalls = (cdoLockStatePrefetchEnabled ? 0 : NB_CATEGORIES) + 2;
-    assertEquals("As CDOLockState prefetch is " + (cdoLockStatePrefetchEnabled ? "" : "not ") + "enabled "
-        + expectedNbLockStateRequestCalls + " LockStateRequests should have been sent to the server",
+    assertEquals(
+        "As CDOLockState prefetch is " + (cdoLockStatePrefetchEnabled ? "" : "not ") + "enabled "
+            + expectedNbLockStateRequestCalls + " LockStateRequests should have been sent to the server",
         expectedNbLockStateRequestCalls, signalCounter.getCountFor(LockStateRequest.class));
 
     protocol.removeListener(signalCounter);
@@ -136,8 +137,6 @@ public class Bugzilla_439337_Test extends AbstractCDOTest
       }
 
       super.addAdapter(notifier);
-
     }
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439843_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439843_Test.java
index 3f2d8c1ec0..ea0347cbd4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439843_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439843_Test.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -25,7 +25,6 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 @Requires(ModelConfig.CAPABILITY_LEGACY)
 public class Bugzilla_439843_Test extends AbstractCDOTest
 {
-
   public void testLegacyOpposite_Multiple() throws Exception
   {
     CDOSession session = openSession();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447593_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447593_Test.java
index ee030fa7fd..891ed4704d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447593_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_447593_Test.java
@@ -28,7 +28,6 @@ import org.eclipse.emf.cdo.util.CDOUtil;
 @Requires(IRepositoryConfig.CAPABILITY_BRANCHING)
 public class Bugzilla_447593_Test extends AbstractCDOTest
 {
-
   public void testTwiceCDOTransactionSetBranch() throws Exception
   {
     CDOSession session = openSession();
@@ -64,5 +63,4 @@ public class Bugzilla_447593_Test extends AbstractCDOTest
     resource.getContents().add(getModel1Factory().createCategory());
     transaction.commit();
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449171_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449171_Test.java
index c4cf3c136f..abfefe22a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449171_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449171_Test.java
@@ -31,7 +31,6 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 @CleanRepositoriesBefore(reason = "to not be disturb by branches created by others tests")
 public class Bugzilla_449171_Test extends AbstractCDOTest
 {
-
   private static final String RESOURCE_NAME = "test1.model1";
 
   public void testCommitNotificationIndicationCDOCommitInfoDecoding() throws Exception
@@ -54,7 +53,5 @@ public class Bugzilla_449171_Test extends AbstractCDOTest
     CDOTransaction txOfSession2 = session2.openTransaction(subBranch);
 
     commitAndSync(txOfSession1, txOfSession2);
-
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449665_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449665_Test.java
index b410a2058d..f07aec72e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449665_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449665_Test.java
@@ -112,7 +112,6 @@ public class Bugzilla_449665_Test extends AbstractCDOTest
       }
 
       super.addAdapter(notifier);
-
     }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449806_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449806_Test.java
index a22ce75d74..5a6e6ed3b7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449806_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_449806_Test.java
@@ -33,7 +33,6 @@ import org.eclipse.emf.spi.cdo.InternalCDOSession;
  */
 public class Bugzilla_449806_Test extends AbstractCDOTest
 {
-
   private static final String RESOURCE_NAME = "test1.model1";
 
   private static final int NB_CATEGORY = 10;
@@ -82,5 +81,4 @@ public class Bugzilla_449806_Test extends AbstractCDOTest
     Company company = (Company)resource.getContents().get(0);
     assertEquals(NB_CATEGORY, company.getCategories().size());
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458149_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458149_Test.java
index 17d37f7b35..403754b73a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458149_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_458149_Test.java
@@ -43,9 +43,8 @@ public class Bugzilla_458149_Test extends AbstractCDOTest
     getRepository();
     ResourceSet resourceSet = new ResourceSetImpl();
 
-    URI sharedResourceURI = URI.createURI(
-        CDONet4jUtil.PROTOCOL_TCP + "://localhost/" + RepositoryConfig.REPOSITORY_NAME
-            + getResourcePath("/sharedResource")).appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
+    URI sharedResourceURI = URI.createURI(CDONet4jUtil.PROTOCOL_TCP + "://localhost/" + RepositoryConfig.REPOSITORY_NAME
+        + getResourcePath("/sharedResource")).appendQuery(CDOURIData.TRANSACTIONAL_PARAMETER + "=true");
     Resource sharedResource = resourceSet.createResource(sharedResourceURI);
     sharedResource.save(Collections.emptyMap());
     assertEquals(sharedResourceURI, sharedResource.getURI());
@@ -75,5 +74,4 @@ public class Bugzilla_458149_Test extends AbstractCDOTest
     resourceSet.getResources().remove(localResource);
     assertEquals(localResourceURI, localResource.getURI());
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_459104_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_459104_Test.java
index 5ca09787c4..17698d40f6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_459104_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_459104_Test.java
@@ -64,5 +64,4 @@ public class Bugzilla_459104_Test extends AbstractCDOTest
 
     protocol.removeListener(signalCounter);
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_464590_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_464590_Test.java
index 1285933b90..eb23658c31 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_464590_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_464590_Test.java
@@ -34,7 +34,6 @@ import java.util.Collections;
  */
 public class Bugzilla_464590_Test extends AbstractCDOTest
 {
-
   /**
    * Test {@link EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)} with EMF proxies in XMIResource.
    */
@@ -82,5 +81,4 @@ public class Bugzilla_464590_Test extends AbstractCDOTest
       return false;
     }
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_465115_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_465115_Test.java
index e6197100cf..abc57ca5f5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_465115_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_465115_Test.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.cdo.view.CDOViewSet;
  */
 public class Bugzilla_465115_Test extends AbstractCDOTest
 {
-
   private static final String RESOURCE_NAME = "test1.model1";
 
   /**
@@ -46,5 +45,4 @@ public class Bugzilla_465115_Test extends AbstractCDOTest
     assertEquals(1, viewSet.getViews().length);
     assertEquals(transaction1, viewSet.getViews()[0]);
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_477777_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_477777_Test.java
new file mode 100644
index 0000000000..4f5aee9253
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_477777_Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2015 Obeo 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:
+ *    Esteban Dugueperoux - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.bugzilla;
+
+import org.eclipse.emf.cdo.eresource.CDOResource;
+import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.model1.Company;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.util.CDOUtil;
+import org.eclipse.emf.cdo.view.CDOViewSet;
+
+/**
+ * Bug 465115 about StackOverflowError on CDOUtil.getViewSet() call with a CDOResource.
+ *
+ * @author Esteban Dugueperoux
+ */
+public class Bugzilla_477777_Test extends AbstractCDOTest
+{
+  private static final String RESOURCE_NAME = "test1.model1";
+
+  /**
+   * Test {@link CDOUtil#getViewSet(org.eclipse.emf.common.notify.Notifier)} on a {@link CDOResource}.
+   */
+  public void testCDOUtilGetViewSet() throws Exception
+  {
+    CDOSession session1 = openSession();
+    CDOTransaction transaction1 = session1.openTransaction();
+    CDOResource resource1 = transaction1.createResource(getResourcePath(RESOURCE_NAME));
+    Company company = getModel1Factory().createCompany();
+    resource1.getContents().add(company);
+    transaction1.commit();
+
+    CDOViewSet viewSet = CDOUtil.getViewSet(resource1);
+    assertNotNull(viewSet);
+    assertEquals(1, viewSet.getViews().length);
+    assertEquals(transaction1, viewSet.getViews()[0]);
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ITestLifecycle.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ITestLifecycle.java
index c4066cd744..e38f41a709 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ITestLifecycle.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/ITestLifecycle.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
index e84c8a7f46..6a87c9574f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
@@ -114,8 +114,8 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
 
   private static final boolean LOG_MULTI_VIEW_COMMIT = false;
 
-  private static final Boolean enableServerBrowser = Boolean.valueOf(System.getProperty(
-      "org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.enableServerBrowser", "false"));
+  private static final Boolean enableServerBrowser = Boolean.valueOf(
+      System.getProperty("org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.enableServerBrowser", "false"));
 
   private static final long serialVersionUID = 1L;
 
@@ -533,8 +533,8 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
               if (!path.startsWith(prefix) && !hasAnnotation(CleanRepositoriesBefore.class))
               {
                 throw new RuntimeException("Test case " + test.getClass().getName() + '.' + test.getName()
-                    + " does not use getResourcePath() for resource " + path + ", nor does it declare @"
-                    + CleanRepositoriesBefore.class.getSimpleName());
+                + " does not use getResourcePath() for resource " + path + ", nor does it declare @"
+                + CleanRepositoriesBefore.class.getSimpleName());
               }
             }
           }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayed2Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayed2Test.java
index 2b0ef861cb..40b604dee3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayed2Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayed2Test.java
@@ -62,8 +62,8 @@ public class OfflineDelayed2Test extends AbstractSyncingTest
     sleep(1000);
 
     CDOTransaction cloneTransaction = cloneSession.openTransaction();
-    CDOObject cloneCompany = CDOUtil.getCDOObject(cloneTransaction.getObject(CDOUtil.getCDOObject(masterCompany)
-        .cdoID()));
+    CDOObject cloneCompany = CDOUtil
+        .getCDOObject(cloneTransaction.getObject(CDOUtil.getCDOObject(masterCompany).cdoID()));
     assertEquals(nbrOfCommits + 1, cloneCompany.cdoRevision().getVersion());
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTestSuite.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTestSuite.java
index b1cee1bccf..cdd07e28ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTestSuite.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/PerformanceTestSuite.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -43,7 +43,8 @@ public abstract class PerformanceTestSuite extends ConfigTestSuite
     return runsPerTestCase;
   }
 
-  protected PerformanceRecord createPerformanceRecord(IScenario scenario, String testName, String testCaseName, int runs)
+  protected PerformanceRecord createPerformanceRecord(IScenario scenario, String testName, String testCaseName,
+      int runs)
   {
     PerformanceRecord performanceRecord = new PerformanceRecord(scenario, testName, testCaseName, runs);
     performanceRecords.add(performanceRecord);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/ProbeCollector.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/ProbeCollector.java
index cbe798a23d..5076685bd2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/ProbeCollector.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/framework/ProbeCollector.java
@@ -4,7 +4,7 @@
  * 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:
  *    Stefan Winkler - initial API and implementation
  */
@@ -22,7 +22,8 @@ public class ProbeCollector
 {
   private final List<PerformanceRecord> performanceRecords = new ArrayList<PerformanceRecord>();
 
-  protected PerformanceRecord createPerformanceRecord(IScenario scenario, String testName, String testCaseName, int runs)
+  protected PerformanceRecord createPerformanceRecord(IScenario scenario, String testName, String testCaseName,
+      int runs)
   {
     PerformanceRecord performanceRecord = new PerformanceRecord(scenario, testName, testCaseName, runs);
     performanceRecords.add(performanceRecord);
diff --git a/plugins/org.eclipse.emf.cdo.transfer.repository/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer.repository/META-INF/MANIFEST.MF
index 2c631bbcbf..4c83a5462b 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.repository/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.transfer.repository/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.transfer.repository;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.cdo.transfer;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.2.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.transfer.internal.repository.bundle;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.transfer.spi.repository;version="4.2.100"
+Export-Package: org.eclipse.emf.cdo.transfer.internal.repository.bundle;version="4.2.200";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.spi.repository;version="4.2.200"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.cdo.transfer.internal.repository.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.transfer.repository/src/org/eclipse/emf/cdo/transfer/spi/repository/package-info.java b/plugins/org.eclipse.emf.cdo.transfer.repository/src/org/eclipse/emf/cdo/transfer/spi/repository/package-info.java
index d00e3f5a46..10d8e17e4c 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.repository/src/org/eclipse/emf/cdo/transfer/spi/repository/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.repository/src/org/eclipse/emf/cdo/transfer/spi/repository/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * between {@link org.eclipse.emf.cdo.transfer.CDOTransferSystem systems}.
  */
 package org.eclipse.emf.cdo.transfer.spi.repository;
-
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/spi/ui/package-info.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/spi/ui/package-info.java
index c87f2a07fe..49175527b4 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/spi/ui/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/spi/ui/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * between {@link org.eclipse.emf.cdo.transfer.CDOTransferSystem systems}.
  */
 package org.eclipse.emf.cdo.transfer.spi.ui;
-
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/package-info.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/package-info.java
index ce9c538f6f..ca380cfc1c 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * between {@link org.eclipse.emf.cdo.transfer.CDOTransferSystem systems}.
  */
 package org.eclipse.emf.cdo.transfer.ui;
-
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/swt/package-info.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/swt/package-info.java
index f7b99051b7..d1770a9feb 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/swt/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/swt/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * between {@link org.eclipse.emf.cdo.transfer.CDOTransferSystem systems}.
  */
 package org.eclipse.emf.cdo.transfer.ui.swt;
-
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/ResourceManager.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/ResourceManager.java
index 42b9dc18f4..299ead2c31 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/ResourceManager.java
@@ -32,14 +32,14 @@ import java.util.Map;
 /**
  * Utility class for managing OS resources associated with SWT/JFace controls such as colors, fonts, images,
  * etc.
- * 
+ *
  * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the
  * operating system resources managed by cached objects when those objects and OS resources are no longer
  * needed (e.g. on application shutdown)
- * 
+ *
  * This class may be freely distributed as part of any application or plugin.
  * <p>
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -55,7 +55,7 @@ public class ResourceManager extends SWTResourceManager
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified
    * class.
-   * 
+   *
    * @param clazz
    *            the {@link Class} relative to which to find the image descriptor.
    * @param path
@@ -69,7 +69,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *            the path to the image file.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
@@ -88,7 +88,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
-   * 
+   *
    * @param descriptor
    *            the {@link ImageDescriptor} for the {@link Image}.
    * @return the {@link Image} based on the specified {@link ImageDescriptor}.
@@ -116,7 +116,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated.
    * @param decorator
@@ -130,7 +130,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated.
    * @param decorator
@@ -267,13 +267,13 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *            the plugin {@link Object} containing the image
    * @param name
    *            the path to the image within the plugin
    * @return the {@link Image} stored in the file at the specified path
-   * 
+   *
    * @deprecated Use {@link #getPluginImage(String, String)} instead.
    */
   @Deprecated
@@ -296,7 +296,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *            the symbolic name of the {@link Bundle}.
    * @param path
@@ -360,13 +360,13 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *            the plugin {@link Object} containing the image.
    * @param name
    *            the path to th eimage within the plugin.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @deprecated Use {@link #getPluginImageDescriptor(String, String)} instead.
    */
   @Deprecated
@@ -393,7 +393,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *            the symbolic name of the {@link Bundle}.
    * @param path
@@ -441,7 +441,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link URL} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *            the plugin {@link Object} containing the file path.
    * @param name
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/SWTResourceManager.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
index 3bcc1029a6..4d9fe74b57 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
@@ -51,7 +51,7 @@ public class SWTResourceManager
 
   /**
    * Returns the system {@link Color} matching the specific ID.
-   * 
+   *
    * @param systemColorID
    *            the ID value for the color
    * @return the system {@link Color} matching the specific ID
@@ -64,7 +64,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its red, green and blue component values.
-   * 
+   *
    * @param r
    *            the red component of the color
    * @param g
@@ -80,7 +80,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its RGB value.
-   * 
+   *
    * @param rgb
    *            the {@link RGB} value of the color
    * @return the {@link Color} matching the RGB value
@@ -121,7 +121,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} encoded by the specified {@link InputStream}.
-   * 
+   *
    * @param stream
    *            the {@link InputStream} encoding the image data
    * @return the {@link Image} encoded by the specified input stream
@@ -146,7 +146,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *            the path to the image file
    * @return the {@link Image} stored in the file at the specified path
@@ -172,7 +172,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *            the {@link Class} relative to which to find the image
    * @param path
@@ -249,7 +249,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated
    * @param decorator
@@ -263,7 +263,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *            the base {@link Image} that should be decorated
    * @param decorator
@@ -373,7 +373,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Font} based on its name, height and style.
-   * 
+   *
    * @param name
    *            the name of the font
    * @param height
@@ -390,7 +390,7 @@ public class SWTResourceManager
   /**
    * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline
    * flags are also supported.
-   * 
+   *
    * @param name
    *            the name of the font
    * @param size
@@ -441,7 +441,7 @@ public class SWTResourceManager
 
   /**
    * Returns a bold version of the given {@link Font}.
-   * 
+   *
    * @param baseFont
    *            the {@link Font} for which a bold version is desired
    * @return the bold version of the given {@link Font}
@@ -490,7 +490,7 @@ public class SWTResourceManager
 
   /**
    * Returns the system cursor matching the specific ID.
-   * 
+   *
    * @param id
    *            int The ID value for the cursor
    * @return Cursor The system cursor matching the specific ID
diff --git a/plugins/org.eclipse.emf.cdo.transfer.workspace/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer.workspace/META-INF/MANIFEST.MF
index 4f2580b121..0b20687b5a 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.workspace/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.transfer.workspace/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.transfer.workspace;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.transfer;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.team.core;bundle-version="[3.5.0,4.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.transfer.internal.workspace.bundle;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.transfer.spi.workspace;version="4.2.100"
+Export-Package: org.eclipse.emf.cdo.transfer.internal.workspace.bundle;version="4.2.200";x-internal:=true,
+ org.eclipse.emf.cdo.transfer.spi.workspace;version="4.2.200"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.cdo.transfer.internal.workspace.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.transfer.workspace/src/org/eclipse/emf/cdo/transfer/spi/workspace/package-info.java b/plugins/org.eclipse.emf.cdo.transfer.workspace/src/org/eclipse/emf/cdo/transfer/spi/workspace/package-info.java
index 7278f65f28..3fc477457c 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.workspace/src/org/eclipse/emf/cdo/transfer/spi/workspace/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.workspace/src/org/eclipse/emf/cdo/transfer/spi/workspace/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * between {@link org.eclipse.emf.cdo.transfer.CDOTransferSystem systems}.
  */
 package org.eclipse.emf.cdo.transfer.spi.workspace;
-
diff --git a/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF
index 62aed5bf71..850b9631f8 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.transfer;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)"
-Export-Package: org.eclipse.emf.cdo.internal.transfer.bundle;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.spi.transfer;version="4.2.100",
- org.eclipse.emf.cdo.transfer;version="4.2.100"
+Export-Package: org.eclipse.emf.cdo.internal.transfer.bundle;version="4.2.200";x-internal:=true,
+ org.eclipse.emf.cdo.spi.transfer;version="4.2.200",
+ org.eclipse.emf.cdo.transfer;version="4.2.200"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.cdo.internal.transfer.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/spi/transfer/package-info.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/spi/transfer/package-info.java
index 5931e5ff41..278b90e515 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/spi/transfer/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/spi/transfer/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * between {@link org.eclipse.emf.cdo.transfer.CDOTransferSystem systems}.
  */
 package org.eclipse.emf.cdo.spi.transfer;
-
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/package-info.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/package-info.java
index 242b29c1be..343f4d07be 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * between {@link org.eclipse.emf.cdo.transfer.CDOTransferSystem systems}.
  */
 package org.eclipse.emf.cdo.transfer;
-
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/CDOAdminView.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/CDOAdminView.java
index f833025e8f..d316a339f2 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/CDOAdminView.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/CDOAdminView.java
@@ -199,8 +199,8 @@ public class CDOAdminView extends ContainerView
 
       addConnectionAction.setText(Messages.CDOAdminView_2);
       addConnectionAction.setToolTipText(Messages.CDOAdminView_3);
-      addConnectionAction.setImageDescriptor(org.eclipse.net4j.ui.shared.SharedIcons
-          .getDescriptor(org.eclipse.net4j.ui.shared.SharedIcons.ETOOL_ADD));
+      addConnectionAction.setImageDescriptor(
+          org.eclipse.net4j.ui.shared.SharedIcons.getDescriptor(org.eclipse.net4j.ui.shared.SharedIcons.ETOOL_ADD));
     }
 
     manager.add(addConnectionAction);
@@ -262,13 +262,13 @@ public class CDOAdminView extends ContainerView
   /**
    * @author Eike Stepper
    */
-  public class OpenSessionAction extends AdminAction<CDOAdminClientRepository> implements
-      CDOAdminClientRepository.SessionConfigurator
+  public class OpenSessionAction extends AdminAction<CDOAdminClientRepository>
+      implements CDOAdminClientRepository.SessionConfigurator
   {
     public OpenSessionAction(CDOAdminClientRepository repository)
     {
-      super(Messages.CDOAdminView_4, Messages.CDOAdminView_5,
-          SharedIcons.getDescriptor(SharedIcons.ETOOL_OPEN_SESSION), repository);
+      super(Messages.CDOAdminView_4, Messages.CDOAdminView_5, SharedIcons.getDescriptor(SharedIcons.ETOOL_OPEN_SESSION),
+          repository);
     }
 
     public CDOAdminClientRepository getRepository()
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/StoreType.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/StoreType.java
index 187e4b9d47..26214203aa 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/StoreType.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/StoreType.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/AdminAction.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/AdminAction.java
index fce0138777..3d451e8ff8 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/AdminAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/AdminAction.java
@@ -4,10 +4,10 @@
  * 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
- *    Christian W. Damus (CEA LIST) - bug 418454 
+ *    Christian W. Damus (CEA LIST) - bug 418454
  */
 package org.eclipse.emf.cdo.ui.internal.admin.actions;
 
@@ -25,7 +25,7 @@ import java.text.MessageFormat;
 
 /**
  * @param <T> the type of the target element of the action in the CDO Administration View
- * 
+ *
  * @author Christian W. Damus (CEA LIST)
  */
 public abstract class AdminAction<T> extends LongRunningAction
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/CreateRepositoryAction.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/CreateRepositoryAction.java
index 6c31fb438c..3f3e60f7cf 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/CreateRepositoryAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/CreateRepositoryAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -33,8 +33,8 @@ public class CreateRepositoryAction extends AdminAction<CDOAdminClient>
 
   public CreateRepositoryAction(CDOAdminClient admin)
   {
-    super(Messages.CreateRepositoryAction_0, Messages.CreateRepositoryAction_1, OM
-        .getImageDescriptor("icons/full/ctool16/create_repo.gif"), admin); //$NON-NLS-1$
+    super(Messages.CreateRepositoryAction_0, Messages.CreateRepositoryAction_1,
+        OM.getImageDescriptor("icons/full/ctool16/create_repo.gif"), admin); //$NON-NLS-1$
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/DeleteRepositoryAction.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/DeleteRepositoryAction.java
index 9fb070cd70..602cf850aa 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/DeleteRepositoryAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/actions/DeleteRepositoryAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -29,8 +29,8 @@ public class DeleteRepositoryAction extends AdminAction<CDOAdminClientRepository
 {
   public DeleteRepositoryAction(CDOAdminClientRepository repository)
   {
-    super(Messages.DeleteRepositoryAction_1, Messages.DeleteRepositoryAction_2, SharedIcons
-        .getDescriptor(SharedIcons.ETOOL_DELETE), repository);
+    super(Messages.DeleteRepositoryAction_1, Messages.DeleteRepositoryAction_2,
+        SharedIcons.getDescriptor(SharedIcons.ETOOL_DELETE), repository);
   }
 
   @Override
@@ -38,8 +38,8 @@ public class DeleteRepositoryAction extends AdminAction<CDOAdminClientRepository
   {
     final int NO_BUTTON = 1;
     String message = MessageFormat.format(Messages.DeleteRepositoryAction_4, target.getName());
-    MessageDialog dlg = new MessageDialog(getShell(), getText(), null, message, MessageDialog.WARNING, new String[] {
-        IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, NO_BUTTON);
+    MessageDialog dlg = new MessageDialog(getShell(), getText(), null, message, MessageDialog.WARNING,
+        new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, NO_BUTTON);
     if (dlg.open() == NO_BUTTON)
     {
       cancel();
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/messages/Messages.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/messages/Messages.java
index 01d4e6dc58..e1131435bf 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryStorePage.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryStorePage.java
index 2806656186..32bf4751c4 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryStorePage.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/wizards/CreateRepositoryStorePage.java
@@ -152,12 +152,12 @@ public class CreateRepositoryStorePage extends AbstractCreateRepositoryWizardPag
   @Override
   protected void loadSettings(IDialogSettings pageSettings)
   {
-    connectionKeepAlivePeriodText.setText(getSetting(pageSettings, PROPERTY_CONNECTION_KEEP_ALIVE_PERIOD,
-        DEFAULT_CONNECTION_KEEP_ALIVE_PERIOD));
+    connectionKeepAlivePeriodText
+        .setText(getSetting(pageSettings, PROPERTY_CONNECTION_KEEP_ALIVE_PERIOD, DEFAULT_CONNECTION_KEEP_ALIVE_PERIOD));
     readerPoolCapacityText
-        .setText(getSetting(pageSettings, PROPERTY_READER_POOL_CAPACITY, DEFAULT_READER_POOL_CAPACITY));
+    .setText(getSetting(pageSettings, PROPERTY_READER_POOL_CAPACITY, DEFAULT_READER_POOL_CAPACITY));
     writerPoolCapacityText
-        .setText(getSetting(pageSettings, PROPERTY_WRITER_POOL_CAPACITY, DEFAULT_WRITER_POOL_CAPACITY));
+    .setText(getSetting(pageSettings, PROPERTY_WRITER_POOL_CAPACITY, DEFAULT_WRITER_POOL_CAPACITY));
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/package-info.java b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/package-info.java
index dd3356937e..079253a2d0 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2013 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) 2013 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
  */
 
 /**
  * Classes that help to open EMF Compare user interfaces on CDO models.
  */
 package org.eclipse.emf.cdo.ui.compare;
-
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF
index bcf4dd3198..378189da21 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.ui.defs;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.ui.defs;version="4.0.300",
- org.eclipse.emf.cdo.ui.defs.impl;version="4.0.300",
- org.eclipse.emf.cdo.ui.defs.util;version="4.0.300"
+Export-Package: org.eclipse.emf.cdo.ui.defs;version="4.0.400",
+ org.eclipse.emf.cdo.ui.defs.impl;version="4.0.400",
+ org.eclipse.emf.cdo.ui.defs.util;version="4.0.400"
 Require-Bundle: org.eclipse.emf.cdo.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOEditorDef.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOEditorDef.java
index b11f41f152..db50969fbe 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOEditorDef.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOEditorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsFactory.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsFactory.java
index ea562f0cf7..f760f65508 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsFactory.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsPackage.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsPackage.java
index d5371977d4..13df84a511 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsPackage.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsPackage.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -64,7 +64,7 @@ public interface CDOUIDefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.ui.defs.impl.EditorDefImpl <em>Editor Def</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.cdo.ui.defs.impl.EditorDefImpl
    * @see org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl#getEditorDef()
    * @generated
@@ -123,7 +123,7 @@ public interface CDOUIDefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>CDO Editor Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -132,7 +132,7 @@ public interface CDOUIDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.ui.defs.EditorDef <em>Editor Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Editor Def</em>'.
    * @see org.eclipse.emf.cdo.ui.defs.EditorDef
    * @generated
@@ -152,7 +152,7 @@ public interface CDOUIDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef <em>CDO Editor Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>CDO Editor Def</em>'.
    * @see org.eclipse.emf.cdo.ui.defs.CDOEditorDef
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/EditorDef.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/EditorDef.java
index 1de2a34765..fca8b8d0fa 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/EditorDef.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/EditorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java
index 9c76f88747..c93b9bcfb9 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -50,7 +50,7 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage#eNS_URI
    * @see #init()
@@ -69,7 +69,7 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link CDOUIDefsPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc
@@ -82,11 +82,14 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
   public static CDOUIDefsPackage init()
   {
     if (isInited)
+    {
       return (CDOUIDefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDOUIDefsPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    CDOUIDefsPackageImpl theCDOUIDefsPackage = (CDOUIDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDOUIDefsPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new CDOUIDefsPackageImpl());
+    CDOUIDefsPackageImpl theCDOUIDefsPackage = (CDOUIDefsPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof CDOUIDefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new CDOUIDefsPackageImpl());
 
     isInited = true;
 
@@ -176,7 +179,9 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -203,7 +208,9 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -222,7 +229,7 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
     // Add supertypes to classes
     editorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    cdoEditorDefEClass.getESuperTypes().add(this.getEditorDef());
+    cdoEditorDefEClass.getESuperTypes().add(getEditorDef());
 
     // Initialize classes and features; add operations and parameters
     initEClass(editorDefEClass, EditorDef.class, "EditorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java
index 9260a82589..5228db8145 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -91,8 +91,10 @@ public class EditorDefImpl extends DefImpl implements EditorDef
     String oldEditorID = editorID;
     editorID = newEditorID;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID, oldEditorID,
-          editorID));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID, oldEditorID, editorID));
+    }
   }
 
   /**
@@ -165,7 +167,9 @@ public class EditorDefImpl extends DefImpl implements EditorDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (editorID: ");
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsAdapterFactory.java
index 98613c3599..4609aede4d 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsAdapterFactory.java
@@ -148,7 +148,7 @@ public class CDOUIDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.defs.Def
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java
index 453adf4ffd..e5c59aa57b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java
@@ -29,7 +29,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage
  * @generated
  */
@@ -37,14 +37,14 @@ public class CDOUIDefsSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static CDOUIDefsPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public CDOUIDefsSwitch()
@@ -58,7 +58,7 @@ public class CDOUIDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -70,7 +70,7 @@ public class CDOUIDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -90,7 +90,7 @@ public class CDOUIDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -138,7 +138,7 @@ public class CDOUIDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Editor Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Editor Def</em>'.
@@ -153,7 +153,7 @@ public class CDOUIDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>CDO Editor Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>CDO Editor Def</em>'.
@@ -168,7 +168,7 @@ public class CDOUIDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
@@ -184,7 +184,7 @@ public class CDOUIDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/shared/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/shared/bundle/OM.java
index 13478406e4..c839cef62d 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/shared/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/internal/shared/bundle/OM.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Martin Fluegge
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
index 79389f2a12..c763f1487e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
@@ -115,8 +115,8 @@ public class CDOPropertyAdapterFactory extends AbstractPropertyAdapterFactory
           {
             adapterFactory = CDOEditor.createAdapterFactory(false);
 
-            IItemPropertySource propertySource = (IItemPropertySource)adapterFactory.adapt(
-                cdoObject.cdoInternalInstance(), IItemPropertySource.class);
+            IItemPropertySource propertySource = (IItemPropertySource)adapterFactory
+                .adapt(cdoObject.cdoInternalInstance(), IItemPropertySource.class);
             if (propertySource != null)
             {
               List<IItemPropertyDescriptor> propertyDescriptors = propertySource.getPropertyDescriptors(cdoObject);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
index 373041ed8e..38b5404cdd 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java
@@ -4,7 +4,7 @@
  * 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
  *    Simon McDuff - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java
index 4948c1071f..938cc3eec7 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
index 9abe01fce7..d3e4515703 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -90,9 +90,8 @@ public abstract class AbstractLockObjectsAction extends EditingDomainAction
             {
               public void run()
               {
-                MessageDialog.openError(
-                    getShell(),
-                    Messages.getString("AbstractLockObjectsAction.0"), Messages.getString("AbstractLockObjectsAction.1")); //$NON-NLS-1$ //$NON-NLS-2$
+                MessageDialog.openError(getShell(), Messages.getString("AbstractLockObjectsAction.0"), //$NON-NLS-1$
+                    Messages.getString("AbstractLockObjectsAction.1")); //$NON-NLS-1$
               }
             });
           }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractViewAction.java
index 254eecb26d..9dad68ecd4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractViewAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java
index 14daed4b1c..efad62938b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 /**
  * Changes the state of the {@link Options#isPassiveUpdateEnabled() passive update} option for a given
  * {@link CDOSession session}.
- * 
+ *
  * @author Victor Roldan Betancort
  */
 public class ChangePassiveUpdateAction extends EditingDomainAction
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePasswordAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePasswordAction.java
index b6d5b69c46..4d12153148 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePasswordAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePasswordAction.java
@@ -18,7 +18,7 @@ import org.eclipse.ui.IWorkbenchPage;
 
 /**
  * The "change password" action.
- * 
+ *
  * @author Christian W. Damus (CEA LIST)
  */
 public final class ChangePasswordAction extends SessionAction
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
index dfb190f52f..70c1ccf36c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java
@@ -39,9 +39,10 @@ public final class CloseSessionAction extends SessionAction
   {
     if (CDOUtil.isSessionDirty(getSession()))
     {
-      MessageDialog dialog = new MessageDialog(getShell(), TITLE, null,
-          Messages.getString("CloseSessionAction.2"), MessageDialog.QUESTION, new String[] { //$NON-NLS-1$
-          IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
+      MessageDialog dialog = new MessageDialog(getShell(), TITLE, null, Messages.getString("CloseSessionAction.2"), //$NON-NLS-1$
+          MessageDialog.QUESTION, new String[] {
+              IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL },
+          0);
       if (dialog.open() != MessageDialog.OK)
       {
         cancel();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
index 0e653d8f8d..fa88d1e25b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java
@@ -38,9 +38,10 @@ public final class CloseViewAction extends AbstractViewAction
   {
     if (getView().isDirty())
     {
-      MessageDialog dialog = new MessageDialog(getShell(), TITLE, null,
-          Messages.getString("CloseViewAction.2"), MessageDialog.QUESTION, new String[] { //$NON-NLS-1$
-          IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
+      MessageDialog dialog = new MessageDialog(getShell(), TITLE, null, Messages.getString("CloseViewAction.2"), //$NON-NLS-1$
+          MessageDialog.QUESTION, new String[] {
+              IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL },
+          0);
       if (dialog.open() != MessageDialog.OK)
       {
         cancel();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DisableViewDurabilityAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DisableViewDurabilityAction.java
index f826ddfc3e..6f120fbf66 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DisableViewDurabilityAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DisableViewDurabilityAction.java
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java
index 8c626c5aec..c8b6776873 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -64,8 +64,8 @@ public abstract class EditingDomainAction extends LongRunningAction
   public void setActiveWorkbenchPart(IWorkbenchPart workbenchPart)
   {
     setPage(workbenchPart == null ? null : workbenchPart.getSite().getPage());
-    setEditingDomain(workbenchPart instanceof IEditingDomainProvider ? ((IEditingDomainProvider)workbenchPart)
-        .getEditingDomain() : null);
+    setEditingDomain(workbenchPart instanceof IEditingDomainProvider
+        ? ((IEditingDomainProvider)workbenchPart).getEditingDomain() : null);
   }
 
   public void update()
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java
index 4c38fc5132..6aa9de88b6 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
@@ -46,8 +46,8 @@ public final class EnableViewDurabilityAction extends AbstractViewAction
       public void run()
       {
         UIUtil.copyToClipboard(display, durableLockingID);
-        MessageDialog.openInformation(getShell(), TITLE, "The following area ID has been copied to the clipboard:\n"
-            + durableLockingID);
+        MessageDialog.openInformation(getShell(), TITLE,
+            "The following area ID has been copied to the clipboard:\n" + durableLockingID);
       }
     });
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
index 349db4012b..ab27beaa63 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
@@ -47,8 +47,8 @@ public class ExportResourceAction extends AbstractViewAction
 
   public ExportResourceAction(IWorkbenchPage page, CDOView view)
   {
-    super(page, TITLE + INTERACTIVE,
-        Messages.getString("ExportResourceAction.2"), SharedIcons.getDescriptor(SharedIcons.ETOOL_EXPORT), view); //$NON-NLS-1$
+    super(page, TITLE + INTERACTIVE, Messages.getString("ExportResourceAction.2"), //$NON-NLS-1$
+        SharedIcons.getDescriptor(SharedIcons.ETOOL_EXPORT), view);
     setId(ID);
   }
 
@@ -95,8 +95,8 @@ public class ExportResourceAction extends AbstractViewAction
   {
     // Target Resource
     ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-        .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
+    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION,
+        new XMIResourceFactoryImpl());
     Resource resource = resourceSet.createResource(sourceURI);
 
     Collection<EObject> copiedRoots = EcoreUtil.copyAll(sourceContents);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
index 6b1eecb5b9..70fda7b058 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
@@ -48,8 +48,8 @@ public class ImportResourceAction extends AbstractViewAction
 
   public ImportResourceAction(IWorkbenchPage page, CDOView view)
   {
-    super(page, TITLE + INTERACTIVE,
-        Messages.getString("ImportResourceAction.2"), SharedIcons.getDescriptor(SharedIcons.ETOOL_IMPORT), view); //$NON-NLS-1$
+    super(page, TITLE + INTERACTIVE, Messages.getString("ImportResourceAction.2"), //$NON-NLS-1$
+        SharedIcons.getDescriptor(SharedIcons.ETOOL_IMPORT), view);
     setId(ID);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
index 24646513cd..a77517155f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java
index 002b201cd1..e816e191e9 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java
index 54d10bc742..6bdea6bd71 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/MergeConflictsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/MergeConflictsAction.java
index 88132c4f33..4f5c7dc5e3 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/MergeConflictsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/MergeConflictsAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java
index beef49f580..ecb00f9167 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java
@@ -143,17 +143,17 @@ public class NewTopLevelResourceNodeAction extends AbstractViewAction
    */
   public static enum Type
   {
-    FOLDER(Messages.getString("Title.Folder"), Messages.getString("Tooltip.Folder"), SharedIcons
-        .getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE_FOLDER)),
+    FOLDER(Messages.getString("Title.Folder"), Messages.getString("Tooltip.Folder"),
+        SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE_FOLDER)),
 
-    MODEL(Messages.getString("Title.Model"), Messages.getString("Tooltip.Model"), SharedIcons
-        .getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE)),
+        MODEL(Messages.getString("Title.Model"), Messages.getString("Tooltip.Model"),
+        SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE)),
 
-    TEXT(Messages.getString("Title.Text"), Messages.getString("Tooltip.Text"), SharedIcons
-        .getDescriptor(SharedIcons.ETOOL_NEW_TEXT_RESOURCE)),
+            TEXT(Messages.getString("Title.Text"), Messages.getString("Tooltip.Text"),
+        SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_TEXT_RESOURCE)),
 
-    BINARY(Messages.getString("Title.Binary"), Messages.getString("Tooltip.Binary"), SharedIcons
-        .getDescriptor(SharedIcons.ETOOL_NEW_BINARY_RESOURCE));
+                BINARY(Messages.getString("Title.Binary"), Messages.getString("Tooltip.Binary"),
+        SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_BINARY_RESOURCE));
 
     private String title;
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
index 4b54f56fe7..98fb5655e4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
@@ -15,9 +15,9 @@ import org.eclipse.emf.cdo.eresource.CDOFileResource;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;
 import org.eclipse.emf.cdo.internal.ui.CDOLobEditorInput;
-import org.eclipse.emf.cdo.ui.CDOEditorUtil;
 import org.eclipse.emf.cdo.internal.ui.bundle.OM;
 import org.eclipse.emf.cdo.internal.ui.messages.Messages;
+import org.eclipse.emf.cdo.ui.CDOEditorUtil;
 import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -40,8 +40,8 @@ public final class OpenResourceEditorAction extends ResourceNodeAction
 
   public OpenResourceEditorAction(IWorkbenchPage page, CDOResourceLeaf resource)
   {
-    super(page, resource instanceof CDOResource ? TITLE : FILE_TITLE, resource instanceof CDOResource ? TOOL_TIP
-        : FILE_TOOL_TIP, null, resource);
+    super(page, resource instanceof CDOResource ? TITLE : FILE_TITLE,
+        resource instanceof CDOResource ? TOOL_TIP : FILE_TOOL_TIP, null, resource);
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java
index 55740fd6de..326fb1e140 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
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 80af988197..fac1b929ea 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
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
@@ -38,9 +38,10 @@ public class RegisterFilesystemPackagesAction extends RegisterPackagesAction
 
   private static final String TOOL_TIP = Messages.getString("RegisterFilesystemPackagesAction.1"); //$NON-NLS-1$
 
-  private static final String[] FILTER_NAMES = {
-      Messages.getString("RegisterFilesystemPackagesAction.2"), Messages.getString("RegisterFilesystemPackagesAction.3"), Messages.getString("RegisterFilesystemPackagesAction.4"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      Messages.getString("RegisterFilesystemPackagesAction.5") }; //$NON-NLS-1$
+  private static final String[] FILTER_NAMES = { Messages.getString("RegisterFilesystemPackagesAction.2"), //$NON-NLS-1$
+      Messages.getString("RegisterFilesystemPackagesAction.3"), //$NON-NLS-1$
+      Messages.getString("RegisterFilesystemPackagesAction.4"), //$NON-NLS-1$
+    Messages.getString("RegisterFilesystemPackagesAction.5") }; //$NON-NLS-1$
 
   private static final String[] FILTER_EXTENSIONS = { "ecore", "xmi", "xml", null }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
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 24d465f1bd..e5b39fb8f0 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
@@ -47,10 +47,9 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
   protected List<EPackage> getEPackages(IWorkbenchPage page, CDOSession session)
   {
     Shell shell = page.getWorkbenchWindow().getShell();
-    SelectPackageDialog dialog = new SelectPackageDialog(shell,
-        Messages.getString("RegisterGeneratedPackagesAction.2"), //$NON-NLS-1$
+    SelectPackageDialog dialog = new SelectPackageDialog(shell, Messages.getString("RegisterGeneratedPackagesAction.2"), //$NON-NLS-1$
         Messages.getString("RegisterGeneratedPackagesAction.3"), session.getPackageRegistry() //$NON-NLS-1$
-            .keySet());
+        .keySet());
 
     if (dialog.open() == SelectPackageDialog.OK)
     {
@@ -87,8 +86,8 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
         return ""; //$NON-NLS-1$
       }
 
-      return registry.containsKey(uri) ? null : MessageFormat.format(
-          Messages.getString("RegisterGeneratedPackagesAction.5"), uri); //$NON-NLS-1$
+      return registry.containsKey(uri) ? null
+          : MessageFormat.format(Messages.getString("RegisterGeneratedPackagesAction.5"), uri); //$NON-NLS-1$
     }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
index 105c2ae5b2..c9453f073f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
@@ -87,7 +87,8 @@ public abstract class RegisterPackagesAction extends SessionAction
     postRegistration(ePackages);
     if (errors != 0)
     {
-      final String label = errors == 1 ? MessageFormat.format(Messages.getString("RegisterPackagesAction.1"), errors) : MessageFormat.format(Messages.getString("RegisterPackagesAction.2"), errors); //$NON-NLS-1$ //$NON-NLS-2$
+      final String label = errors == 1 ? MessageFormat.format(Messages.getString("RegisterPackagesAction.1"), errors) //$NON-NLS-1$
+          : MessageFormat.format(Messages.getString("RegisterPackagesAction.2"), errors); //$NON-NLS-1$
       getDisplay().asyncExec(new Runnable()
       {
         public void run()
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
index 226c9a615b..8557311221 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
@@ -36,8 +36,8 @@ public class RegisterSinglePackageAction extends RegisterPackagesAction
 
   public RegisterSinglePackageAction(IWorkbenchPage page, CDOSession session, String packageURI)
   {
-    super(page, packageURI,
-        Messages.getString("RegisterSinglePackageAction.0") + packageURI, getDescriptor(packageURI), session); //$NON-NLS-1$
+    super(page, packageURI, Messages.getString("RegisterSinglePackageAction.0") + packageURI, getDescriptor(packageURI), //$NON-NLS-1$
+        session);
     this.packageURI = packageURI;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java
index bb21265f22..0f864659d3 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java
index 05e26b1c29..964333b669 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java
index b77fff2507..2c5a90ff90 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java
index c06c4c004e..0b9b75da9f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java
@@ -60,7 +60,8 @@ public class ResourceNodeNameInputValidator implements IInputValidator
 
       if (child.getName().equals(newText))
       {
-        return isFolder ? Messages.getString("NewResourceNodeAction.5") + " " + newText : Messages.getString("NewResourceNodeAction.6") //$NON-NLS-1$ //$NON-NLS-2$
+        return isFolder ? Messages.getString("NewResourceNodeAction.5") + " " + newText //$NON-NLS-1$ //$NON-NLS-2$
+            : Messages.getString("NewResourceNodeAction.6")
                 + " " + newText;
       }
     }
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 d7b4ec2397..c2901fdd0d 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
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java
index 7bac527007..3e0eee34ec 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java
index e0c25e2816..3b6d8cdff4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java
index d4eb247b60..6af97d46f8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java
@@ -55,8 +55,8 @@ public class ExportResourceActionDelegate extends TransactionalBackgroundActionD
   @Override
   protected final CDOObject preRun(CDOObject object)
   {
-    ResourceDialog dialog = new ResourceDialog(new Shell(),
-        Messages.getString("ExportSelectedResourceAction_1"), SWT.SAVE); //$NON-NLS-1$
+    ResourceDialog dialog = new ResourceDialog(new Shell(), Messages.getString("ExportSelectedResourceAction_1"), //$NON-NLS-1$
+        SWT.SAVE);
     if (dialog.open() == ImportResourceDialog.OK)
     {
       List<URI> uris = dialog.getURIs();
@@ -95,8 +95,8 @@ public class ExportResourceActionDelegate extends TransactionalBackgroundActionD
   {
     // Target Resource
     ResourceSet resourceSet = new ResourceSetImpl();
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-        .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl());
+    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION,
+        new XMIResourceFactoryImpl());
     Resource resource = resourceSet.createResource(targetURI);
 
     Collection<EObject> copiedRoots = EcoreUtil.copyAll(sourceContents);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java
index 3daa305827..e97607a99f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java
@@ -38,10 +38,9 @@ public abstract class NewResourceNodeActionDelegate extends TransactionalBackgro
   @Override
   protected CDOObject preRun(CDOObject object)
   {
-    InputDialog dialog = new InputDialog(
-        getTargetPart().getSite().getShell(),
-        getText(),
-        Messages.getString("NewResourceNodeAction_0"), null, new ResourceNodeNameInputValidator((CDOResourceNode)object)); //$NON-NLS-1$
+    InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(),
+        Messages.getString("NewResourceNodeAction_0"), null, //$NON-NLS-1$
+        new ResourceNodeNameInputValidator((CDOResourceNode)object));
     if (dialog.open() == Dialog.OK)
     {
       setNewResourceNode(createNewResourceNode());
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RemoveResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RemoveResourceActionDelegate.java
index 9823785330..eb1ad21c3d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RemoveResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RemoveResourceActionDelegate.java
@@ -73,7 +73,7 @@ public class RemoveResourceActionDelegate implements IObjectActionDelegate
         Messages.getString("RemoveResourceAction_2"), nodes.size()))) //$NON-NLS-1$
     {
       Job job = new Job(Messages.getString("RemoveResourceAction_3")) //$NON-NLS-1$
-      {
+          {
         @Override
         protected IStatus run(IProgressMonitor monitor)
         {
@@ -114,8 +114,8 @@ public class RemoveResourceActionDelegate implements IObjectActionDelegate
             }
             catch (Exception ex)
             {
-              OM.LOG.error(MessageFormat.format(
-                  Messages.getString("RemoveResourceAction_4"), this.getClass().getName().toString()), ex); //$NON-NLS-1$
+              OM.LOG.error(MessageFormat.format(Messages.getString("RemoveResourceAction_4"), //$NON-NLS-1$
+                  this.getClass().getName().toString()), ex);
             }
             finally
             {
@@ -124,12 +124,13 @@ public class RemoveResourceActionDelegate implements IObjectActionDelegate
           }
 
           // UIUtil.setStatusBarMessage(
-          //              MessageFormat.format(Messages.getString("RemoveResourceAction_5"), nodes.size()), getDeleteIcon()); //$NON-NLS-1$
+          // MessageFormat.format(Messages.getString("RemoveResourceAction_5"), nodes.size()), getDeleteIcon());
+          // //$NON-NLS-1$
           return Status.OK_STATUS;
         }
-      };
+          };
 
-      job.schedule();
+          job.schedule();
     }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java
index f80b461883..d479f0d188 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java
@@ -37,10 +37,9 @@ public class RenameResourceActionDelegate extends TransactionalBackgroundActionD
   @Override
   protected CDOObject preRun(CDOObject object)
   {
-    InputDialog dialog = new InputDialog(
-        getTargetPart().getSite().getShell(),
-        getText(),
-        Messages.getString("NewResourceNodeAction_0"), null, new ResourceNodeNameInputValidator((CDOResourceNode)object)); //$NON-NLS-1$
+    InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(),
+        Messages.getString("NewResourceNodeAction_0"), null, //$NON-NLS-1$
+        new ResourceNodeNameInputValidator((CDOResourceNode)object));
     if (dialog.open() == Dialog.OK)
     {
       setNewResourceName(dialog.getValue());
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java
index 771710b132..f98316cc85 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java
@@ -34,8 +34,8 @@ import java.text.MessageFormat;
  * @author Victor Roldan Betancort
  */
 @Deprecated
-public abstract class TransactionalBackgroundActionDelegate extends LongRunningActionDelegate implements
-    IObjectActionDelegate
+public abstract class TransactionalBackgroundActionDelegate extends LongRunningActionDelegate
+    implements IObjectActionDelegate
 {
   private IWorkbenchPart targetPart;
 
@@ -83,8 +83,8 @@ public abstract class TransactionalBackgroundActionDelegate extends LongRunningA
         CDOView view = transactionalObject.cdoView();
         if (view.isReadOnly())
         {
-          throw new IllegalStateException(MessageFormat.format(
-              Messages.getString("TransactionalBackgroundAction_0"), transactionalObject)); //$NON-NLS-1$
+          throw new IllegalStateException(
+              MessageFormat.format(Messages.getString("TransactionalBackgroundAction_0"), transactionalObject)); //$NON-NLS-1$
         }
 
         // Bypass cancel()
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 da92a4ca0b..4c8e745c1d 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
@@ -49,25 +49,25 @@ public abstract class OM
   public static final OMPreferences PREFS = BUNDLE.preferences();
 
   public static final OMPreference<String> PREF_LABEL_DECORATION = //
-  PREFS.init("PREF_LABEL_DECORATION", CDOLabelDecorator.DEFAULT_DECORATION); //$NON-NLS-1$
+      PREFS.init("PREF_LABEL_DECORATION", CDOLabelDecorator.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.init("PREF_HISTORY_CONNECTORS", new String[] { "tcp://localhost" }); //$NON-NLS-1$
+      PREFS.init("PREF_HISTORY_CONNECTORS", new String[] { "tcp://localhost" }); //$NON-NLS-1$
 
   public static final OMPreference<String[]> PREF_HISTORY_REPOSITORIES = //
-  PREFS.init("PREF_HISTORY_REPOSITORIES", new String[] { "repo1" }); //$NON-NLS-1$
+      PREFS.init("PREF_HISTORY_REPOSITORIES", new String[] { "repo1" }); //$NON-NLS-1$
 
   public static final OMPreference<Boolean> PREF_AUTOMATIC_PACKAGE_REGISTRY = //
-  PREFS.init("PREF_AUTOMATIC_PACKAGE_REGISTRY", true); //$NON-NLS-1$
+      PREFS.init("PREF_AUTOMATIC_PACKAGE_REGISTRY", true); //$NON-NLS-1$
 
   public static final OMPreference<Boolean> PREF_LEGACY_MODE_DEFAULT = //
-  PREFS.init("PREF_LEGACY_MODE_DEFAULT", true); //$NON-NLS-1$
+      PREFS.init("PREF_LEGACY_MODE_DEFAULT", true); //$NON-NLS-1$
 
   public static final OMPreference<Boolean> PREF_EDITOR_AUTO_RELOAD = //
-  PREFS.init("PREF_EDITOR_AUTO_RELOAD", true); //$NON-NLS-1$
+      PREFS.init("PREF_EDITOR_AUTO_RELOAD", true); //$NON-NLS-1$
 
   public static Image getOverlayImage(Object image, Object overlayImage, int x, int y)
   {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java
index 210246107e..e085aac328 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java
@@ -69,8 +69,8 @@ public class EditObjectDialog extends TitleAreaDialog
 
     try
     {
-      ViewModelContext viewModelContext = ViewModelContextFactory.INSTANCE.createViewModelContext(
-          ViewProviderHelper.getView(eObject, null), eObject, new DefaultReferenceService());
+      ViewModelContext viewModelContext = ViewModelContextFactory.INSTANCE
+          .createViewModelContext(ViewProviderHelper.getView(eObject, null), eObject, new DefaultReferenceService());
 
       ECPSWTViewRenderer.INSTANCE.render(container, viewModelContext);
     }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java
index bb9e061f6c..0a04660943 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - bug 244801
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java
index e47c966ef2..14d3fd5338 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java
@@ -147,21 +147,21 @@ public class PackageRegistryDialog extends TitleAreaDialog
     });
 
     createButton(parent, -1, Messages.getString("PackageRegistryDialog.7"), false) //$NON-NLS-1$
-        .addSelectionListener(new SelectionAdapter()
+    .addSelectionListener(new SelectionAdapter()
+    {
+      @Override
+      public void widgetSelected(SelectionEvent e)
+      {
+        new RegisterFilesystemPackagesAction(page, session)
         {
           @Override
-          public void widgetSelected(SelectionEvent e)
+          protected void postRegistration(List<EPackage> ePackages)
           {
-            new RegisterFilesystemPackagesAction(page, session)
-            {
-              @Override
-              protected void postRegistration(List<EPackage> ePackages)
-              {
-                refreshViewer();
-              }
-            }.run();
+            refreshViewer();
           }
-        });
+        }.run();
+      }
+    });
 
     CustomizeableComposite.customize(parent, IPluginContainer.INSTANCE, PRODUCT_GROUP, this);
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
index 7f19286889..568872acbc 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java
@@ -77,12 +77,12 @@ public class RollbackTransactionDialog extends TitleAreaDialog
     StringBuilder builder = new StringBuilder();
     builder.append(Messages.getString("RollbackTransactionDialog.0")); //$NON-NLS-1$
 
-    append(builder, transaction.getNewObjects().size(),
-        Messages.getString("RollbackTransactionDialog.4"), Messages.getString("RollbackTransactionDialog.5")); //$NON-NLS-1$ //$NON-NLS-2$
-    append(builder, transaction.getDirtyObjects().size(),
-        Messages.getString("RollbackTransactionDialog.6"), Messages.getString("RollbackTransactionDialog.7")); //$NON-NLS-1$ //$NON-NLS-2$
-    append(builder, transaction.getDetachedObjects().size(),
-        Messages.getString("RollbackTransactionDialog.8"), Messages.getString("RollbackTransactionDialog.9")); //$NON-NLS-1$ //$NON-NLS-2$
+    append(builder, transaction.getNewObjects().size(), Messages.getString("RollbackTransactionDialog.4"), //$NON-NLS-1$
+        Messages.getString("RollbackTransactionDialog.5")); //$NON-NLS-1$
+    append(builder, transaction.getDirtyObjects().size(), Messages.getString("RollbackTransactionDialog.6"), //$NON-NLS-1$
+        Messages.getString("RollbackTransactionDialog.7")); //$NON-NLS-1$
+    append(builder, transaction.getDetachedObjects().size(), Messages.getString("RollbackTransactionDialog.8"), //$NON-NLS-1$
+        Messages.getString("RollbackTransactionDialog.9")); //$NON-NLS-1$
 
     builder.append("\n\n"); //$NON-NLS-1$
     builder.append(Messages.getString("RollbackTransactionDialog.11")); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
index 0c74e4612d..35fed30e7f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
@@ -4,7 +4,7 @@
  * 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
  *    Victor Roldan Betancort - maintenance
@@ -54,7 +54,8 @@ public class SelectPackageDialog extends BaseDialog<CheckboxTableViewer>
 
   public SelectPackageDialog(Shell shell, String title, String message, Set<String> excludedURIs)
   {
-    super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, title, message, OM.Activator.INSTANCE.getDialogSettings());
+    super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, title, message,
+        OM.Activator.INSTANCE.getDialogSettings());
     this.excludedURIs = excludedURIs;
   }
 
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 c0f1b11584..5164423573 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
@@ -163,7 +163,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
   /**
    * This is the menu manager into which menu contribution items should be added for CreateChild actions. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IMenuManager createChildMenuManager;
@@ -179,14 +179,14 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
   /**
    * This is the menu manager into which menu contribution items should be added for CreateSibling actions. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IMenuManager createSiblingMenuManager;
 
   /**
    * This creates an instance of the contributor. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public CDOActionBarContributor()
@@ -264,7 +264,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
   /**
    * When the active editor changes, this remembers the change and registers with it as a selection provider. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -430,7 +430,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in
    * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection)
@@ -450,7 +450,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in
    * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection)
@@ -497,7 +497,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
    * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> 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 f948d06d7f..aee38dbee4 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
@@ -179,8 +179,8 @@ import java.util.Map;
  * @author Eike Stepper
  * @generated
  */
-public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
-    IMenuListener, IViewerProvider
+public class CDOEditor extends MultiPageEditorPart
+    implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider
 {
   /**
    * The filters for file extensions supported by the editor.
@@ -1101,16 +1101,16 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
   {
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
-      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, getString(
-          "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource
-          : exception });
+      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()),
+          new Object[] { exception == null ? (Object)resource : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
     else if (exception != null)
     {
-      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, getString(
-          "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
+      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0,
+          getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
     }
     else
     {
@@ -2098,8 +2098,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
    */
   public void setStatusLineManager(ISelection selection)
   {
-    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager
-        : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+        ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
     if (statusLineManager != null)
     {
@@ -2184,8 +2184,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
         if (!features.isEmpty())
         {
           final IWorkbenchPage page = getSite().getPage();
-          menuManager.insertBefore(
-              "edit", new LongRunningAction(page, Messages.getString("CDOEditor.26") + SafeAction.INTERACTIVE) //$NON-NLS-1$ //$NON-NLS-2$
+          menuManager.insertBefore("edit", //$NON-NLS-1$
+              new LongRunningAction(page, Messages.getString("CDOEditor.26") + SafeAction.INTERACTIVE) //$NON-NLS-1$
               {
                 protected EReference feature;
 
@@ -2599,8 +2599,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
       final MenuManager submenuManager = new MenuManager(nsURI, imageDescriptor, nsURI);
       submenuManager.setRemoveAllWhenShown(true);
       submenuManager.add(new Action(Messages.getString("CDOEditor.27")) //$NON-NLS-1$
-          {
-          });
+      {
+      });
 
       submenuManager.addMenuListener(new IMenuListener()
       {
@@ -2669,8 +2669,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
 
     protected CreateRootAction(EObject object)
     {
-      super(getEditorSite().getPage(), object.eClass().getName(), ExtendedImageRegistry.getInstance()
-          .getImageDescriptor(getLabelImage(adapterFactory, object)));
+      super(getEditorSite().getPage(), object.eClass().getName(),
+          ExtendedImageRegistry.getInstance().getImageDescriptor(getLabelImage(adapterFactory, object)));
       this.object = object;
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java
index f5b76663c6..bda7fd45bf 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java
@@ -429,8 +429,8 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
      */
     public void run(IAction action)
     {
-      LoadResourceAction.LoadResourceDialog loadResourceDialog = new LoadResourceAction.LoadResourceDialog(getWindow()
-          .getShell());
+      LoadResourceAction.LoadResourceDialog loadResourceDialog = new LoadResourceAction.LoadResourceDialog(
+          getWindow().getShell());
       if (Window.OK == loadResourceDialog.open())
       {
         for (URI uri : loadResourceDialog.getURIs())
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java
index 15ad3d00c7..dc645b9e32 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java
index fb8e1b2fbf..c1975c1560 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java
@@ -29,12 +29,12 @@ import java.util.WeakHashMap;
 public class Net
 {
   private static final RGB[] RGBS = new RGB[] { new RGB(133, 166, 214), new RGB(221, 205, 93), new RGB(199, 134, 57),
-      new RGB(131, 150, 98), new RGB(197, 123, 127), new RGB(139, 136, 140), new RGB(48, 135, 144),
-      new RGB(190, 93, 66), new RGB(143, 163, 54), new RGB(180, 148, 74), new RGB(101, 101, 217),
-      new RGB(72, 153, 119), new RGB(23, 101, 160), new RGB(132, 164, 118), new RGB(255, 230, 59),
-      new RGB(136, 176, 70), new RGB(255, 138, 1), new RGB(123, 187, 95), new RGB(233, 88, 98), new RGB(93, 158, 254),
-      new RGB(175, 215, 0), new RGB(140, 134, 142), new RGB(232, 168, 21), new RGB(0, 172, 191), new RGB(251, 58, 4),
-      new RGB(63, 64, 255), new RGB(27, 194, 130), new RGB(0, 104, 183) };
+    new RGB(131, 150, 98), new RGB(197, 123, 127), new RGB(139, 136, 140), new RGB(48, 135, 144),
+    new RGB(190, 93, 66), new RGB(143, 163, 54), new RGB(180, 148, 74), new RGB(101, 101, 217), new RGB(72, 153, 119),
+      new RGB(23, 101, 160), new RGB(132, 164, 118), new RGB(255, 230, 59), new RGB(136, 176, 70), new RGB(255, 138, 1),
+      new RGB(123, 187, 95), new RGB(233, 88, 98), new RGB(93, 158, 254), new RGB(175, 215, 0), new RGB(140, 134, 142),
+      new RGB(232, 168, 21), new RGB(0, 172, 191), new RGB(251, 58, 4), new RGB(63, 64, 255), new RGB(27, 194, 130),
+      new RGB(0, 104, 183) };
 
   private static final Segment[] NO_SEGMENTS = {};
 
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/Messages.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/Messages.java
index 9b00a51456..2b95832ba1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/Messages.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
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 8ac97d14e2..ecff261cf3 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
@@ -101,12 +101,12 @@ public class CDOPreferencePage extends OMPreferencePage
     repositoryName.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REPOSITORY_NAME.getValue());
     userName.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_USER_NAME.getValue());
     connectorDescription.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_CONNECTOR_DESCRIPTION.getValue());
-    referenceChunkSize.setValue(String
-        .valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE.getValue()));
-    preloadChunkSize.setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE
-        .getValue()));
-    invalidationNotifications.setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION
-        .getValue());
+    referenceChunkSize
+        .setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE.getValue()));
+    preloadChunkSize
+        .setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE.getValue()));
+    invalidationNotifications
+        .setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION.getValue());
   }
 
   @Override
@@ -116,12 +116,12 @@ public class CDOPreferencePage extends OMPreferencePage
     org.eclipse.emf.internal.cdo.bundle.OM.PREF_REPOSITORY_NAME.setValue(repositoryName.getText());
     org.eclipse.emf.internal.cdo.bundle.OM.PREF_USER_NAME.setValue(userName.getText());
     org.eclipse.emf.internal.cdo.bundle.OM.PREF_CONNECTOR_DESCRIPTION.setValue(connectorDescription.getText());
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE.setValue(Integer
-        .parseInt(referenceChunkSize.getValue()));
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE.setValue(Integer.parseInt(preloadChunkSize
-        .getValue()));
-    org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION.setValue(invalidationNotifications
-        .getSelection());
+    org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE
+        .setValue(Integer.parseInt(referenceChunkSize.getValue()));
+    org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE
+        .setValue(Integer.parseInt(preloadChunkSize.getValue()));
+    org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION
+        .setValue(invalidationNotifications.getSelection());
     return super.performOk();
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java
index 897e414ee7..d6c4d4289b 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java
@@ -159,8 +159,8 @@ public class CDORemoteSessionsView extends ContainerView.Default<CDORemoteSessio
       CDORemoteSession remoteSession = (CDORemoteSession)element;
       if (remoteSession.isSubscribed())
       {
-        InputDialog dlg = new InputDialog(getShell(), MessageFormat.format(
-            Messages.getString("CDORemoteSessionsView_1"), remoteSession), //$NON-NLS-1$
+        InputDialog dlg = new InputDialog(getShell(),
+            MessageFormat.format(Messages.getString("CDORemoteSessionsView_1"), remoteSession), //$NON-NLS-1$
             Messages.getString("CDORemoteSessionsView_2"), "", null); //$NON-NLS-1$ //$NON-NLS-2$
         if (dlg.open() == InputDialog.OK)
         {
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
index f8183d5bf9..fe88701d6d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
@@ -94,8 +94,9 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class CDOWatchListView extends ViewPart implements ISelectionProvider
 {
-  private static final String[] columnNames = {
-      Messages.getString("CDOWatchListView.0"), Messages.getString("CDOWatchListView.1"), Messages.getString("CDOWatchListView.2"), Messages.getString("CDOWatchListView.3") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+  private static final String[] columnNames = { Messages.getString("CDOWatchListView.0"), //$NON-NLS-1$
+      Messages.getString("CDOWatchListView.1"), Messages.getString("CDOWatchListView.2"), //$NON-NLS-1$ //$NON-NLS-2$
+      Messages.getString("CDOWatchListView.3") }; //$NON-NLS-1$
 
   private static final int[] columnWidths = { 110, 280, 170, 230 };
 
@@ -181,15 +182,15 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
     resetNotificationAction = new ResetNotificationAction();
     resetNotificationAction.setText(Messages.getString("CDOWatchListView.8")); //$NON-NLS-1$
     resetNotificationAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
-    resetNotificationAction.setDisabledImageDescriptor(platformImages
-        .getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
+    resetNotificationAction
+        .setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
     resetNotificationAction.setToolTipText(Messages.getString("CDOWatchListView.9")); //$NON-NLS-1$
 
     resetAllNotificationAction = new ResetAllNotificationAction();
     resetAllNotificationAction.setText(Messages.getString("CDOWatchListView.10")); //$NON-NLS-1$
     resetAllNotificationAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
-    resetAllNotificationAction.setDisabledImageDescriptor(platformImages
-        .getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
+    resetAllNotificationAction
+        .setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
     resetAllNotificationAction.setToolTipText(Messages.getString("CDOWatchListView.11")); //$NON-NLS-1$
   }
 
@@ -398,7 +399,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
   /**
    * @author Victor Roldan Betancort
    */
-  private final class CDOObjectContainer extends Container<CDOObject> implements IContainer.Modifiable<CDOObject>
+  private final class CDOObjectContainer extends Container<CDOObject>implements IContainer.Modifiable<CDOObject>
   {
     private Set<CDOObject> watchedObjects = new HashSet<CDOObject>();
 
@@ -762,13 +763,16 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
   /**
    * @author Victor Roldan Betancort
    */
-  private final class CDOSubscriptionViewLabelProvider extends LabelProvider implements ITableLabelProvider,
-      IColorProvider
+  private final class CDOSubscriptionViewLabelProvider extends LabelProvider
+      implements ITableLabelProvider, IColorProvider
   {
     private final Color YELLOW = UIUtil.getDisplay().getSystemColor(SWT.COLOR_YELLOW);
 
-    private final String[] eventTypes = {
-        Messages.getString("CDOWatchListView.12"), Messages.getString("CDOWatchListView.25"), Messages.getString("CDOWatchListView.26"), Messages.getString("CDOWatchListView.27"), Messages.getString("CDOWatchListView.28"), Messages.getString("CDOWatchListView.29"), Messages.getString("CDOWatchListView.30"), Messages.getString("CDOWatchListView.31"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    private final String[] eventTypes = { Messages.getString("CDOWatchListView.12"), //$NON-NLS-1$
+        Messages.getString("CDOWatchListView.25"), Messages.getString("CDOWatchListView.26"), //$NON-NLS-1$ //$NON-NLS-2$
+        Messages.getString("CDOWatchListView.27"), Messages.getString("CDOWatchListView.28"), //$NON-NLS-1$ //$NON-NLS-2$
+        Messages.getString("CDOWatchListView.29"), Messages.getString("CDOWatchListView.30"), //$NON-NLS-1$ //$NON-NLS-2$
+        Messages.getString("CDOWatchListView.31"), //$NON-NLS-1$
         Messages.getString("CDOWatchListView.32"), Messages.getString("CDOWatchListView.33") }; //$NON-NLS-1$ //$NON-NLS-2$
 
     private AdapterFactory adapterFactory;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorInput.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorInput.java
index 2828d4b680..3d100f7852 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorInput.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorInput.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
@@ -22,7 +22,7 @@ import org.eclipse.ui.IEditorInput;
  * <p>
  * For related operations, see
  * {@link org.eclipse.emf.cdo.ui.CDOEditorUtil#createCDOEditorInput(CDOView, String, boolean) CDOEditorUtil}
- * 
+ *
  * @author Victor Roldan Betancort
  * @since 2.0
  * @see org.eclipse.ui.IEditorInput
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java
index 0c89c0a17b..dda01f7bb7 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java
@@ -152,9 +152,10 @@ public class CDOInteractiveExceptionHandler implements CDOSession.ExceptionHandl
     {
       getShell().setText(TITLE);
 
-      String attemptsStr = attempt == 1 ? Messages.getString("CDOInteractiveExceptionHandler.1") : Messages.getString("CDOInteractiveExceptionHandler.2"); //$NON-NLS-1$ //$NON-NLS-2$
-      setTitle(MessageFormat.format(
-          Messages.getString("CDOInteractiveExceptionHandler.3"), session, attempt, attemptsStr));//$NON-NLS-1$
+      String attemptsStr = attempt == 1 ? Messages.getString("CDOInteractiveExceptionHandler.1") //$NON-NLS-1$
+          : Messages.getString("CDOInteractiveExceptionHandler.2"); //$NON-NLS-1$
+      setTitle(
+          MessageFormat.format(Messages.getString("CDOInteractiveExceptionHandler.3"), session, attempt, attemptsStr));//$NON-NLS-1$
       setTitleImage(SharedIcons.getImage(SharedIcons.WIZBAN_PROTOCOL_PROBLEM));
 
       GridLayout layout = UIUtil.createGridLayout(1);
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 4b7f49b780..4895656745 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
@@ -668,8 +668,8 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
             NewTopLevelResourceNodeAction.Type.FOLDER));
         manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource,
             NewTopLevelResourceNodeAction.Type.MODEL));
-        manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource,
-            NewTopLevelResourceNodeAction.Type.TEXT));
+        manager.add(
+            new NewTopLevelResourceNodeAction(this, page, view, rootResource, NewTopLevelResourceNodeAction.Type.TEXT));
         manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource,
             NewTopLevelResourceNodeAction.Type.BINARY));
       }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
index 9d5d737cc7..78cab685e4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java
@@ -55,8 +55,8 @@ public class CDOLabelDecorator implements ILabelDecorator
 
   public static final String NO_DECORATION = DECORATION_PROPOSALS[0];
 
-  private static final String[] DECORATION_ARGS = {
-      "{0}", "{1}", "{2}", "{3,date} {3,time,HH:mm:ss:SSS}", "{4,date} {4,time,HH:mm:ss:SSS}" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+  private static final String[] DECORATION_ARGS = { "{0}", "{1}", "{2}", "{3,date} {3,time,HH:mm:ss:SSS}", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+      "{4,date} {4,time,HH:mm:ss:SSS}" }; //$NON-NLS-1$
 
   public static final String DECORATOR_ID = "org.eclipse.emf.cdo.ui.CDOLabelDecorator"; //$NON-NLS-1$
 
@@ -213,7 +213,7 @@ public class CDOLabelDecorator implements ILabelDecorator
         }
       }
     }
-  
+
     // Use default
     return image;
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java
index 837b55dc09..39c68bfb55 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Reusable UI components specific to the CDO Model Repository.
  */
 package org.eclipse.emf.cdo.ui;
-
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/AuditScale.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/AuditScale.java
index ab504118b6..4843fcde8e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/AuditScale.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/AuditScale.java
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Shell;
 /**
  * UI Widget representing all the historical revisions available for a
  * {@link org.eclipse.emf.cdo.common.branch.CDOBranch branch}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java
index bf4f7dee62..d210d8d21a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java
@@ -222,8 +222,9 @@ public class SelectTimeStampComposite extends Composite implements ValidationPar
     else
     {
       selectRadio(timeRadio);
-      String text = CDOCommonUtil.formatTimeStamp(timeStamp == CDOBranchPoint.INVALID_DATE
-          || timeStamp == CDOBranchPoint.UNSPECIFIED_DATE ? System.currentTimeMillis() : timeStamp);
+      String text = CDOCommonUtil
+          .formatTimeStamp(timeStamp == CDOBranchPoint.INVALID_DATE || timeStamp == CDOBranchPoint.UNSPECIFIED_DATE
+              ? System.currentTimeMillis() : timeStamp);
       if (!timeText.getText().equals(text))
       {
         timeText.setText(text);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java
index 63e4aea619..ad5a7d7817 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * A library with reusable widgets.
  */
 package org.eclipse.emf.cdo.ui.widgets;
-
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
index fe5ec14d73..a34f9209d7 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
@@ -740,8 +740,8 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace
 
       SyntheticCDORevision[] synthetics = { null };
       InternalCDORevisionManager revisionManager = localSession.getRevisionManager();
-      revisionManager
-          .getRevision(id, localSessionHead, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true, synthetics);
+      revisionManager.getRevision(id, localSessionHead, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true,
+          synthetics);
 
       int max = synthetics[0].getVersion();
       EClass eClass = synthetics[0].getEClass();
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/bundle/OM.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/bundle/OM.java
index 4d73344564..a3d3adcc3e 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/bundle/OM.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/spi/workspace/package-info.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/spi/workspace/package-info.java
index f0691e2f58..a4f91c042c 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/spi/workspace/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/spi/workspace/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Server provider interfaces (SPI) for CDO {@link org.eclipse.emf.cdo.workspace.CDOWorkspace workspaces}.
  */
 package org.eclipse.emf.cdo.spi.workspace;
-
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceBase.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceBase.java
index fc86ae21d7..81625940b2 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceBase.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceBase.java
@@ -20,7 +20,7 @@ import java.util.Set;
  * {@link CDOWorkspaceConfiguration#checkout() checkout} operation or any subsequent
  * {@link CDOWorkspace#update(org.eclipse.emf.cdo.transaction.CDOMerger) update} and
  * {@link CDOWorkspace#replace(String, long) replace} operations.
- * 
+ *
  * @author Eike Stepper
  */
 public interface CDOWorkspaceBase extends CDORevisionProvider
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.java
index 404fab9966..22388ac18c 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/CDOWorkspaceUtil.java
@@ -31,7 +31,7 @@ import java.util.Set;
 
 /**
  * Various static helper methods for dealing with {@link CDOWorkspace workspaces}.
- * 
+ *
  * @author Eike Stepper
  */
 public final class CDOWorkspaceUtil
@@ -112,7 +112,7 @@ public final class CDOWorkspaceUtil
 
   /**
    * Returns a new configuration that can be used to checkout a new {@link CDOWorkspace} or open an existing one.
-   * 
+   *
    * @since 4.1
    */
   public static CDOWorkspaceConfiguration createWorkspaceConfiguration()
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/package-info.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/package-info.java
index 1bd84a4a42..0b852f804c 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/workspace/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2012 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) 2012 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
  */
 
 /**
  * Concepts to checkout, open and further operate CDO {@link org.eclipse.emf.cdo.workspace.CDOWorkspace workspaces}.
  */
 package org.eclipse.emf.cdo.workspace;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java
index 4c517fafea..fc976056a9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java
@@ -32,7 +32,7 @@ import java.io.InputStream;
  *
  * @generated
  */
-public class CDOBinaryResourceImpl extends CDOFileResourceImpl<InputStream> implements CDOBinaryResource
+public class CDOBinaryResourceImpl extends CDOFileResourceImpl<InputStream>implements CDOBinaryResource
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
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 501c5f125c..187db1f85f 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
@@ -662,8 +662,8 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
       @Override
       public Iterator<EObject> getChildren(Object object)
       {
-        return object == CDOResourceImpl.this ? CDOResourceImpl.this.getContents().iterator() : ((EObject)object)
-            .eContents().iterator();
+        return object == CDOResourceImpl.this ? CDOResourceImpl.this.getContents().iterator()
+            : ((EObject)object).eContents().iterator();
       }
     };
   }
@@ -888,8 +888,8 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
       @Override
       public Iterator<EObject> getChildren(Object object)
       {
-        return object == this.object ? ((List<EObject>)object).iterator() : new ProperContentIterator<EObject>(
-            (EObject)object);
+        return object == this.object ? ((List<EObject>)object).iterator()
+            : new ProperContentIterator<EObject>((EObject)object);
       }
     };
   }
@@ -1207,19 +1207,19 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
   public void save(Map<?, ?> options) throws IOException
   {
     CDOTransaction transaction = getTransaction(options);
-    IProgressMonitor progressMonitor = options != null ? (IProgressMonitor)options
-        .get(CDOResource.OPTION_SAVE_PROGRESS_MONITOR) : null;
+    IProgressMonitor progressMonitor = options != null
+        ? (IProgressMonitor)options.get(CDOResource.OPTION_SAVE_PROGRESS_MONITOR) : null;
 
-    try
-    {
-      transaction.commit(progressMonitor);
-    }
-    catch (CommitException ex)
-    {
-      throw new TransactionException(ex);
-    }
+        try
+        {
+          transaction.commit(progressMonitor);
+        }
+        catch (CommitException ex)
+        {
+          throw new TransactionException(ex);
+        }
 
-    setModified(false);
+        setModified(false);
   }
 
   /**
@@ -1227,23 +1227,23 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
    */
   private CDOTransaction getTransaction(Map<?, ?> options)
   {
-    CDOTransaction transaction = options != null ? (CDOTransaction)options
-        .get(CDOResource.OPTION_SAVE_OVERRIDE_TRANSACTION) : null;
+    CDOTransaction transaction = options != null
+        ? (CDOTransaction)options.get(CDOResource.OPTION_SAVE_OVERRIDE_TRANSACTION) : null;
 
-    if (transaction == null)
-    {
-      CDOView view = cdoView();
-      if (view instanceof CDOTransaction)
-      {
-        transaction = (CDOTransaction)view;
-      }
-      else
-      {
-        throw new IllegalStateException("No transaction available");
-      }
-    }
+        if (transaction == null)
+        {
+          CDOView view = cdoView();
+          if (view instanceof CDOTransaction)
+          {
+            transaction = (CDOTransaction)view;
+          }
+          else
+          {
+            throw new IllegalStateException("No transaction available");
+          }
+        }
 
-    return transaction;
+        return transaction;
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java
index 69be3d6010..4f68481445 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java
@@ -33,7 +33,7 @@ import java.io.Reader;
  *
  * @generated
  */
-public class CDOTextResourceImpl extends CDOFileResourceImpl<Reader> implements CDOTextResource
+public class CDOTextResourceImpl extends CDOFileResourceImpl<Reader>implements CDOTextResource
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
index 031ae05906..433700df02 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
@@ -145,8 +145,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     }
 
     // Obtain or create and register package
-    EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new EresourcePackageImpl());
+    EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new EresourcePackageImpl());
 
     isInited = true;
 
@@ -541,32 +542,24 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     cdoTextResourceEClass.getEGenericSuperTypes().add(g1);
 
     // Initialize classes and features; add operations and parameters
-    initEClass(cdoResourceNodeEClass, CDOResourceNode.class,
-        "CDOResourceNode", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getCDOResourceNode_Folder(),
-        getCDOResourceFolder(),
-        getCDOResourceFolder_Nodes(),
-        "folder", null, 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getCDOResourceNode_Name(),
-        ecorePackage.getEString(),
-        "name", null, 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getCDOResourceNode_Path(),
-        ecorePackage.getEString(),
-        "path", null, 0, 1, CDOResourceNode.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(cdoResourceFolderEClass, CDOResourceFolder.class,
-        "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getCDOResourceFolder_Nodes(),
-        getCDOResourceNode(),
-        getCDOResourceNode_Folder(),
-        "nodes", null, 0, -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    EOperation op = addEOperation(cdoResourceFolderEClass, getCDOResourceFolder(),
-        "addResourceFolder", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+    initEClass(cdoResourceNodeEClass, CDOResourceNode.class, "CDOResourceNode", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCDOResourceNode_Folder(), getCDOResourceFolder(), getCDOResourceFolder_Nodes(), "folder", null, 0, //$NON-NLS-1$
+        1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResourceNode_Name(), ecorePackage.getEString(), "name", null, 0, 1, CDOResourceNode.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResourceNode_Path(), ecorePackage.getEString(), "path", null, 0, 1, CDOResourceNode.class, //$NON-NLS-1$
+        IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+    initEClass(cdoResourceFolderEClass, CDOResourceFolder.class, "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCDOResourceFolder_Nodes(), getCDOResourceNode(), getCDOResourceNode_Folder(), "nodes", null, 0, //$NON-NLS-1$
+        -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    EOperation op = addEOperation(cdoResourceFolderEClass, getCDOResourceFolder(), "addResourceFolder", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+        IS_ORDERED);
     addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
     op = addEOperation(cdoResourceFolderEClass, getCDOResource(), "addResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
@@ -575,55 +568,38 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     op = addEOperation(cdoResourceFolderEClass, getCDOTextResource(), "addTextResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
     addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(cdoResourceFolderEClass, getCDOBinaryResource(),
-        "addBinaryResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+    op = addEOperation(cdoResourceFolderEClass, getCDOBinaryResource(), "addBinaryResource", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+        IS_ORDERED);
     addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(cdoResourceEClass, CDOResource.class,
-        "CDOResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-        getCDOResource_ResourceSet(),
-        getResourceSet(),
-        "resourceSet", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getCDOResource_URI(),
-        getURI(),
-        "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getCDOResource_Contents(),
-        ecorePackage.getEObject(),
-        null,
-        "contents", null, 0, -1, CDOResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getCDOResource_Modified(),
-        ecorePackage.getEBoolean(),
-        "modified", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getCDOResource_Loaded(),
-        ecorePackage.getEBoolean(),
-        "loaded", "true", 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-    initEAttribute(
-        getCDOResource_TrackingModification(),
-        ecorePackage.getEBoolean(),
-        "trackingModification", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getCDOResource_Errors(),
-        getDiagnostic(),
-        "errors", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getCDOResource_Warnings(),
-        getDiagnostic(),
-        "warnings", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getCDOResource_TimeStamp(),
-        ecorePackage.getELong(),
-        "timeStamp", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(cdoResourceLeafEClass, CDOResourceLeaf.class,
-        "CDOResourceLeaf", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(cdoFileResourceEClass, CDOFileResource.class,
-        "CDOFileResource", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEClass(cdoResourceEClass, CDOResource.class, "CDOResource", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getCDOResource_ResourceSet(), getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class, //$NON-NLS-1$
+        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResource_URI(), getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, //$NON-NLS-1$
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEReference(getCDOResource_Contents(), ecorePackage.getEObject(), null, "contents", null, 0, -1, //$NON-NLS-1$
+        CDOResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResource_Modified(), ecorePackage.getEBoolean(), "modified", null, 0, 1, CDOResource.class, //$NON-NLS-1$
+        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResource_Loaded(), ecorePackage.getEBoolean(), "loaded", "true", 0, 1, CDOResource.class, //$NON-NLS-1$ //$NON-NLS-2$
+        IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResource_TrackingModification(), ecorePackage.getEBoolean(), "trackingModification", null, 0, //$NON-NLS-1$
+        1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEAttribute(getCDOResource_Errors(), getDiagnostic(), "errors", null, 0, -1, CDOResource.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResource_Warnings(), getDiagnostic(), "warnings", null, 0, -1, CDOResource.class, IS_TRANSIENT, //$NON-NLS-1$
+        IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOResource_TimeStamp(), ecorePackage.getELong(), "timeStamp", null, 0, 1, CDOResource.class, //$NON-NLS-1$
+        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(cdoResourceLeafEClass, CDOResourceLeaf.class, "CDOResourceLeaf", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(cdoFileResourceEClass, CDOFileResource.class, "CDOFileResource", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
 
     op = addEOperation(cdoFileResourceEClass, null, "getContents", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
     g1 = createEGenericType(theEtypesPackage.getLob());
@@ -631,31 +607,28 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     g1.getETypeArguments().add(g2);
     initEOperation(op, g1);
 
-    initEClass(cdoBinaryResourceEClass, CDOBinaryResource.class,
-        "CDOBinaryResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-        getCDOBinaryResource_Contents(),
-        theEtypesPackage.getBlob(),
-        "contents", null, 1, 1, CDOBinaryResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(cdoTextResourceEClass, CDOTextResource.class,
-        "CDOTextResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-        getCDOTextResource_Contents(),
-        theEtypesPackage.getClob(),
-        "contents", null, 1, 1, CDOTextResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-        getCDOTextResource_Encoding(),
-        ecorePackage.getEString(),
-        "encoding", null, 0, 1, CDOTextResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+    initEClass(cdoBinaryResourceEClass, CDOBinaryResource.class, "CDOBinaryResource", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getCDOBinaryResource_Contents(), theEtypesPackage.getBlob(), "contents", null, 1, 1, //$NON-NLS-1$
+        CDOBinaryResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+
+    initEClass(cdoTextResourceEClass, CDOTextResource.class, "CDOTextResource", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getCDOTextResource_Contents(), theEtypesPackage.getClob(), "contents", null, 1, 1, //$NON-NLS-1$
+        CDOTextResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOTextResource_Encoding(), ecorePackage.getEString(), "encoding", null, 0, 1, //$NON-NLS-1$
+        CDOTextResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     // Initialize data types
-    initEDataType(resourceSetEDataType, ResourceSet.class,
-        "ResourceSet", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEDataType(uriEDataType, org.eclipse.emf.common.util.URI.class,
-        "URI", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEDataType(diagnosticEDataType, Resource.Diagnostic.class,
-        "Diagnostic", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEDataType(resourceSetEDataType, ResourceSet.class, "ResourceSet", !IS_SERIALIZABLE, //$NON-NLS-1$
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEDataType(uriEDataType, org.eclipse.emf.common.util.URI.class, "URI", IS_SERIALIZABLE, //$NON-NLS-1$
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEDataType(diagnosticEDataType, Resource.Diagnostic.class, "Diagnostic", !IS_SERIALIZABLE, //$NON-NLS-1$
+        !IS_GENERATED_INSTANCE_CLASS);
 
     // Create resource
     createResource(eNS_URI);
@@ -678,7 +651,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
   {
     String source = "http://www.eclipse.org/CDO/DBStore"; //$NON-NLS-1$
     addAnnotation(getCDOResourceNode_Name(), source, new String[] { "columnType", "VARCHAR", //$NON-NLS-1$ //$NON-NLS-2$
-        "columnLength", "255" //$NON-NLS-1$ //$NON-NLS-2$
+      "columnLength", "255" //$NON-NLS-1$ //$NON-NLS-2$
     });
   }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/package-info.java
index 4c800e8d08..57d66ca66d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/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.impl;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/package-info.java
index 5bc3644f80..219f337c08 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/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
  */
 
 /**
@@ -16,4 +12,3 @@
  * @apiviz.exclude .*\.EresourceFactory.*
  */
 package org.eclipse.emf.cdo.eresource;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/package-info.java
index b77b24eab1..f43bc07320 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/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
  */
 
 /**
  * The generated EMF utilities of the CDO repository file system.
  */
 package org.eclipse.emf.cdo.eresource.util;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/package-info.java
index 11c96685e0..dc4c57b499 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/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 @@
  * @deprecated
  */
 package org.eclipse.emf.cdo.eresource.validation;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
index 6c36787f0c..4a7898da2f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
@@ -126,8 +126,8 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
     }
 
     // Obtain or create and register package
-    EtypesPackageImpl theEtypesPackage = (EtypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EtypesPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new EtypesPackageImpl());
+    EtypesPackageImpl theEtypesPackage = (EtypesPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof EtypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EtypesPackageImpl());
 
     isInited = true;
 
@@ -350,50 +350,38 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
     annotationEClass.getESuperTypes().add(getModelElement());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(modelElementEClass, ModelElement.class,
-        "ModelElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-        getModelElement_Annotations(),
-        getAnnotation(),
-        getAnnotation_ModelElement(),
-        "annotations", null, 0, -1, ModelElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+    initEClass(modelElementEClass, ModelElement.class, "ModelElement", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getModelElement_Annotations(), getAnnotation(), getAnnotation_ModelElement(), "annotations", null, 0, //$NON-NLS-1$
+        -1, ModelElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     EOperation op = addEOperation(modelElementEClass, getAnnotation(), "getAnnotation", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
     addEParameter(op, ecorePackage.getEString(), "source", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(annotationEClass, Annotation.class,
-        "Annotation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-        getAnnotation_Source(),
-        ecorePackage.getEString(),
-        "source", null, 0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getAnnotation_Details(),
-        ecorePackage.getEStringToStringMapEntry(),
-        null,
-        "details", null, 0, -1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getAnnotation_ModelElement(),
-        getModelElement(),
-        getModelElement_Annotations(),
-        "modelElement", null, 0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getAnnotation_Contents(),
-        ecorePackage.getEObject(),
-        null,
-        "contents", null, 0, -1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-        getAnnotation_References(),
-        ecorePackage.getEObject(),
-        null,
-        "references", null, 0, -1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+    initEClass(annotationEClass, Annotation.class, "Annotation", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+        IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getAnnotation_Source(), ecorePackage.getEString(), "source", null, 0, 1, Annotation.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAnnotation_Details(), ecorePackage.getEStringToStringMapEntry(), null, "details", null, 0, -1, //$NON-NLS-1$
+        Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAnnotation_ModelElement(), getModelElement(), getModelElement_Annotations(), "modelElement", null, //$NON-NLS-1$
+        0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAnnotation_Contents(), ecorePackage.getEObject(), null, "contents", null, 0, -1, Annotation.class, //$NON-NLS-1$
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getAnnotation_References(), ecorePackage.getEObject(), null, "references", null, 0, -1, //$NON-NLS-1$
+        Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize data types
     initEDataType(blobEDataType, CDOBlob.class, "Blob", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEDataType(clobEDataType, CDOClob.class, "Clob", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEDataType(lobEDataType, CDOLob.class, "Lob", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEDataType(inputStreamEDataType, InputStream.class,
-        "InputStream", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEDataType(inputStreamEDataType, InputStream.class, "InputStream", !IS_SERIALIZABLE, //$NON-NLS-1$
+        !IS_GENERATED_INSTANCE_CLASS);
     initEDataType(readerEDataType, Reader.class, "Reader", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     // Create resource
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/package-info.java
index 846bad9922..9067ce63e9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/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.impl;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/package-info.java
index 99fd6beb2e..6b8f5a4fa9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/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 .*\.EtypesPackage.*
  */
 package org.eclipse.emf.cdo.etypes;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/package-info.java
index db76967dfa..06f09e5783 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/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
  */
 
 /**
  * The generated EMF utilities of the CDO system data types and native annotations.
  */
 package org.eclipse.emf.cdo.etypes.util;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/package-info.java
index a74797a012..dd1f956be4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/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 .*\.CDOWithID
  */
 package org.eclipse.emf.cdo;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
index c4fd259014..9643e938c4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
@@ -89,8 +89,8 @@ import org.eclipse.emf.spi.cdo.CDOSessionProtocol.RefreshSessionResult;
  * @apiviz.exclude .*\.CDOTransactionContainer
  * @apiviz.exclude .*\.CDOUpdatable
  */
-public interface CDOSession extends CDOCommonSession, CDOUpdatable, CDOTransactionContainer,
-    IPasswordCredentialsProvider.Provider
+public interface CDOSession
+    extends CDOCommonSession, CDOUpdatable, CDOTransactionContainer, IPasswordCredentialsProvider.Provider
 {
   /**
    * Returns an instance of {@link CDORepositoryInfo} that describes the model repository this {@link CDOSession
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/package-info.java
index 0619f35b38..9405003745 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/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
  */
 
 /**
@@ -22,4 +18,3 @@
  * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.session;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/package-info.java
index ee8deb0fc5..ea1fb7ca75 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/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
  */
 
 /**
  * Client concepts for the communication and collaboration with other sessions.
  */
 package org.eclipse.emf.cdo.session.remote;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
index 0e567b7d48..aa4ca3e623 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
@@ -45,11 +45,11 @@ public interface CDOUserTransaction
    * write robust transactions:
    * <pre>
     CDOTransaction transaction = null;
-
+  
     try
     {
       transaction = session.openTransaction();
-
+  
       for (;;)
       {
         try
@@ -57,9 +57,9 @@ public interface CDOUserTransaction
           synchronized (transaction)
           {
             CDOResource resource = transaction.getResource("/stock/resource1");
-
+  
             // Modify the model here...
-
+  
             transaction.commit();
             break;
           }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/package-info.java
index efb82d55c6..e77aa2130f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/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 .*Event
  */
 package org.eclipse.emf.cdo.transaction;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingReferenceException.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingReferenceException.java
index 8866ccb442..d04637b85a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingReferenceException.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingReferenceException.java
@@ -40,7 +40,8 @@ public class DanglingReferenceException extends CDOException
 
   public DanglingReferenceException(EObject object)
   {
-    super(MessageFormat.format(Messages.getString("DanglingReferenceException.0"), object, object.getClass().getName())); //$NON-NLS-1$
+    super(
+        MessageFormat.format(Messages.getString("DanglingReferenceException.0"), object, object.getClass().getName())); //$NON-NLS-1$
     target = object;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/package-info.java
index 20da1a3038..d9f01bedf4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/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
  */
 
 /**
  * Client utility classes, some common interfaces and exceptions.
  */
 package org.eclipse.emf.cdo.util;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
index 19311686e5..f6d3e7ec3c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
@@ -94,7 +94,7 @@ import java.util.Set;
  * @apiviz.uses {@link CDOViewTargetChangedEvent} - - fires
  */
 public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.Provider<CDOObject, CDOObjectHistory>,
-IContainer<CDOResourceNode>
+    IContainer<CDOResourceNode>
 {
   /**
    * Returns the {@link CDOSession session} this view was opened by.
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/package-info.java
index 5f40257906..94d1cf708e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/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
  */
 
 /**
@@ -22,4 +18,3 @@
  * @apiviz.exclude .*Event
  */
 package org.eclipse.emf.cdo.view;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index f2ca0f1d5a..bb63b4b1a8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -1619,7 +1619,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
    * @author Eike Stepper
    * @since 4.1
    */
-  private final class CDOStoreEcoreEMap extends EcoreEMap<Object, Object> implements InternalCDOLoadable
+  private final class CDOStoreEcoreEMap extends EcoreEMap<Object, Object>implements InternalCDOLoadable
   {
     private static final long serialVersionUID = 1L;
 
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 2e442e07ee..e20827910c 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
@@ -56,20 +56,20 @@ 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_COLLECTION_LOADING_CHUNK_SIZE = //
-  PREFS.init("PREF_COLLECTION_LOADING_CHUNK_SIZE", CDORevision.UNCHUNKED); //$NON-NLS-1$
+      PREFS.init("PREF_COLLECTION_LOADING_CHUNK_SIZE", CDORevision.UNCHUNKED); //$NON-NLS-1$
 
   public static final OMPreference<Boolean> PREF_ENABLE_INVALIDATION_NOTIFICATION = //
-  PREFS.init("PREF_ENABLE_INVALIDATION_NOTIFICATION", false); //$NON-NLS-1$
+      PREFS.init("PREF_ENABLE_INVALIDATION_NOTIFICATION", false); //$NON-NLS-1$
 
   public static final OMPreference<Integer> PREF_REVISION_LOADING_CHUNK_SIZE = //
-  PREFS.init("PREF_REVISION_LOADING_CHUNK_SIZE", CDOView.Options.NO_REVISION_PREFETCHING); //$NON-NLS-1$
+      PREFS.init("PREF_REVISION_LOADING_CHUNK_SIZE", CDOView.Options.NO_REVISION_PREFETCHING); //$NON-NLS-1$
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java
index f7f203c458..57658667c7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyAdapter.java
@@ -52,7 +52,7 @@ public class CDOLegacyAdapter extends CDOLegacyWrapper implements Adapter.Intern
 
     instance.eAdapters().add(this);
     ((org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList)instance.eAdapters())
-        .addListener(new AdapterListListener());
+    .addListener(new AdapterListListener());
   }
 
   public void setTarget(Notifier newTarget)
@@ -330,8 +330,8 @@ public class CDOLegacyAdapter extends CDOLegacyWrapper implements Adapter.Intern
    * @author Martin Fluegge
    * @since 3.0
    */
-  protected class AdapterListListener implements
-      org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList.Listener
+  protected class AdapterListListener
+      implements org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList.Listener
   {
     /**
      * @since 4.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java
index 513348c853..13dd33563a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/ObjectProperties.java
@@ -46,13 +46,13 @@ public class ObjectProperties extends Properties<EObject>
     super(EObject.class);
 
     add(new Property<EObject>("isCDO") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
         return getCDOObject(object) != null;
       }
-    });
+        });
 
     add(new Property<EObject>("id", //$NON-NLS-1$
         "ID", "The technical CDOID of this object.", CATEGORY_CDO)
@@ -131,7 +131,7 @@ public class ObjectProperties extends Properties<EObject>
     });
 
     add(new Property<EObject>("transactional") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -149,10 +149,10 @@ public class ObjectProperties extends Properties<EObject>
 
         return !view.isReadOnly();
       }
-    });
+        });
 
     add(new Property<EObject>("readable") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -164,10 +164,10 @@ public class ObjectProperties extends Properties<EObject>
 
         return cdoObject.cdoPermission() != CDOPermission.NONE;
       }
-    });
+        });
 
     add(new Property<EObject>("writable") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -185,10 +185,10 @@ public class ObjectProperties extends Properties<EObject>
 
         return !view.isReadOnly() && cdoObject.cdoPermission() == CDOPermission.WRITE;
       }
-    });
+        });
 
     add(new Property<EObject>("writableContainer") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -212,10 +212,10 @@ public class ObjectProperties extends Properties<EObject>
 
         return !view.isReadOnly() && cdoContainer.cdoPermission() == CDOPermission.WRITE;
       }
-    });
+        });
 
     add(new Property<EObject>("container") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -233,16 +233,16 @@ public class ObjectProperties extends Properties<EObject>
 
         return true;
       }
-    });
+        });
 
     add(new Property<EObject>("children") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
         return !object.eContents().isEmpty();
       }
-    });
+        });
 
     add(new Property<EObject>("permission", //$NON-NLS-1$
         "Permission", "The permission the current user has for this object.", CATEGORY_CDO)
@@ -261,7 +261,7 @@ public class ObjectProperties extends Properties<EObject>
     });
 
     add(new Property<EObject>("permissionContainer") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -289,7 +289,7 @@ public class ObjectProperties extends Properties<EObject>
 
         return cdoObject.cdoPermission();
       }
-    });
+        });
 
     add(new Property<EObject>("readLocks", //$NON-NLS-1$
         "Read Locks", "The owner of read locks on this object.", CATEGORY_CDO)
@@ -314,7 +314,7 @@ public class ObjectProperties extends Properties<EObject>
     });
 
     add(new Property<EObject>("readLocked")//$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -332,10 +332,10 @@ public class ObjectProperties extends Properties<EObject>
 
         return lock.isLocked();
       }
-    });
+        });
 
     add(new Property<EObject>("readLockedByOthers")//$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -353,7 +353,7 @@ public class ObjectProperties extends Properties<EObject>
 
         return lock.isLockedByOthers();
       }
-    });
+        });
 
     add(new Property<EObject>("writeLock", //$NON-NLS-1$
         "Write Lock", "The owner of a write lock on this object.", CATEGORY_CDO)
@@ -378,7 +378,7 @@ public class ObjectProperties extends Properties<EObject>
     });
 
     add(new Property<EObject>("writeLocked")//$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -396,10 +396,10 @@ public class ObjectProperties extends Properties<EObject>
 
         return lock.isLocked();
       }
-    });
+        });
 
     add(new Property<EObject>("writeLockedByOthers")//$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -417,7 +417,7 @@ public class ObjectProperties extends Properties<EObject>
 
         return lock.isLockedByOthers();
       }
-    });
+        });
 
     add(new Property<EObject>("writeOption", //$NON-NLS-1$
         "Write Option", "The owner of a write option on this object.", CATEGORY_CDO)
@@ -442,7 +442,7 @@ public class ObjectProperties extends Properties<EObject>
     });
 
     add(new Property<EObject>("writeOptioned")//$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -460,10 +460,10 @@ public class ObjectProperties extends Properties<EObject>
 
         return lock.isLocked();
       }
-    });
+        });
 
     add(new Property<EObject>("writeOptionedByOthers")//$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -481,10 +481,10 @@ public class ObjectProperties extends Properties<EObject>
 
         return lock.isLockedByOthers();
       }
-    });
+        });
 
     add(new Property<EObject>("viewHistorical") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -502,10 +502,10 @@ public class ObjectProperties extends Properties<EObject>
 
         return view.getTimeStamp() != CDOBranchPoint.UNSPECIFIED_DATE;
       }
-    });
+        });
 
     add(new Property<EObject>("uri", "URI", "The URI of this object.", CATEGORY_CDO) //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(EObject object)
       {
@@ -525,7 +525,7 @@ public class ObjectProperties extends Properties<EObject>
         String fragment = id != null ? id.toURIFragment() : resource.getURIFragment(cdoObject);
         return resource.getURI().appendFragment(fragment).toString();
       }
-    });
+        });
   }
 
   private static CDOObject getCDOObject(EObject object)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/package-info.java
index a0f2609bfe..2371280b1f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/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
  */
 
 /**
  * Exposes {@link org.eclipse.emf.internal.cdo.CDOObjectImpl} for extension in generated EMF models.
  */
 package org.eclipse.emf.internal.cdo;
-
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java
index 9665016da7..d4b0645a3b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryResultIteratorImpl.java
@@ -137,7 +137,7 @@ public class CDOQueryResultIteratorImpl<T> extends AbstractQueryIterator<T>
   /**
    * @author Simon McDuff
    */
-  private class QueryResultList extends AbstractList<T> implements EList<T>
+  private class QueryResultList extends AbstractList<T>implements EList<T>
   {
     private List<Object> objects;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
index 0c3d651c0f..37064ff63f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionFactory.java
@@ -45,7 +45,8 @@ public abstract class CDOSessionFactory extends Factory
       String query = uri.getQuery();
       if (StringUtil.isEmpty(query))
       {
-        throw new IllegalArgumentException(MessageFormat.format(Messages.getString("CDOSessionFactory.1"), description)); //$NON-NLS-1$
+        throw new IllegalArgumentException(
+            MessageFormat.format(Messages.getString("CDOSessionFactory.1"), description)); //$NON-NLS-1$
       }
 
       Map<String, String> parameters = CDOURIUtil.getParameters(query);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
index af9d9b06c0..7a360af0cd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
@@ -1611,8 +1611,8 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl impleme
     /**
      * @author Eike Stepper
      */
-    private final class GeneratedPackageEmulationEventImpl extends OptionsEvent implements
-        GeneratedPackageEmulationEvent
+    private final class GeneratedPackageEmulationEventImpl extends OptionsEvent
+        implements GeneratedPackageEmulationEvent
     {
       private static final long serialVersionUID = 1L;
 
@@ -1794,10 +1794,10 @@ public abstract class CDOSessionImpl extends CDOTransactionContainerImpl impleme
 
       if (DEBUG)
       {
-        IOUtil.OUT().println(
-            CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] " + commitInfo.getPreviousTimeStamp() % 10000
-                + " --> " + commitInfo.getTimeStamp() % 10000 + "    reorderQueue=" + reorderQueue
-                + "    unfinishedLocalCommits=" + unfinishedLocalCommits);
+        IOUtil.OUT()
+            .println(CDOSessionImpl.this + " [" + getLastUpdateTime() % 10000 + "] "
+                + commitInfo.getPreviousTimeStamp() % 10000 + " --> " + commitInfo.getTimeStamp() % 10000
+                + "    reorderQueue=" + reorderQueue + "    unfinishedLocalCommits=" + unfinishedLocalCommits);
       }
 
       scheduleInvalidations();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOViewContainerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOViewContainerImpl.java
index 4069a54d94..947e191958 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOViewContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOViewContainerImpl.java
@@ -40,7 +40,7 @@ import java.util.Set;
 /**
  * @author Eike Stepper
  */
-public abstract class CDOViewContainerImpl extends Container<CDOView> implements CDOViewContainer
+public abstract class CDOViewContainerImpl extends Container<CDOView>implements CDOViewContainer
 {
   private Set<InternalCDOView> views = new HashSet<InternalCDOView>();
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java
index 2c07ec6c78..21b9fc63f6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java
@@ -33,7 +33,7 @@ import java.util.Set;
 /**
  * @author Eike Stepper
  */
-public class SessionProperties extends Properties<CDOSession> implements CDOCommonRepository
+public class SessionProperties extends Properties<CDOSession>implements CDOCommonRepository
 {
   public static final IProperties<CDOSession> INSTANCE = new SessionProperties();
 
@@ -45,7 +45,7 @@ public class SessionProperties extends Properties<CDOSession> implements CDOComm
   {
     super(CDOSession.class);
 
-    add(new Property<CDOSession>("open", Messages.getString("SessionPropertyTester_34"),//
+    add(new Property<CDOSession>("open", Messages.getString("SessionPropertyTester_34"), //
         Messages.getString("SessionPropertyTester_35"), //$NON-NLS-1$
         CATEGORY_SESSION)
     {
@@ -56,7 +56,7 @@ public class SessionProperties extends Properties<CDOSession> implements CDOComm
       }
     });
 
-    add(new Property<CDOSession>("sessionID", Messages.getString("SessionPropertyTester_0"),//
+    add(new Property<CDOSession>("sessionID", Messages.getString("SessionPropertyTester_0"), //
         Messages.getString("SessionPropertyTester_3"), //$NON-NLS-1$
         CATEGORY_SESSION)
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/remote/CDORemoteSessionManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/remote/CDORemoteSessionManagerImpl.java
index c86eba516d..4df7bb2d2f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/remote/CDORemoteSessionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/remote/CDORemoteSessionManagerImpl.java
@@ -39,7 +39,7 @@ import java.util.Set;
 /**
  * @author Eike Stepper
  */
-public class CDORemoteSessionManagerImpl extends Container<CDORemoteSession> implements InternalCDORemoteSessionManager
+public class CDORemoteSessionManagerImpl extends Container<CDORemoteSession>implements InternalCDORemoteSessionManager
 {
   private InternalCDOSession localSession;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index 5fa71a93bb..6d21152b63 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -509,9 +509,8 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   }
 
   @Deprecated
-  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(
-      CDOChangeSetData changeSetData, CDORevisionProvider ancestorProvider, CDORevisionProvider targetProvider,
-      CDOBranchPoint source)
+  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(CDOChangeSetData changeSetData,
+      CDORevisionProvider ancestorProvider, CDORevisionProvider targetProvider, CDOBranchPoint source)
   {
     throw new UnsupportedOperationException();
   }
@@ -1254,8 +1253,8 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return info;
   }
 
-  private synchronized CDOCommitInfo commitSynced(IProgressMonitor progressMonitor) throws DanglingIntegrityException,
-      CommitException
+  private synchronized CDOCommitInfo commitSynced(IProgressMonitor progressMonitor)
+      throws DanglingIntegrityException, CommitException
   {
     Object token = null;
 
@@ -2040,7 +2039,8 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
   {
     InternalCDOSavepoint newSavepoint = createSavepoint(null);
     copyUncommitted(lastSavepoint.getAllNewObjects(), commitContext.getNewObjects(), newSavepoint.getNewObjects());
-    copyUncommitted(lastSavepoint.getAllDirtyObjects(), commitContext.getDirtyObjects(), newSavepoint.getDirtyObjects());
+    copyUncommitted(lastSavepoint.getAllDirtyObjects(), commitContext.getDirtyObjects(),
+        newSavepoint.getDirtyObjects());
     copyUncommitted(lastSavepoint.getAllRevisionDeltas(), commitContext.getRevisionDeltas(),
         newSavepoint.getRevisionDeltas2());
     copyUncommitted(lastSavepoint.getAllDetachedObjects(), commitContext.getDetachedObjects(),
@@ -2131,8 +2131,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return savepoints.toArray(new CDOSavepoint[savepoints.size()]);
   }
 
-  public synchronized CDOSavepoint[] importChanges(InputStream stream, boolean reconstructSavepoints)
-      throws IOException
+  public synchronized CDOSavepoint[] importChanges(InputStream stream, boolean reconstructSavepoints) throws IOException
   {
     List<CDOSavepoint> savepoints = new ArrayList<CDOSavepoint>();
     if (stream.available() > 0)
@@ -2478,7 +2477,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     }
 
     Map<CDOObject, Pair<CDORevision, CDORevisionDelta>> conflicts = //
-    super.invalidate(allChangedObjects, allDetachedObjects, deltas, revisionDeltas, detachedObjects);
+        super.invalidate(allChangedObjects, allDetachedObjects, deltas, revisionDeltas, detachedObjects);
 
     if (!allChangedObjects.isEmpty())
     {
@@ -2812,7 +2811,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     InternalCDORevisionManager revisionManager = transaction.getSession().getRevisionManager();
 
     InternalCDORevision result = //
-    revisionManager.getRevision(id, transaction, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true, synthetics);
+        revisionManager.getRevision(id, transaction, CDORevision.UNCHUNKED, CDORevision.DEPTH_NONE, true, synthetics);
 
     if (result != null)
     {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
index 5c34f4a587..3d5568eb0a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
@@ -358,8 +358,8 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
 
       try
       {
-        send(activeContexts.values(), progressMonitor != null ? new SubProgressMonitor(progressMonitor, 2 - phase)
-            : null);
+        send(activeContexts.values(),
+            progressMonitor != null ? new SubProgressMonitor(progressMonitor, 2 - phase) : null);
       }
       catch (InterruptedException ex1)
       {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
index 38658f4b00..6ade8257f2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CommitIntegrityCheck.java
@@ -409,7 +409,8 @@ public class CommitIntegrityCheck
         if (refTarget != null)
         {
           boolean hasPersistentOpposite = classInfo.hasPersistentOpposite(reference);
-          checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite, msgFrag);
+          checkBidiRefTargetOrNewNonBidiTargetIncluded(referencer, reference, refTarget, hasPersistentOpposite,
+              msgFrag);
         }
       }
     }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index 9d7fdb85c7..92877852f3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -131,8 +131,8 @@ import java.util.Set;
 /**
  * @author Eike Stepper
  */
-public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOObject, CDOObjectHistory> implements
-    InternalCDOView
+public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOObject, CDOObjectHistory>
+    implements InternalCDOView
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_VIEW, AbstractCDOView.class);
 
@@ -1165,8 +1165,8 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     {
       if (!view.getSession().getRepositoryInfo().getUUID().equals(getSession().getRepositoryInfo().getUUID()))
       {
-        throw new IllegalArgumentException(MessageFormat.format(
-            Messages.getString("CDOViewImpl.11"), objectFromDifferentView)); //$NON-NLS-1$
+        throw new IllegalArgumentException(
+            MessageFormat.format(Messages.getString("CDOViewImpl.11"), objectFromDifferentView)); //$NON-NLS-1$
       }
 
       CDOID id = object.cdoID();
@@ -1398,8 +1398,8 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       }
       else
       {
-        InternalCDOObject object = (InternalCDOObject)EcoreUtil.getAdapter(
-            ((InternalEObject)potentialObject).eAdapters(), CDOLegacyAdapter.class);
+        InternalCDOObject object = (InternalCDOObject)EcoreUtil
+            .getAdapter(((InternalEObject)potentialObject).eAdapters(), CDOLegacyAdapter.class);
         if (object != null)
         {
           CDOID id = getID(object, onlyPersistedID);
@@ -2111,8 +2111,8 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
       switch (eventType)
       {
       case Notification.ADD:
-        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this,
-            (CDOResourceNode)msg.getNewValue(), IContainerDelta.Kind.ADDED);
+        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getNewValue(),
+            IContainerDelta.Kind.ADDED);
         break;
 
       case Notification.ADD_MANY:
@@ -2120,8 +2120,8 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
         break;
 
       case Notification.REMOVE:
-        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this,
-            (CDOResourceNode)msg.getOldValue(), IContainerDelta.Kind.REMOVED);
+        event = new SingleDeltaContainerEvent<CDOResourceNode>(AbstractCDOView.this, (CDOResourceNode)msg.getOldValue(),
+            IContainerDelta.Kind.REMOVED);
         break;
 
       case Notification.REMOVE_MANY:
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
index 09465fb490..e69dbef5e6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStateMachine.java
@@ -621,7 +621,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    * @author Eike Stepper
    */
   private final class PrepareTransition implements
-      ITransition<CDOState, CDOEvent, InternalCDOObject, Pair<InternalCDOTransaction, List<InternalCDOObject>>>
+  ITransition<CDOState, CDOEvent, InternalCDOObject, Pair<InternalCDOTransaction, List<InternalCDOObject>>>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
         Pair<InternalCDOTransaction, List<InternalCDOObject>> transactionAndContents)
@@ -735,7 +735,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    * @author Caspar De Groot
    */
   private final class ReattachTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
+  implements ITransition<CDOState, CDOEvent, InternalCDOObject, InternalCDOTransaction>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event, InternalCDOTransaction transaction)
     {
@@ -835,7 +835,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    * @author Eike Stepper
    */
   private static final class DetachTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, List<InternalCDOObject>>
+  implements ITransition<CDOState, CDOEvent, InternalCDOObject, List<InternalCDOObject>>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
         List<InternalCDOObject> objectsToDetach)
@@ -865,7 +865,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    * @author Eike Stepper
    */
   final private class CommitTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
+  implements ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
   {
     public CommitTransition(boolean useDeltas)
     {
@@ -925,7 +925,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
    * @author Eike Stepper
    */
   private static abstract class AbstractWriteTransition
-      implements ITransition<CDOState, CDOEvent, InternalCDOObject, FeatureDeltaAndResult>
+  implements ITransition<CDOState, CDOEvent, InternalCDOObject, FeatureDeltaAndResult>
   {
     public void execute(InternalCDOObject object, CDOState state, CDOEvent event,
         FeatureDeltaAndResult featureDeltaAndResult)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index 8b7587f1eb..89860d7353 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -207,10 +207,8 @@ public class CDOViewImpl extends AbstractCDOView
     long creationTimeStamp = session.getRepositoryInfo().getCreationTime();
     if (timeStamp != UNSPECIFIED_DATE && timeStamp < creationTimeStamp)
     {
-      throw new IllegalArgumentException(
-          MessageFormat
-              .format(
-                  "timeStamp ({0}) < repository creation time ({1})", CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(creationTimeStamp))); //$NON-NLS-1$
+      throw new IllegalArgumentException(MessageFormat.format("timeStamp ({0}) < repository creation time ({1})", //$NON-NLS-1$
+          CDOCommonUtil.formatTimeStamp(timeStamp), CDOCommonUtil.formatTimeStamp(creationTimeStamp)));
     }
 
     CDOBranchPoint oldBranchPoint = CDOBranchUtil.copyBranchPoint(getBranchPoint());
@@ -440,7 +438,8 @@ public class CDOViewImpl extends AbstractCDOView
     }
   }
 
-  private CDOLockChangeInfo makeLockChangeInfo(Operation op, LockType type, long timestamp, CDOLockState[] newLockStates)
+  private CDOLockChangeInfo makeLockChangeInfo(Operation op, LockType type, long timestamp,
+      CDOLockState[] newLockStates)
   {
     return CDOLockUtil.createLockChangeInfo(timestamp, this, getBranch(), op, type, newLockStates);
   }
@@ -853,9 +852,8 @@ public class CDOViewImpl extends AbstractCDOView
    * Must not by synchronized on the view!
    */
   @Deprecated
-  public/* synchronized */void invalidate(CDOBranch branch, long lastUpdateTime,
-      List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
-      Map<CDOID, InternalCDORevision> oldRevisions, boolean async)
+  public/* synchronized */void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
+      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async)
   {
     invalidate(branch, lastUpdateTime, allChangedObjects, allDetachedObjects, oldRevisions, async, true);
   }
@@ -863,9 +861,9 @@ public class CDOViewImpl extends AbstractCDOView
   /*
    * Must not by synchronized on the view!
    */
-  public/* synchronized */void invalidate(CDOBranch branch, long lastUpdateTime,
-      List<CDORevisionKey> allChangedObjects, List<CDOIDAndVersion> allDetachedObjects,
-      Map<CDOID, InternalCDORevision> oldRevisions, boolean async, boolean clearResourcePathCache)
+  public/* synchronized */void invalidate(CDOBranch branch, long lastUpdateTime, List<CDORevisionKey> allChangedObjects,
+      List<CDOIDAndVersion> allDetachedObjects, Map<CDOID, InternalCDORevision> oldRevisions, boolean async,
+      boolean clearResourcePathCache)
   {
     if (async)
     {
@@ -2420,8 +2418,8 @@ public class CDOViewImpl extends AbstractCDOView
     /**
      * @author Eike Stepper
      */
-    private final class ChangeSubscriptionPoliciesEventImpl extends OptionsEvent implements
-        ChangeSubscriptionPoliciesEvent
+    private final class ChangeSubscriptionPoliciesEventImpl extends OptionsEvent
+        implements ChangeSubscriptionPoliciesEvent
     {
       private static final long serialVersionUID = 1L;
 
@@ -2520,8 +2518,8 @@ public class CDOViewImpl extends AbstractCDOView
     /**
      * @author Eike Stepper
      */
-    private final class RevisionPrefetchingPolicyEventImpl extends OptionsEvent implements
-        RevisionPrefetchingPolicyEvent
+    private final class RevisionPrefetchingPolicyEventImpl extends OptionsEvent
+        implements RevisionPrefetchingPolicyEvent
     {
       private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
index 1aadc36fa5..14f5847eb4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewProviderRegistryImpl.java
@@ -50,7 +50,7 @@ import java.util.List;
  * @since 2.0
  * @see CDOViewProvider
  */
-public class CDOViewProviderRegistryImpl extends Container<CDOViewProvider> implements CDOViewProviderRegistry
+public class CDOViewProviderRegistryImpl extends Container<CDOViewProvider>implements CDOViewProviderRegistry
 {
   public static final CDOViewProviderRegistryImpl INSTANCE = new CDOViewProviderRegistryImpl();
 
@@ -240,14 +240,14 @@ public class CDOViewProviderRegistryImpl extends Container<CDOViewProvider> impl
 
       if (StringUtil.isEmpty(element.getAttribute("class"))) //$NON-NLS-1$
       {
-        throw new IllegalArgumentException(MessageFormat.format(
-            Messages.getString("CDOViewProviderRegistryImpl.4"), element)); //$NON-NLS-1$
+        throw new IllegalArgumentException(
+            MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.4"), element)); //$NON-NLS-1$
       }
 
       if (StringUtil.isEmpty(element.getAttribute("regex"))) //$NON-NLS-1$
       {
-        throw new IllegalArgumentException(MessageFormat.format(
-            Messages.getString("CDOViewProviderRegistryImpl.6"), element)); //$NON-NLS-1$
+        throw new IllegalArgumentException(
+            MessageFormat.format(Messages.getString("CDOViewProviderRegistryImpl.6"), element)); //$NON-NLS-1$
       }
     }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewRegistryImpl.java
index ed2f7e98f2..9d66fa3fcd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewRegistryImpl.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * @since 4.2
  * @see CDOView
  */
-public class CDOViewRegistryImpl extends Container<Registration> implements CDOViewRegistry
+public class CDOViewRegistryImpl extends Container<Registration>implements CDOViewRegistry
 {
   public static final CDOViewRegistryImpl INSTANCE = new CDOViewRegistryImpl();
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java
index 09c421bc31..565afc67a2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewSetImpl.java
@@ -107,8 +107,8 @@ public class CDOViewSetImpl extends NotifierImpl implements InternalCDOViewSet
       {
         if (repositoryUUID != null)
         {
-          throw new IllegalArgumentException(MessageFormat.format(
-              Messages.getString("CDOViewSetImpl.0"), repositoryUUID)); //$NON-NLS-1$
+          throw new IllegalArgumentException(
+              MessageFormat.format(Messages.getString("CDOViewSetImpl.0"), repositoryUUID)); //$NON-NLS-1$
         }
 
         if (mapOfViews.size() == 1)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java
index 7aa6d8d49e..41217e0f5e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/ViewProperties.java
@@ -57,13 +57,13 @@ public class ViewProperties extends Properties<CDOView>
     });
 
     add(new Property<CDOView>("branchName") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(CDOView view)
       {
         return view.getBranch().getName();
       }
-    });
+        });
 
     add(new Property<CDOView>("branch", //$NON-NLS-1$
         "Branch", "The branch of this view.", CATEGORY_VIEW)
@@ -95,8 +95,7 @@ public class ViewProperties extends Properties<CDOView>
       }
     });
 
-    add(new Property<CDOView>(
-        "rootResourcePermission", //$NON-NLS-1$
+    add(new Property<CDOView>("rootResourcePermission", //$NON-NLS-1$
         "Root Resource Permission", "The permission the current user has for the root resource of this view.",
         CATEGORY_VIEW)
     {
@@ -167,13 +166,13 @@ public class ViewProperties extends Properties<CDOView>
     });
 
     add(new Property<CDOView>("historical") //$NON-NLS-1$
-    {
+        {
       @Override
       protected Object eval(CDOView view)
       {
         return view.getTimeStamp() != CDOBranchPoint.UNSPECIFIED_DATE;
       }
-    });
+        });
   }
 
   public static void main(String[] args)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
index 1992becb7b..2dfc6baa3d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
@@ -81,8 +81,7 @@ import java.util.Set;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLoader3, RevisionLoader2,
-    CommitInfoLoader
+public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLoader3, RevisionLoader2, CommitInfoLoader
 {
   public RepositoryTimeResult getRepositoryTime();
 
@@ -734,8 +733,7 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
     @Override
     public String toString()
     {
-      return MessageFormat.format(
-          "RepositoryTime[requested={0}, indicated={1}, responded={2}, confirmed={3}]", //$NON-NLS-1$
+      return MessageFormat.format("RepositoryTime[requested={0}, indicated={1}, responded={2}, confirmed={3}]", //$NON-NLS-1$
           CDOCommonUtil.formatTimeStamp(requested), CDOCommonUtil.formatTimeStamp(indicated),
           CDOCommonUtil.formatTimeStamp(responded), CDOCommonUtil.formatTimeStamp(confirmed));
     }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
index 71298728de..a9fd7785eb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
@@ -358,8 +358,8 @@ public class DefaultCDOMerger implements CDOMerger
     }
     else if (data != null)
     {
-      throw new IllegalArgumentException("Must be a CDORevision, a CDORevisionDelta, a CDOID, a Conflict or null: "
-          + data);
+      throw new IllegalArgumentException(
+          "Must be a CDORevision, a CDORevisionDelta, a CDOID, a Conflict or null: " + data);
     }
     else
     {
@@ -379,17 +379,13 @@ public class DefaultCDOMerger implements CDOMerger
   {
     NONE,
 
-    @Deprecated
-    SOURCE_OVER_TARGET,
+    @Deprecated SOURCE_OVER_TARGET,
 
-    @Deprecated
-    TARGET_OVER_SOURCE,
+    @Deprecated TARGET_OVER_SOURCE,
 
-    @Deprecated
-    DETACH_OVER_CHANGE,
+    @Deprecated DETACH_OVER_CHANGE,
 
-    @Deprecated
-    CHANGE_OVER_DETACH
+    @Deprecated CHANGE_OVER_DETACH
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
index 6d2d6b9897..382fd47979 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
@@ -55,8 +55,8 @@ import java.util.Set;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-public interface InternalCDOSession extends CDOSession, PackageProcessor, PackageLoader, RevisionLocker,
-    CDORevisionUnchunker, ILifecycle
+public interface InternalCDOSession
+    extends CDOSession, PackageProcessor, PackageLoader, RevisionLocker, CDORevisionUnchunker, ILifecycle
 {
   public CDOSessionProtocol getSessionProtocol();
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java
index 65fb55c0a0..24d80dfafb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java
@@ -138,9 +138,8 @@ public interface InternalCDOTransaction extends CDOTransaction, InternalCDOUserT
    *             {@link #applyChangeSet(CDOChangeSetData, CDORevisionProvider, CDORevisionProvider, CDOBranchPoint, boolean)}
    */
   @Deprecated
-  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(
-      CDOChangeSetData changeSetData, CDORevisionProvider ancestorProvider, CDORevisionProvider targetProvider,
-      CDOBranchPoint source);
+  public Pair<CDOChangeSetData, Pair<Map<CDOID, CDOID>, List<CDOID>>> applyChangeSetData(CDOChangeSetData changeSetData,
+      CDORevisionProvider ancestorProvider, CDORevisionProvider targetProvider, CDOBranchPoint source);
 
   /**
    * @param source
@@ -151,7 +150,7 @@ public interface InternalCDOTransaction extends CDOTransaction, InternalCDOUserT
    */
   public ApplyChangeSetResult applyChangeSet(CDOChangeSetData changeSetData, CDORevisionProvider ancestorProvider,
       CDORevisionProvider targetProvider, CDOBranchPoint source, boolean keepVersions)
-      throws ChangeSetOutdatedException;
+          throws ChangeSetOutdatedException;
 
   /**
    * @since 4.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/package-info.java
index 9bc024dbfe..44e14075b5 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/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.spi.cdo;
-
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
index 0355846f76..7067940008 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.chat.ui;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Activator: org.eclipse.net4j.buddies.chat.internal.ui.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.ui;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.buddies.chat.internal.ui;version="4.0.300",
- org.eclipse.net4j.buddies.chat.internal.ui.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.buddies.chat.internal.ui.messages;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.net4j.buddies.chat.internal.ui;version="4.0.400",
+ org.eclipse.net4j.buddies.chat.internal.ui.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.buddies.chat.internal.ui.messages;version="4.0.400";x-internal:=true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java
index c83bf23914..41b2993880 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java
index d9497e1cf2..6b8a97dab4 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/bundle/OM.java
index 68604114c3..695027386c 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.ui.UIActivator;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/messages/Messages.java b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/messages/Messages.java
index f1f3685b04..b5d3c30637 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
index 9fcab23f21..67f4c25d08 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.chat;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.net4j.buddies.internal.chat.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.chat;version="4.0.300",
- org.eclipse.net4j.buddies.internal.chat;version="4.0.300",
- org.eclipse.net4j.buddies.internal.chat.bundle;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.net4j.buddies.chat;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.chat;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.chat.bundle;version="4.0.400";x-internal:=true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IChat.java b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IChat.java
index a640482fb8..35024ca423 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IChat.java
+++ b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IChat.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IComment.java b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IComment.java
index 877592232e..f4cc31597e 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IComment.java
+++ b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IComment.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatFactory.java b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatFactory.java
index 2a99072ffe..85c8971135 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatFactory.java
+++ b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoom.java b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoom.java
index 2e25d50ec2..a48b929866 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoom.java
+++ b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoom.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoomFactory.java b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoomFactory.java
index 58b207bcd4..6452a5c3c2 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoomFactory.java
+++ b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoomFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/Comment.java b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/Comment.java
index 250c3fde3c..ba63933438 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/Comment.java
+++ b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/Comment.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/TextMessage.java b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/TextMessage.java
index 91be25fb44..59d3b75b34 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/TextMessage.java
+++ b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/TextMessage.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/bundle/OM.java b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/bundle/OM.java
index f82380e21e..86dfca4ccc 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IAccount.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IAccount.java
index edbba6441b..2da8082817 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IAccount.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IAccount.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddy.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddy.java
index 9fd3333fea..b63167d5a1 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddy.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddy.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyContainer.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyContainer.java
index b92d2ada15..b0702f6f71 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyContainer.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyProvider.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyProvider.java
index bdb0cb0ab4..f983eed7fa 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaboration.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaboration.java
index 3325597819..a0f6d9b8f0 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaboration.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaboration.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationContainer.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationContainer.java
index b9253542d9..a0edb049ef 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationContainer.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationProvider.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationProvider.java
index 7e0e903fc9..04e20e6096 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IFacility.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IFacility.java
index 67e543f4b3..1271ce0573 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IFacility.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IFacility.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembership.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembership.java
index bdbef42523..667defb76d 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembership.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembership.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipContainer.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipContainer.java
index 480c13d028..d7eb8e6a9e 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipContainer.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipKey.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipKey.java
index ea9bf89ce3..60c2e2da14 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipKey.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipKey.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipProvider.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipProvider.java
index 259a4395a0..3579af74bb 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessage.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessage.java
index 1e9700d5d6..a1612c84ba 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessage.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessage.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessageEvent.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessageEvent.java
index 53b3f9298d..aa18a8f5ae 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessageEvent.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessageEvent.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISession.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISession.java
index 502070050b..4665ad9296 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISession.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISession.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISessionProvider.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISessionProvider.java
index 2851597fb6..da50ad0088 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISessionProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISessionProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Account.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Account.java
index b8aaeb0498..dfefa32ead 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Account.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Account.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
index d3d70dfb8e..e5d7d9c0eb 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
@@ -69,7 +69,8 @@ public class MembershipContainer extends Lifecycle implements IMembershipContain
       IListener[] listeners = getListeners();
       if (listeners != null)
       {
-        fireEvent(new SingleDeltaContainerEvent<IMembership>(this, membership, IContainerDelta.Kind.REMOVED), listeners);
+        fireEvent(new SingleDeltaContainerEvent<IMembership>(this, membership, IContainerDelta.Kind.REMOVED),
+            listeners);
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
index 0c0072c540..f1c305edd3 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MessageEvent.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MessageEvent.java
index 4d83522f01..64eb687c59 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MessageEvent.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MessageEvent.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/bundle/OM.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/bundle/OM.java
index 3571ae0f87..bb591d81a5 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java
index a89caf23ab..c427700d5a 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java
index 42c8544530..4967b8005d 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
index 50360c8fb7..1f53df7564 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java
index 49b2a65fec..f89b20d6a0 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java
index adab0d254e..56d6a5fbf3 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java
index f6e179d958..4ce22b025d 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/ProtocolConstants.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/ProtocolConstants.java
index b79ebd39ff..64691e98cb 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/ProtocolConstants.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/ProtocolConstants.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ClientFacilityFactory.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ClientFacilityFactory.java
index e14b8ddfa7..26a7e10eaf 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ClientFacilityFactory.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ClientFacilityFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/Message.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/Message.java
index 14c6e3ac09..89a0486b3a 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/Message.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/Message.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ServerFacilityFactory.java b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ServerFacilityFactory.java
index 971eb26d43..9a21b9b936 100644
--- a/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ServerFacilityFactory.java
+++ b/plugins/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ServerFacilityFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
index 7e5e15c075..e50a3b0048 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
index 23c9bb28cc..02ffdce761 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/messages/Messages.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/messages/Messages.java
index ab1aaecc4a..448a78346b 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java
index a8c4728537..d433394925 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java
index eb170a0625..8848436e56 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java
index a38f121431..e23628a5a9 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
index a8e863ae55..e8a95520ef 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java
index 6030c09c3f..e7395725ee 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java
index 6a67001ddd..de4a5163dd 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java
index c414f8c539..8d48e418a0 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java
index 8486e1a33e..5f29a24c04 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java
index ffe5dad751..22816c45ae 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java
index 6b0339c429..2f8eed9270 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java
index fe403858b8..ea50bb386c 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java
index 7f567028c8..7137f78319 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java
index 00dffb4bca..e4473fb12c 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
index 249c40aa41..9859bed4c2 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.ui;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Activator: org.eclipse.net4j.buddies.internal.ui.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -16,12 +16,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.buddies;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
  org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.buddies.internal.ui;version="4.0.300",
- org.eclipse.net4j.buddies.internal.ui.actions;version="4.0.300",
- org.eclipse.net4j.buddies.internal.ui.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.buddies.internal.ui.dnd;version="4.0.300",
- org.eclipse.net4j.buddies.internal.ui.messages;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.buddies.internal.ui.preferences;version="4.0.300",
- org.eclipse.net4j.buddies.internal.ui.views;version="4.0.300",
- org.eclipse.net4j.buddies.ui;version="4.0.300"
+Export-Package: org.eclipse.net4j.buddies.internal.ui;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.ui.actions;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.ui.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.ui.dnd;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.ui.messages;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.ui.preferences;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.ui.views;version="4.0.400",
+ org.eclipse.net4j.buddies.ui;version="4.0.400"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
index d819fdfe95..2702a30ec3 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
@@ -190,14 +190,14 @@ public abstract class AbstractItemProvider extends ContainerItemProvider<IContai
       else if (obj instanceof IBuddyCollaboration)
       {
         final IBuddyCollaboration collaboration = (IBuddyCollaboration)obj;
-        manager.add(new SafeAction(
-            Messages.getString("AbstractItemProvider.0"), Messages.getString("AbstractItemProvider.1")) //$NON-NLS-1$ //$NON-NLS-2$
+        manager.add(
+            new SafeAction(Messages.getString("AbstractItemProvider.0"), Messages.getString("AbstractItemProvider.1")) //$NON-NLS-1$ //$NON-NLS-2$
             {
-              @Override
-              protected void safeRun() throws Exception
-              {
-                collaboration.leave();
-              }
+          @Override
+          protected void safeRun() throws Exception
+          {
+            collaboration.leave();
+          }
             });
       }
     }
@@ -220,8 +220,8 @@ public abstract class AbstractItemProvider extends ContainerItemProvider<IContai
 
     public RemoveAction(Object object)
     {
-      super(
-          Messages.getString("AbstractItemProvider.2"), Messages.getString("AbstractItemProvider.3"), ContainerView.getDeleteImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
+      super(Messages.getString("AbstractItemProvider.2"), Messages.getString("AbstractItemProvider.3"), //$NON-NLS-1$ //$NON-NLS-2$
+          ContainerView.getDeleteImageDescriptor());
       this.object = object;
     }
 
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
index cc999fc595..94e72013d4 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
index 60c9c900e3..15474ab6d9 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
index 82de32611e..b8e97d1efa 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
index d52da85076..1e171edcd3 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
index 7c02119c54..42ff0b1c1f 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
index ad261b8ebe..03f50aa980 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
index 44aa6496c9..d92253a90c 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
index 419750582d..f2218983e3 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
index 3da388957a..efb9a01559 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
index 88a7f590fd..377b99baa3 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.ui.UIActivator;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
index 6484e57a67..4d36bce199 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/messages/Messages.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/messages/Messages.java
index e8ef2338d2..dd42fcbccc 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
index 2987318552..df0a7684e9 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
index 64121564f6..7d869f94b1 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java
index 837689daa8..29a09e2823 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -206,7 +206,7 @@ public class CollaborationsView extends SessionManagerView
     private StartFacilityAction(IBuddyCollaboration collaboration, String type, ImageDescriptor descriptor)
     {
       super(MessageFormat.format(Messages.getString("CollaborationsView_2"), StringUtil.cap(type)), AS_RADIO_BUTTON); //$NON-NLS-1$
-      setToolTipText(MessageFormat.format(Messages.getString("CollaborationsView_3"), type)); //$NON-NLS-1$ 
+      setToolTipText(MessageFormat.format(Messages.getString("CollaborationsView_3"), type)); //$NON-NLS-1$
       setImageDescriptor(descriptor);
       this.collaboration = collaboration;
       this.type = type;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
index 2377dd1d1c..a41666307b 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
index 94f56f70c6..e1a647e042 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java
index 393e0bf0c2..9c5abc2e7b 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
index 360e995824..081e0ff0d9 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
index 3c994acf85..6254417d7a 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManager.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManager.java
index 66b19e13ac..f4fb78681e 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManager.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManager.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManagerEvent.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManagerEvent.java
index 56470dbc47..a80a8366dd 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManagerEvent.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManagerEvent.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
index c80b3966ef..e9dd20cdd4 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
index 394fb36d8e..86a1dc08c5 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java
index 9901771045..c58a440e14 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
@@ -36,16 +36,16 @@ public abstract class OM
   public static final OMPreferences PREFS = BUNDLE.preferences();
 
   public static final OMPreference<String> PREF_CONNECTOR_DESCRIPTION = //
-  PREFS.init("PREF_CONNECTOR_DESCRIPTION", "tcp://localhost"); //$NON-NLS-1$ //$NON-NLS-2$
+      PREFS.init("PREF_CONNECTOR_DESCRIPTION", "tcp://localhost"); //$NON-NLS-1$ //$NON-NLS-2$
 
   public static final OMPreference<String> PREF_USER_ID = //
-  PREFS.init("PREF_USER_ID", System.getProperty("user.name")); //$NON-NLS-1$ //$NON-NLS-2$
+      PREFS.init("PREF_USER_ID", System.getProperty("user.name")); //$NON-NLS-1$ //$NON-NLS-2$
 
   public static final OMPreference<String> PREF_PASSWORD = //
-  PREFS.initString("PREF_PASSWORD"); //$NON-NLS-1$
+      PREFS.initString("PREF_PASSWORD"); //$NON-NLS-1$
 
   public static final OMPreference<Boolean> PREF_AUTO_CONNECT = //
-  PREFS.init("PREF_AUTO_CONNECT", false); //$NON-NLS-1$
+      PREFS.init("PREF_AUTO_CONNECT", false); //$NON-NLS-1$
 
   /**
    * @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
index 7ea8f14f1c..f3c07368f8 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
index e430b60cda..61c0fe2364 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
index 7d747cc7e1..5ef0de0bf3 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
index 500e56caf9..b6adccf4a4 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java
index 82e3243321..3c2a84b2b7 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
index 7f0e323b03..02af883236 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
index 5b5a3c433e..eea09de9cc 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
index d138e1857e..92afc85665 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
index 7d6ccc645f..348b06c459 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
index 0b1c3bfe73..a3f404fb9e 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
index 2b4144745a..9406d1698f 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
index 8c81d557bd..efacb85d62 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
index 1866128028..f44c7991c8 100644
--- a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.derby;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -12,6 +12,6 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: org.apache.derby.jdbc;version="[10.0.0,11.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.db.derby;version="4.1.100",
- org.eclipse.net4j.db.internal.derby.bundle;version="4.1.100";x-internal:=true
+Export-Package: org.eclipse.net4j.db.derby;version="4.1.200",
+ org.eclipse.net4j.db.internal.derby.bundle;version="4.1.200";x-internal:=true
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/DerbyAdapter.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/DerbyAdapter.java
index dd9e6081ef..a7206d3b93 100644
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/DerbyAdapter.java
+++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/DerbyAdapter.java
@@ -28,25 +28,25 @@ public abstract class DerbyAdapter extends DBAdapter
   public static final String VERSION = "10.3.2.1"; //$NON-NLS-1$
 
   private static final String[] RESERVED_WORDS = { "ADD", "ALL", "ALLOCATE", "ALTER", "AND", "ANY", "ARE", "AS", "ASC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "ASSERTION", "AT", "AUTHORIZATION", "AVG", "BEGIN", "BETWEEN", "BIGINT", "BIT", "BOOLEAN", "BOTH", "BY", "CALL", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "CASCADE", "CASCADED", "CASE", "CAST", "CHAR", "CHARACTER", "CHECK", "CLOSE", "COALESCE", "COLLATE", "COLLATION", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "COLUMN", "COMMIT", "CONNECT", "CONNECTION", "CONSTRAINT", "CONSTRAINTS", "CONTINUE", "CONVERT", "CORRESPONDING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "CREATE", "CURRENT", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", "DEALLOCATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "DEC", "DECIMAL", "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "DELETE", "DESC", "DESCRIBE", "DIAGNOSTICS", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "DISCONNECT", "DISTINCT", "DOUBLE", "DROP", "ELSE", "END", "END-EXEC", "ESCAPE", "EXCEPT", "EXCEPTION", "EXEC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "EXECUTE", "EXISTS", "EXPLAIN", "EXTERNAL", "FALSE", "FETCH", "FIRST", "FLOAT", "FOR", "FOREIGN", "FOUND", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "FROM", "FULL", "FUNCTION", "GET", "GETCURRENTCONNECTION", "GLOBAL", "GO", "GOTO", "GRANT", "GROUP", "HAVING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "HOUR", "IDENTITY", "IMMEDIATE", "IN", "INDICATOR", "INITIALLY", "INNER", "INOUT", "INPUT", "INSENSITIVE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "INSERT", "INT", "INTEGER", "INTERSECT", "INTO", "IS", "ISOLATION", "JOIN", "KEY", "LAST", "LEFT", "LIKE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "LOWER", "LTRIM", "MATCH", "MAX", "MIN", "MINUTE", "NATIONAL", "NATURAL", "NCHAR", "NVARCHAR", "NEXT", "NO", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "NOT", "NULL", "NULLIF", "NUMERIC", "OF", "ON", "ONLY", "OPEN", "OPTION", "OR", "ORDER", "OUTER", "OUTPUT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$
-      "OVERLAPS", "PAD", "PARTIAL", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", "PROCEDURE", "PUBLIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "READ", "REAL", "REFERENCES", "RELATIVE", "RESTRICT", "REVOKE", "RIGHT", "ROLLBACK", "ROWS", "RTRIM", "SCHEMA", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "SCROLL", "SECOND", "SELECT", "SESSION_USER", "SET", "SMALLINT", "SOME", "SPACE", "SQL", "SQLCODE", "SQLERROR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "SQLSTATE", "SUBSTR", "SUBSTRING", "SUM", "SYSTEM_USER", "TABLE", "TEMPORARY", "TIMEZONE_HOUR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "TIMEZONE_MINUTE", "TO", "TRANSACTION", "TRANSLATE", "TRANSLATION", "TRIM", "TRUE", "UNION", "UNIQUE", "UNKNOWN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "UPDATE", "UPPER", "USER", "USING", "VALUES", "VARCHAR", "VARYING", "VIEW", "WHENEVER", "WHERE", "WITH", "WORK", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "WRITE", "XML", "XMLEXISTS", "XMLPARSE", "XMLQUERY", "XMLSERIALIZE", "YEAR" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+    "ASSERTION", "AT", "AUTHORIZATION", "AVG", "BEGIN", "BETWEEN", "BIGINT", "BIT", "BOOLEAN", "BOTH", "BY", "CALL", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "CASCADE", "CASCADED", "CASE", "CAST", "CHAR", "CHARACTER", "CHECK", "CLOSE", "COALESCE", "COLLATE", "COLLATION", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "COLUMN", "COMMIT", "CONNECT", "CONNECTION", "CONSTRAINT", "CONSTRAINTS", "CONTINUE", "CONVERT", "CORRESPONDING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+    "CREATE", "CURRENT", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", "DEALLOCATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "DEC", "DECIMAL", "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "DELETE", "DESC", "DESCRIBE", "DIAGNOSTICS", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "DISCONNECT", "DISTINCT", "DOUBLE", "DROP", "ELSE", "END", "END-EXEC", "ESCAPE", "EXCEPT", "EXCEPTION", "EXEC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "EXECUTE", "EXISTS", "EXPLAIN", "EXTERNAL", "FALSE", "FETCH", "FIRST", "FLOAT", "FOR", "FOREIGN", "FOUND", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "FROM", "FULL", "FUNCTION", "GET", "GETCURRENTCONNECTION", "GLOBAL", "GO", "GOTO", "GRANT", "GROUP", "HAVING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "HOUR", "IDENTITY", "IMMEDIATE", "IN", "INDICATOR", "INITIALLY", "INNER", "INOUT", "INPUT", "INSENSITIVE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "INSERT", "INT", "INTEGER", "INTERSECT", "INTO", "IS", "ISOLATION", "JOIN", "KEY", "LAST", "LEFT", "LIKE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "LOWER", "LTRIM", "MATCH", "MAX", "MIN", "MINUTE", "NATIONAL", "NATURAL", "NCHAR", "NVARCHAR", "NEXT", "NO", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "NOT", "NULL", "NULLIF", "NUMERIC", "OF", "ON", "ONLY", "OPEN", "OPTION", "OR", "ORDER", "OUTER", "OUTPUT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$
+    "OVERLAPS", "PAD", "PARTIAL", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", "PROCEDURE", "PUBLIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "READ", "REAL", "REFERENCES", "RELATIVE", "RESTRICT", "REVOKE", "RIGHT", "ROLLBACK", "ROWS", "RTRIM", "SCHEMA", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "SCROLL", "SECOND", "SELECT", "SESSION_USER", "SET", "SMALLINT", "SOME", "SPACE", "SQL", "SQLCODE", "SQLERROR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "SQLSTATE", "SUBSTR", "SUBSTRING", "SUM", "SYSTEM_USER", "TABLE", "TEMPORARY", "TIMEZONE_HOUR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "TIMEZONE_MINUTE", "TO", "TRANSACTION", "TRANSLATE", "TRANSLATION", "TRIM", "TRUE", "UNION", "UNIQUE", "UNKNOWN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "UPDATE", "UPPER", "USER", "USING", "VALUES", "VARCHAR", "VARYING", "VIEW", "WHENEVER", "WHERE", "WITH", "WORK", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "WRITE", "XML", "XMLEXISTS", "XMLPARSE", "XMLQUERY", "XMLSERIALIZE", "YEAR" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
 
   public DerbyAdapter(String name)
   {
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/package-info.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/package-info.java
index 8e06ea18c8..4c43c4656c 100644
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/package-info.java
+++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/derby/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * The Net4j DB Framework support for Derby databases.
  */
 package org.eclipse.net4j.db.derby;
-
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java
index 07c62e055f..feff6ee998 100644
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Legal.java b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Legal.java
index 467c2d0553..cfd8debd5a 100644
--- a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Legal.java
+++ b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Legal.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.db.doc;
 
 /**
  * Legal
- * 
+ *
  * @external about.html
  * @number 666
  */
diff --git a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Overview.java b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Overview.java
index 39241588f3..38136763f2 100644
--- a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Overview.java
+++ b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Overview.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ package org.eclipse.net4j.db.doc;
  * Overview
  * <p>
  * {@toc}
- * 
+ *
  * @default
  */
 public class Overview
diff --git a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/Homepage.java b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/Homepage.java
index 74ff3fcc64..d06215a8db 100644
--- a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/Homepage.java
+++ b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/Homepage.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.db.doc.online;
 
 /**
  * Homepage
- * 
+ *
  * @external http://www.eclipse.org/cdo
  * @number 1
  */
diff --git a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/Wiki.java b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/Wiki.java
index 72f90fe633..e962e00c8a 100644
--- a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/Wiki.java
+++ b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/Wiki.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.db.doc.online;
 
 /**
  * Wiki
- * 
+ *
  * @external http://wiki.eclipse.org/CDO
  * @number 2
  */
diff --git a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/package-info.java b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/package-info.java
index eacb8ea4f4..d9d7ff10e4 100644
--- a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/package-info.java
+++ b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/online/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Online Docs
- * 
+ *
  * @number 555
  */
 package org.eclipse.net4j.db.doc.online;
-
diff --git a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/api/package-info.java b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/api/package-info.java
index bb6714af1d..79924a639b 100644
--- a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/api/package-info.java
+++ b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/api/package-info.java
@@ -4,14 +4,14 @@
  * 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
  */
 
 /**
  * API Reference
- * 
+ *
  * @number 1
  */
 package org.eclipse.net4j.db.doc.reference.api;
diff --git a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/package-info.java b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/package-info.java
index 2a2e31db8e..849f4a73ec 100644
--- a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/package-info.java
+++ b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Reference
- * 
+ *
  * @number 444
  */
 package org.eclipse.net4j.db.doc.reference;
-
diff --git a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/schema/package-info.java b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/schema/package-info.java
index 255259883c..f25af64b84 100644
--- a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/schema/package-info.java
+++ b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/reference/schema/package-info.java
@@ -4,14 +4,14 @@
  * 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
  */
 
 /**
  * Extension Point Reference
- * 
+ *
  * @number 2
  */
 package org.eclipse.net4j.db.doc.reference.schema;
diff --git a/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF
index 97fc700a69..8b76a4f261 100644
--- a/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.h2;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ClassPath: .
@@ -18,6 +18,6 @@ Import-Package: org.h2;version="[1.0.0,2.0.0)";resolution:=optional,
  org.h2.value;version="[1.0.0,2.0.0)";resolution:=optional
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.db.h2;version="4.2.100",
- org.eclipse.net4j.db.internal.h2.bundle;version="4.2.100";x-internal:=true
+Export-Package: org.eclipse.net4j.db.h2;version="4.2.200",
+ org.eclipse.net4j.db.internal.h2.bundle;version="4.2.200";x-internal:=true
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/h2/package-info.java b/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/h2/package-info.java
index c8a5b69ec6..125a5256a4 100644
--- a/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/h2/package-info.java
+++ b/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/h2/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * The Net4j DB Framework support for H2 databases.
  */
 package org.eclipse.net4j.db.h2;
-
diff --git a/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/internal/h2/bundle/OM.java b/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/internal/h2/bundle/OM.java
index 7de43949d6..53f738cbd7 100644
--- a/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/internal/h2/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db.h2/src/org/eclipse/net4j/db/internal/h2/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
index 58d139fd15..53d0e78ff5 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.hsqldb;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: org.hsqldb;version="[2.0.0,3.0.0)";resolution:=optional,
  org.hsqldb.jdbc;version="[2.0.0,3.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.db.hsqldb;version="4.2.100",
- org.eclipse.net4j.db.internal.hsqldb.bundle;version="4.2.100";x-internal:=true
+Export-Package: org.eclipse.net4j.db.hsqldb;version="4.2.200",
+ org.eclipse.net4j.db.internal.hsqldb.bundle;version="4.2.200";x-internal:=true
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/package-info.java b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/package-info.java
index 803dcbba99..9dce137b31 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/package-info.java
+++ b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/hsqldb/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * The Net4j DB Framework support for HSQLDB databases.
  */
 package org.eclipse.net4j.db.hsqldb;
-
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/bundle/OM.java b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/bundle/OM.java
index 8336728d6e..3d8f8f318d 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.db.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.jdbc/META-INF/MANIFEST.MF
index fc983a7110..d8a9215c4c 100644
--- a/plugins/org.eclipse.net4j.db.jdbc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.jdbc/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.jdbc;singleton:=true
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.3.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.net4j.db.jdbc;version="4.3.0"
+Export-Package: org.eclipse.net4j.db.jdbc;version="4.3.100"
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.net4j.util;bundle-version="[3.4.0,4.0.0)"
diff --git a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingConnection.java b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingConnection.java
index bf56075c25..c334d3cc07 100644
--- a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingConnection.java
+++ b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingConnection.java
@@ -214,8 +214,8 @@ public abstract class DelegatingConnection implements Connection
     return delegate.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
   }
 
-  public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability)
-      throws SQLException
+  public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
+      int resultSetHoldability) throws SQLException
   {
     return delegate.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
   }
diff --git a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingResultSet.java b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingResultSet.java
index 3a4717a707..3f777f3316 100644
--- a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingResultSet.java
+++ b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/DelegatingResultSet.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/JDBCUtil.java b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/JDBCUtil.java
index b6a3d0e969..41893a16de 100644
--- a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/JDBCUtil.java
+++ b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/JDBCUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/package-info.java b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/package-info.java
index 6a09652dbf..7d2c7e857a 100644
--- a/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/package-info.java
+++ b/plugins/org.eclipse.net4j.db.jdbc/src/org/eclipse/net4j/db/jdbc/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2013 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) 2013 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 @@
  * These implementations are compatible with Java 1.5 at runtime.
  */
 package org.eclipse.net4j.db.jdbc;
-
diff --git a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
index e6fb65f275..f0374b07ab 100644
--- a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.db.mysql;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=
 Import-Package: com.mysql.jdbc;version="[5.0.0,6.0.0)";resolution:=optional,
  com.mysql.jdbc.jdbc2.optional;version="[5.0.0,6.0.0)";resolution:=optional,
  org.osgi.framework;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.net4j.db.internal.mysql.bundle;version="4.2.100";x-internal:=true,
- org.eclipse.net4j.db.mysql;version="4.2.100"
+Export-Package: org.eclipse.net4j.db.internal.mysql.bundle;version="4.2.200";x-internal:=true,
+ org.eclipse.net4j.db.mysql;version="4.2.200"
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
index dac44bcc94..214f34dbad 100644
--- a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
index c736afa340..9229d533ae 100644
--- a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
+++ b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
@@ -30,39 +30,41 @@ public class MYSQLAdapter extends DBAdapter
 
   public static final String VERSION = "5.1.5"; //$NON-NLS-1$
 
-  private static final String[] RESERVED_WORDS = {
-      "ACCESSIBLE", "ACTION", "ADD", "ALL", "ALTER", "ANALYZE", "AND", "AS", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "ASC", "ASENSITIVE", "BEFORE", "BETWEEN", "BIGINT", "BINARY", "BIT", "BLOB", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "BOTH", "BY", "CALL", "CASCADE", "CASE", "CHANGE", "CHAR", "CHARACTER", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "CHECK", "COLLATE", "COLUMN", "COLUMNS", "CONDITION", "CONNECTION", "CONSTRAINT", "CONTINUE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "CONVERT", "CREATE", "CROSS", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "DATABASE", "DATABASES", "DATE", "DAY_HOUR", "DAY_MICROSECOND", "DAY_MINUTE", "DAY_SECOND", "DEC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "DECIMAL", "DECLARE", "DEFAULT", "DELAYED", "DELETE", "DESC", "DESCRIBE", "DETERMINISTIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "DISTINCT", "DISTINCTROW", "DIV", "DOUBLE", "DROP", "DUAL", "EACH", "ELSE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "ELSEIF", "ENCLOSED", "ENUM", "ESCAPED", "EXISTS", "EXIT", "EXPLAIN", "FALSE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "FETCH", "FIELDS", "FLOAT", "FLOAT4", "FLOAT8", "FOR", "FORCE", "FOREIGN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "FROM", "FULLTEXT", "GENERAL", "GOTO", "GRANT", "GROUP", "HAVING", "HIGH_PRIORITY", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "HOUR_MICROSECOND", "HOUR_MINUTE", "HOUR_SECOND", "IF", "IGNORE", "IGNORE_SERVER_IDS", "IN", "INDEX", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "INFILE", "INNER", "INOUT", "INSENSITIVE", "INSERT", "INT", "INT1", "INT2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "INT3", "INT4", "INT8", "INTEGER", "INTERVAL", "INTO", "IS", "ITERATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "JOIN", "KEY", "KEYS", "KILL", "LABEL", "LEADING", "LEAVE", "LEFT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "LIKE", "LIMIT", "LINEAR", "LINES", "LOAD", "LOCALTIME", "LOCALTIMESTAMP", "LOCK", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "LONG", "LONGBLOB", "LONGTEXT", "LOOP", "LOW_PRIORITY", "MASTER_HEARTBEAT_PERIOD", "MASTER_SSL_VERIFY_SERVER_CERT", "MATCH", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "MAXVALUE", "MEDIUMBLOB", "MEDIUMINT", "MEDIUMTEXT", "MIDDLEINT", "MINUTE_MICROSECOND", "MINUTE_SECOND", "MOD", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "MODIFIES", "NATURAL", "NO", "NOT", "NO_WRITE_TO_BINLOG", "NULL", "NUMERIC", "ON", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "OPTIMIZE", "OPTION", "OPTIONALLY", "OR", "ORDER", "OUT", "OUTER", "OUTFILE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "PRECISION", "PRIMARY", "PRIVILEGES", "PROCEDURE", "PURGE", "RAID0", "RANGE", "READ", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "READS", "READ_WRITE", "REAL", "REFERENCES", "REGEXP", "RELEASE", "RENAME", "REPEAT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "REPLACE", "REQUIRE", "RESIGNAL", "RESTRICT", "RETURN", "REVOKE", "RIGHT", "RLIKE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "SCHEMA", "SCHEMAS", "SECOND_MICROSECOND", "SELECT", "SENSITIVE", "SEPARATOR", "SET", "SHOW", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "SIGNAL", "SLOW", "SMALLINT", "SONAME", "SPATIAL", "SPECIFIC", "SQL", "SQL_BIG_RESULT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "SQL_CALC_FOUND_ROWS", "SQLEXCEPTION", "SQL_SMALL_RESULT", "SQLSTATE", "SQLWARNING", "SSL", "STARTING", "STRAIGHT_JOIN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "TABLE", "TABLES", "TERMINATED", "TEXT", "THEN", "TIME", "TIMESTAMP", "TINYBLOB", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "TINYINT", "TINYTEXT", "TO", "TRAILING", "TRIGGER", "TRUE", "UNDO", "UNION", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "UNIQUE", "UNLOCK", "UNSIGNED", "UPDATE", "UPGRADE", "USAGE", "USE", "USING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "UTC_DATE", "UTC_TIME", "UTC_TIMESTAMP", "VALUES", "VARBINARY", "VARCHAR", "VARCHARACTER", "VARYING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "WHEN", "WHERE", "WHILE", "WITH", "WRITE", "X509", "XOR", "YEAR_MONTH", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "ZEROFILL" }; //$NON-NLS-1$
+  private static final String[] RESERVED_WORDS = { "ACCESSIBLE", "ACTION", "ADD", "ALL", "ALTER", "ANALYZE", "AND", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+      "AS", //$NON-NLS-1$
+    "ASC", "ASENSITIVE", "BEFORE", "BETWEEN", "BIGINT", "BINARY", "BIT", "BLOB", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "BOTH", "BY", "CALL", "CASCADE", "CASE", "CHANGE", "CHAR", "CHARACTER", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "CHECK", "COLLATE", "COLUMN", "COLUMNS", "CONDITION", "CONNECTION", "CONSTRAINT", "CONTINUE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "CONVERT", "CREATE", "CROSS", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "DATABASE", "DATABASES", "DATE", "DAY_HOUR", "DAY_MICROSECOND", "DAY_MINUTE", "DAY_SECOND", "DEC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "DECIMAL", "DECLARE", "DEFAULT", "DELAYED", "DELETE", "DESC", "DESCRIBE", "DETERMINISTIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "DISTINCT", "DISTINCTROW", "DIV", "DOUBLE", "DROP", "DUAL", "EACH", "ELSE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "ELSEIF", "ENCLOSED", "ENUM", "ESCAPED", "EXISTS", "EXIT", "EXPLAIN", "FALSE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "FETCH", "FIELDS", "FLOAT", "FLOAT4", "FLOAT8", "FOR", "FORCE", "FOREIGN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "FROM", "FULLTEXT", "GENERAL", "GOTO", "GRANT", "GROUP", "HAVING", "HIGH_PRIORITY", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "HOUR_MICROSECOND", "HOUR_MINUTE", "HOUR_SECOND", "IF", "IGNORE", "IGNORE_SERVER_IDS", "IN", "INDEX", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "INFILE", "INNER", "INOUT", "INSENSITIVE", "INSERT", "INT", "INT1", "INT2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "INT3", "INT4", "INT8", "INTEGER", "INTERVAL", "INTO", "IS", "ITERATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "JOIN", "KEY", "KEYS", "KILL", "LABEL", "LEADING", "LEAVE", "LEFT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "LIKE", "LIMIT", "LINEAR", "LINES", "LOAD", "LOCALTIME", "LOCALTIMESTAMP", "LOCK", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "LONG", "LONGBLOB", "LONGTEXT", "LOOP", "LOW_PRIORITY", "MASTER_HEARTBEAT_PERIOD", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+      "MASTER_SSL_VERIFY_SERVER_CERT", "MATCH", //$NON-NLS-1$ //$NON-NLS-2$
+    "MAXVALUE", "MEDIUMBLOB", "MEDIUMINT", "MEDIUMTEXT", "MIDDLEINT", "MINUTE_MICROSECOND", "MINUTE_SECOND", "MOD", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "MODIFIES", "NATURAL", "NO", "NOT", "NO_WRITE_TO_BINLOG", "NULL", "NUMERIC", "ON", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "OPTIMIZE", "OPTION", "OPTIONALLY", "OR", "ORDER", "OUT", "OUTER", "OUTFILE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "PRECISION", "PRIMARY", "PRIVILEGES", "PROCEDURE", "PURGE", "RAID0", "RANGE", "READ", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "READS", "READ_WRITE", "REAL", "REFERENCES", "REGEXP", "RELEASE", "RENAME", "REPEAT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "REPLACE", "REQUIRE", "RESIGNAL", "RESTRICT", "RETURN", "REVOKE", "RIGHT", "RLIKE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "SCHEMA", "SCHEMAS", "SECOND_MICROSECOND", "SELECT", "SENSITIVE", "SEPARATOR", "SET", "SHOW", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "SIGNAL", "SLOW", "SMALLINT", "SONAME", "SPATIAL", "SPECIFIC", "SQL", "SQL_BIG_RESULT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "SQL_CALC_FOUND_ROWS", "SQLEXCEPTION", "SQL_SMALL_RESULT", "SQLSTATE", "SQLWARNING", "SSL", "STARTING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+      "STRAIGHT_JOIN", //$NON-NLS-1$
+    "TABLE", "TABLES", "TERMINATED", "TEXT", "THEN", "TIME", "TIMESTAMP", "TINYBLOB", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "TINYINT", "TINYTEXT", "TO", "TRAILING", "TRIGGER", "TRUE", "UNDO", "UNION", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "UNIQUE", "UNLOCK", "UNSIGNED", "UPDATE", "UPGRADE", "USAGE", "USE", "USING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "UTC_DATE", "UTC_TIME", "UTC_TIMESTAMP", "VALUES", "VARBINARY", "VARCHAR", "VARCHARACTER", "VARYING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "WHEN", "WHERE", "WHILE", "WITH", "WRITE", "X509", "XOR", "YEAR_MONTH", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+  "ZEROFILL" }; //$NON-NLS-1$
 
   public MYSQLAdapter()
   {
diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/package-info.java b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/package-info.java
index 30f0583b98..7d19bbe0f8 100644
--- a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/package-info.java
+++ b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * The Net4j DB Framework support for MYSQL databases.
  */
 package org.eclipse.net4j.db.mysql;
-
diff --git a/plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF
index 4a8812d9d1..fd6b8c178f 100644
--- a/plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.oracle/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.db.oracle;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,6 +14,6 @@ Import-Package: oracle.jdbc;resolution:=optional,
  oracle.jdbc.driver;resolution:=optional,
  oracle.jdbc.pool;resolution:=optional,
  org.osgi.framework;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.net4j.db.oracle;version="1.1.0",
- org.eclipse.net4j.db.oracle.internal.bundle;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.net4j.db.oracle;version="1.1.100",
+ org.eclipse.net4j.db.oracle.internal.bundle;version="1.1.100";x-internal:=true
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.oracle/src/org/eclipse/net4j/db/oracle/OracleAdapter.java b/plugins/org.eclipse.net4j.db.oracle/src/org/eclipse/net4j/db/oracle/OracleAdapter.java
index 89d752e4b3..47d854ae27 100644
--- a/plugins/org.eclipse.net4j.db.oracle/src/org/eclipse/net4j/db/oracle/OracleAdapter.java
+++ b/plugins/org.eclipse.net4j.db.oracle/src/org/eclipse/net4j/db/oracle/OracleAdapter.java
@@ -11,8 +11,6 @@
  */
 package org.eclipse.net4j.db.oracle;
 
-import oracle.jdbc.pool.OracleDataSource;
-
 import org.eclipse.net4j.db.DBType;
 import org.eclipse.net4j.db.DBUtil;
 import org.eclipse.net4j.db.IDBConnectionProvider;
@@ -31,6 +29,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import oracle.jdbc.pool.OracleDataSource;
+
 public class OracleAdapter extends DBAdapter
 {
   public static final String NAME = "oracle"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.net4j.db.postgresql/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.postgresql/META-INF/MANIFEST.MF
index 502fee1432..e0e830dc35 100644
--- a/plugins/org.eclipse.net4j.db.postgresql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.postgresql/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.postgresql;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
 Import-Package: org.postgresql;version="[9.0.0,10.0.0)";resolution:=optional,
  org.postgresql.ds;version="[9.0.0,10.0.0)";resolution:=optional,
  org.postgresql.ds.common;version="[9.0.0,10.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.db.internal.postgresql.bundle;version="4.2.100";x-internal:=true,
- org.eclipse.net4j.db.postgresql;version="4.2.100"
+Export-Package: org.eclipse.net4j.db.internal.postgresql.bundle;version="4.2.200";x-internal:=true,
+ org.eclipse.net4j.db.postgresql;version="4.2.200"
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/internal/postgresql/bundle/OM.java b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/internal/postgresql/bundle/OM.java
index 498db08d63..9ce35d8469 100644
--- a/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/internal/postgresql/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/internal/postgresql/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Victor Roldan Betancort
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java
index 3eaedac099..51a646a8c4 100644
--- a/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java
+++ b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/PostgreSQLAdapter.java
@@ -38,17 +38,17 @@ public class PostgreSQLAdapter extends DBAdapter
   // private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SQL, DBAdapter.class);
 
   private static final String[] RESERVED_WORDS = { "ALL", "ANALYSE", "ANALYZE", "AND", "ANY", "AS", "ASC", "ATOMIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "AUTHORIZATION", "BETWEEN", "BIGINT", "BINARY", "BIT", "BOOLEAN", "BOTH", "C", "CASE", "CAST", "CHAR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "CHARACTER", "CHECK", "COALESCE", "COLLATE", "COLUMN", "CONSTRAINT", "CONVERT", "CREATE", "CROSS", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "DEC", "DECIMAL", "DEFAULT", "DEFERRABLE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "DESC", "DISTINCT", "DO", "ELSE", "END", "EXCEPT", "EXECUTE", "EXISTS", "EXTRACT", "FALSE", "FLOAT", "FOR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "FOREIGN", "FREEZE", "FROM", "FULL", "GRANT", "GROUP", "HAVING", "ILIKE", "IN", "INITIALLY", "INNER", "INT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "INTEGER", "INTERSECT", "INTERVAL", "INTO", "IS", "ISNULL", "JOIN", "LEADING", "LEFT", "LIKE", "LIMIT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "LOCALTIME", "LOCALTIMESTAMP", "NATURAL", "NCHAR", "NCLOB", "NEW", "NONE", "NOT", "NOTNULL", "NULL", "NULLIF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "NUMERIC", "OFF", "OFFSET", "OLD", "ON", "ONLY", "OR", "ORDER", "OUTER", "OVERLAPS", "OVERLAY", "PLACING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "POSITION", "PRIMARY", "REAL", "RECHECK", "REFERENCES", "RIGHT", "ROW", "SELECT", "SESSION_USER", "SETOF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "SIMILAR", "SMALLINT", "SOME", "SUBSTRING", "TABLE", "THEN", "TIME", "TIMESTAMP", "TO", "TRAILING", "TREAT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "TRIM", "TRUE", "UNION", "UNIQUE", "USER", "USING", "VARCHAR", "VERBOSE", "WHEN", "WHERE" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "AUTHORIZATION", "BETWEEN", "BIGINT", "BINARY", "BIT", "BOOLEAN", "BOTH", "C", "CASE", "CAST", "CHAR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "CHARACTER", "CHECK", "COALESCE", "COLLATE", "COLUMN", "CONSTRAINT", "CONVERT", "CREATE", "CROSS", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+    "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "DEC", "DECIMAL", "DEFAULT", "DEFERRABLE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "DESC", "DISTINCT", "DO", "ELSE", "END", "EXCEPT", "EXECUTE", "EXISTS", "EXTRACT", "FALSE", "FLOAT", "FOR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "FOREIGN", "FREEZE", "FROM", "FULL", "GRANT", "GROUP", "HAVING", "ILIKE", "IN", "INITIALLY", "INNER", "INT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "INTEGER", "INTERSECT", "INTERVAL", "INTO", "IS", "ISNULL", "JOIN", "LEADING", "LEFT", "LIKE", "LIMIT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "LOCALTIME", "LOCALTIMESTAMP", "NATURAL", "NCHAR", "NCLOB", "NEW", "NONE", "NOT", "NOTNULL", "NULL", "NULLIF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "NUMERIC", "OFF", "OFFSET", "OLD", "ON", "ONLY", "OR", "ORDER", "OUTER", "OVERLAPS", "OVERLAY", "PLACING", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "POSITION", "PRIMARY", "REAL", "RECHECK", "REFERENCES", "RIGHT", "ROW", "SELECT", "SESSION_USER", "SETOF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "SIMILAR", "SMALLINT", "SOME", "SUBSTRING", "TABLE", "THEN", "TIME", "TIMESTAMP", "TO", "TRAILING", "TREAT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "TRIM", "TRUE", "UNION", "UNIQUE", "USER", "USING", "VARCHAR", "VERBOSE", "WHEN", "WHERE" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
 
   public PostgreSQLAdapter()
   {
diff --git a/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/package-info.java b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/package-info.java
index 9cc631c216..adde8939a2 100644
--- a/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/package-info.java
+++ b/plugins/org.eclipse.net4j.db.postgresql/src/org/eclipse/net4j/db/postgresql/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * The Net4j DB Framework support for PostgreSQL databases.
  */
 package org.eclipse.net4j.db.postgresql;
-
diff --git a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
index 83d6908d1e..77c263a403 100644
--- a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.db.tests
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -27,5 +27,5 @@ Import-Package: org.h2;version="[1.0.0,2.0.0)";resolution:=optional,
  com.mysql.jdbc.jdbc2.optional;version="[5.1.0,6.0.0)";resolution:=optional,
  org.apache.derby.jdbc;version="[10.0.0,11.0.0)";resolution:=optional,
  org.hsqldb.jdbc;version="[2.0.0,3.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.db.tests;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.db.tests.bundle;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.net4j.db.tests;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.db.tests.bundle;version="4.0.400";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/MysqlTest.java b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/MysqlTest.java
index c65f2e7098..9f7ef003df 100644
--- a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/MysqlTest.java
+++ b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/MysqlTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java
index ee8514fe8a..f93e2074b3 100644
--- a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java
+++ b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java
@@ -31,22 +31,22 @@ public class TestSchema
   public static final IDBTable REPOSITORY = INSTANCE.addTable("cdo_repository");
 
   public static final IDBField REPOSITORY_NAME = //
-  REPOSITORY.addField("name", DBType.VARCHAR, 255);
+      REPOSITORY.addField("name", DBType.VARCHAR, 255);
 
   public static final IDBField REPOSITORY_UUID = //
-  REPOSITORY.addField("uuid", DBType.VARCHAR, 64);
+      REPOSITORY.addField("uuid", DBType.VARCHAR, 64);
 
   public static final IDBField REPOSITORY_STARTS = //
-  REPOSITORY.addField("starts", DBType.BIGINT);
+      REPOSITORY.addField("starts", DBType.BIGINT);
 
   public static final IDBField REPOSITORY_STARTED = //
-  REPOSITORY.addField("started", DBType.BIGINT);
+      REPOSITORY.addField("started", DBType.BIGINT);
 
   public static final IDBField REPOSITORY_STOPPED = //
-  REPOSITORY.addField("stopped", DBType.BIGINT);
+      REPOSITORY.addField("stopped", DBType.BIGINT);
 
   public static final IDBField REPOSITORY_NEXT_CDOID = //
-  REPOSITORY.addField("next_cdoid", DBType.BIGINT);
+      REPOSITORY.addField("next_cdoid", DBType.BIGINT);
 
   /**
    * DBTable cdo_packages
@@ -54,31 +54,31 @@ public class TestSchema
   public static final IDBTable PACKAGES = INSTANCE.addTable("cdo_packages");
 
   public static final IDBField PACKAGES_ID = //
-  PACKAGES.addField("id", DBType.INTEGER);
+      PACKAGES.addField("id", DBType.INTEGER);
 
   public static final IDBField PACKAGES_URI = //
-  PACKAGES.addField("uri", DBType.VARCHAR, 255);
+      PACKAGES.addField("uri", DBType.VARCHAR, 255);
 
   public static final IDBField PACKAGES_NAME = //
-  PACKAGES.addField("name", DBType.VARCHAR, 255);
+      PACKAGES.addField("name", DBType.VARCHAR, 255);
 
   public static final IDBField PACKAGES_ECORE = //
-  PACKAGES.addField("ecore", DBType.CLOB);
+      PACKAGES.addField("ecore", DBType.CLOB);
 
   public static final IDBField PACKAGES_DYNAMIC = //
-  PACKAGES.addField("dynamic", DBType.BOOLEAN);
+      PACKAGES.addField("dynamic", DBType.BOOLEAN);
 
   public static final IDBField PACKAGES_RANGE_LB = //
-  PACKAGES.addField("range_lb", DBType.BIGINT);
+      PACKAGES.addField("range_lb", DBType.BIGINT);
 
   public static final IDBField PACKAGES_RANGE_UB = //
-  PACKAGES.addField("range_ub", DBType.BIGINT);
+      PACKAGES.addField("range_ub", DBType.BIGINT);
 
   public static final IDBIndex INDEX_PACKAGES_PK = //
-  PACKAGES.addIndex(IDBIndex.Type.PRIMARY_KEY, PACKAGES_ID);
+      PACKAGES.addIndex(IDBIndex.Type.PRIMARY_KEY, PACKAGES_ID);
 
   public static final IDBIndex INDEX_PACKAGES_URI = //
-  PACKAGES.addIndex(IDBIndex.Type.UNIQUE, PACKAGES_URI);
+      PACKAGES.addIndex(IDBIndex.Type.UNIQUE, PACKAGES_URI);
 
   /**
    * DBTable cdo_classes
@@ -86,22 +86,22 @@ public class TestSchema
   public static final IDBTable CLASSES = INSTANCE.addTable("cdo_classes");
 
   public static final IDBField CLASSES_ID = //
-  CLASSES.addField("id", DBType.INTEGER);
+      CLASSES.addField("id", DBType.INTEGER);
 
   public static final IDBField CLASSES_PACKAGE = //
-  CLASSES.addField("package", DBType.INTEGER);
+      CLASSES.addField("package", DBType.INTEGER);
 
   public static final IDBField CLASSES_CLASSIFIER = //
-  CLASSES.addField("classifier", DBType.INTEGER);
+      CLASSES.addField("classifier", DBType.INTEGER);
 
   public static final IDBField CLASSES_NAME = //
-  CLASSES.addField("name", DBType.VARCHAR, 255);
+      CLASSES.addField("name", DBType.VARCHAR, 255);
 
   public static final IDBField CLASSES_ABSTRACT = //
-  CLASSES.addField("abstract", DBType.BOOLEAN);
+      CLASSES.addField("abstract", DBType.BOOLEAN);
 
   public static final IDBIndex INDEX_CLASSES_PK = //
-  CLASSES.addIndex(IDBIndex.Type.PRIMARY_KEY, CLASSES_ID);
+      CLASSES.addIndex(IDBIndex.Type.PRIMARY_KEY, CLASSES_ID);
 
   /**
    * DBTable cdo_supertypes
@@ -109,16 +109,16 @@ public class TestSchema
   public static final IDBTable SUPERTYPES = INSTANCE.addTable("cdo_supertypes");
 
   public static final IDBField SUPERTYPES_TYPE = //
-  SUPERTYPES.addField("type_id", DBType.INTEGER);
+      SUPERTYPES.addField("type_id", DBType.INTEGER);
 
   public static final IDBField SUPERTYPES_SUPERTYPE_PACKAGE = //
-  SUPERTYPES.addField("supertype_package", DBType.VARCHAR, 255);
+      SUPERTYPES.addField("supertype_package", DBType.VARCHAR, 255);
 
   public static final IDBField SUPERTYPES_SUPERTYPE_CLASSIFIER = //
-  SUPERTYPES.addField("supertype_classifier", DBType.INTEGER);
+      SUPERTYPES.addField("supertype_classifier", DBType.INTEGER);
 
   public static final IDBIndex INDEX_SUPERTYPES_PK = //
-  SUPERTYPES.addIndex(IDBIndex.Type.PRIMARY_KEY, SUPERTYPES_TYPE);
+      SUPERTYPES.addIndex(IDBIndex.Type.PRIMARY_KEY, SUPERTYPES_TYPE);
 
   /**
    * DBTable cdo_features
@@ -126,37 +126,37 @@ public class TestSchema
   public static final IDBTable FEATURES = INSTANCE.addTable("cdo_features");
 
   public static final IDBField FEATURES_ID = //
-  FEATURES.addField("id", DBType.INTEGER);
+      FEATURES.addField("id", DBType.INTEGER);
 
   public static final IDBField FEATURES_CLASS = //
-  FEATURES.addField("class", DBType.INTEGER);
+      FEATURES.addField("class", DBType.INTEGER);
 
   public static final IDBField FEATURES_FEATURE = //
-  FEATURES.addField("feature", DBType.INTEGER);
+      FEATURES.addField("feature", DBType.INTEGER);
 
   public static final IDBField FEATURES_NAME = //
-  FEATURES.addField("name", DBType.VARCHAR, 255);
+      FEATURES.addField("name", DBType.VARCHAR, 255);
 
   public static final IDBField FEATURES_TYPE = //
-  FEATURES.addField("type", DBType.INTEGER);
+      FEATURES.addField("type", DBType.INTEGER);
 
   public static final IDBField FEATURES_REFERENCE_PACKAGE = //
-  FEATURES.addField("reference_package", DBType.VARCHAR, 255);
+      FEATURES.addField("reference_package", DBType.VARCHAR, 255);
 
   public static final IDBField FEATURES_REFERENCE_CLASSIFIER = //
-  FEATURES.addField("reference_classifier", DBType.INTEGER);
+      FEATURES.addField("reference_classifier", DBType.INTEGER);
 
   public static final IDBField FEATURES_MANY = //
-  FEATURES.addField("many", DBType.BOOLEAN);
+      FEATURES.addField("many", DBType.BOOLEAN);
 
   public static final IDBField FEATURES_CONTAINMENT = //
-  FEATURES.addField("containment", DBType.BOOLEAN);
+      FEATURES.addField("containment", DBType.BOOLEAN);
 
   public static final IDBField FEATURES_INDEX = //
-  FEATURES.addField("idx", DBType.INTEGER);
+      FEATURES.addField("idx", DBType.INTEGER);
 
   public static final IDBIndex INDEX_FEATURES_PK = //
-  FEATURES.addIndex(IDBIndex.Type.PRIMARY_KEY, FEATURES_ID);
+      FEATURES.addIndex(IDBIndex.Type.PRIMARY_KEY, FEATURES_ID);
 
   /**
    * Name of object table
diff --git a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/bundle/Activator.java b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/bundle/Activator.java
index e212aaf7b0..edbf5ba2bf 100644
--- a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/bundle/Activator.java
+++ b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/bundle/Activator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBException.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBException.java
index d7e08db6a9..435b456d18 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBException.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBException.java
@@ -17,7 +17,7 @@ import java.sql.SQLException;
 /**
  * A {@link RuntimeException runtime exception} thrown to indicate problems with a database, frequently used to wrap
  * checked {@link SQLException SQL exceptions}.
- * 
+ *
  * @author Eike Stepper
  */
 public class DBException extends RuntimeException
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java
index 52cefc6b95..18d432c157 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java
@@ -844,8 +844,8 @@ public enum DBType
   /**
    * @since 4.1
    */
-  public abstract Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column, boolean canBeNull)
-      throws SQLException, IOException;
+  public abstract Object writeValueWithResult(ExtendedDataOutput out, ResultSet resultSet, int column,
+      boolean canBeNull) throws SQLException, IOException;
 
   /**
    * @since 3.0
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
index 0918d52bc7..90a3f88899 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
@@ -59,8 +59,8 @@ public final class DBUtil
   /**
    * @since 4.2
    */
-  public static final int MAX_BATCH_SIZE = Integer.parseInt(OMPlatform.INSTANCE.getProperty(
-      "org.eclipse.net4j.db.MAX_BATCH_SIZE", "2000"));
+  public static final int MAX_BATCH_SIZE = Integer
+      .parseInt(OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.db.MAX_BATCH_SIZE", "2000"));
 
   /**
    * A system property to enable noisy close, i.e. exception catch in close methods are thrown as {@link DBException} exception.
@@ -69,8 +69,8 @@ public final class DBUtil
    */
   public static final String PROP_ENABLE_NOISY_CLOSE = "org.eclipse.net4j.db.close.noisy";
 
-  private static final boolean isNoisyCloseEnabled = Boolean.valueOf(OMPlatform.INSTANCE.getProperty(
-      PROP_ENABLE_NOISY_CLOSE, Boolean.FALSE.toString()));
+  private static final boolean isNoisyCloseEnabled = Boolean
+      .valueOf(OMPlatform.INSTANCE.getProperty(PROP_ENABLE_NOISY_CLOSE, Boolean.FALSE.toString()));
 
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SQL, DBUtil.class);
 
@@ -188,7 +188,8 @@ public final class DBUtil
   /**
    * @since 4.2
    */
-  public static IDBDatabase openDatabase(IDBAdapter adapter, IDBConnectionProvider connectionProvider, String schemaName)
+  public static IDBDatabase openDatabase(IDBAdapter adapter, IDBConnectionProvider connectionProvider,
+      String schemaName)
   {
     return openDatabase(adapter, connectionProvider, schemaName, false);
   }
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider.java
index 875a44d882..23d4f69384 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import java.sql.Connection;
 
 /**
  * Provides a database {@link Connection connection}, roughly comparable with a {@link DataSource data source}.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IDBConnectionProvider
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider2.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider2.java
index e300f9deaa..905e04078b 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider2.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBConnectionProvider2.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import java.sql.Connection;
 
 /**
  * Provides a database {@link Connection connection}, roughly comparable with a {@link DataSource data source}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.3
  */
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBPreparedStatement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBPreparedStatement.java
index e1755a9534..8bc19816d9 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBPreparedStatement.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBPreparedStatement.java
@@ -28,7 +28,7 @@ public interface IDBPreparedStatement extends Comparable<IDBPreparedStatement>,
   public IDBConnection getConnection() throws SQLException;
 
   /**
-   * @deprecated As of 4.3 use {@link #getConnection()}.  
+   * @deprecated As of 4.3 use {@link #getConnection()}.
    */
   @Deprecated
   public IDBConnection getTransaction();
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBRowHandler.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBRowHandler.java
index 9c22239d0c..f0f8404c0c 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBRowHandler.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBRowHandler.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.db;
 
 /**
  * Call-back that handles the values of, for example, a row in a database table.
- * 
+ *
  * @see DBUtil#select(java.sql.Connection, IDBRowHandler, String, org.eclipse.net4j.db.ddl.IDBField...)
  * @author Eike Stepper
  */
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBSchemaTransaction.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBSchemaTransaction.java
index 895a30afe4..869391956e 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBSchemaTransaction.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/IDBSchemaTransaction.java
@@ -27,7 +27,7 @@ import org.eclipse.net4j.util.collection.Closeable;
 public interface IDBSchemaTransaction extends Closeable
 {
   public static final Policy DEFAULT_ENSURE_SCHEMA_POLICY = //
-  new IDBDeltaVisitor.Filter.Policy().allow(DeltaType.SCHEMA, ChangeKind.CHANGE).allow(ChangeKind.ADD).freeze();
+      new IDBDeltaVisitor.Filter.Policy().allow(DeltaType.SCHEMA, ChangeKind.CHANGE).allow(ChangeKind.ADD).freeze();
 
   public IDBDatabase getDatabase();
 
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/IDBDeltaVisitor.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/IDBDeltaVisitor.java
index 99af8918df..89e3afc779 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/IDBDeltaVisitor.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/IDBDeltaVisitor.java
@@ -343,8 +343,8 @@ public interface IDBDeltaVisitor
   }
 
   /**
-     * @author Eike Stepper
-     */
+   * @author Eike Stepper
+   */
   public static class Filter extends Default
   {
     public static final Policy DEFAULT_POLICY = new Policy().allowAll().freeze();
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/package-info.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/package-info.java
index cdb9973585..e9f0721a4b 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/package-info.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/delta/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2013 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) 2013 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
  */
 
 /**
  * The Net4j DB framework concepts for the abstraction of schema deltas.
  */
 package org.eclipse.net4j.db.ddl.delta;
-
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/package-info.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/package-info.java
index dbdf4ac99c..8909bcbfe5 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/package-info.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * The Net4j DB framework concepts for the abstraction of the SQL data definition language.
  */
 package org.eclipse.net4j.db.ddl;
-
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/package-info.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/package-info.java
index 8f88492738..9bd5d81942 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/package-info.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/dml/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * The Net4j DB framework concepts for the abstraction of the SQL data manipulation language.
  */
 package org.eclipse.net4j.db.dml;
-
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/package-info.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/package-info.java
index 1d89bb38bc..10611cef7a 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/package-info.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * The Net4j DB framework.
  */
 package org.eclipse.net4j.db;
-
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java
index cb846fac5b..4ef5bab65e 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java
index 50b5adab41..f6ab107b10 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java
index 5d6330e5da..d69de4b502 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java
@@ -158,8 +158,7 @@ public final class DBConnection extends DelegatingConnection implements IDBConne
   }
 
   @Override
-  public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
-      throws SQLException
+  public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException
   {
     return prepareStatement(sql, resultSetType, resultSetConcurrency, ReuseProbability.LOW);
   }
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBDatabase.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBDatabase.java
index 4bb00c09b1..f46c94565b 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBDatabase.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBDatabase.java
@@ -33,7 +33,7 @@ import java.util.LinkedList;
 /**
  * @author Eike Stepper
  */
-public final class DBDatabase extends SetContainer<IDBConnection> implements IDBDatabase
+public final class DBDatabase extends SetContainer<IDBConnection>implements IDBDatabase
 {
   private DBAdapter adapter;
 
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBResultSet.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBResultSet.java
index aeb96a0361..947edaa0dc 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBResultSet.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBResultSet.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java
index 0d9de51140..15cc0a9268 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
index 05d682737d..c668e6ae57 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.Platform;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
@@ -68,7 +68,7 @@ public abstract class OM
         if ("dbAdapter".equals(element.getName())) //$NON-NLS-1$
         {
           DBAdapterDescriptor descriptor = new DBAdapterDescriptor(element.getAttribute("name")) //$NON-NLS-1$
-          {
+              {
             @Override
             public IDBAdapter createDBAdapter()
             {
@@ -82,9 +82,9 @@ public abstract class OM
                 return null;
               }
             }
-          };
+              };
 
-          DBAdapterRegistry.INSTANCE.addDescriptor(descriptor);
+              DBAdapterRegistry.INSTANCE.addDescriptor(descriptor);
         }
       }
     }
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java
index 04e168229a..6b7594d8ef 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBField.java
@@ -294,7 +294,7 @@ public class DBField extends DBSchemaElement implements InternalDBField
       TRACK_CONSTRUCTION.remove();
     }
   }
-  
+
   public static boolean isTrackConstruction()
   {
     return TRACK_CONSTRUCTION.get();
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
index cd13bd1dd2..8a84760514 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBIndex.java
@@ -43,8 +43,8 @@ public class DBIndex extends DBSchemaElement implements InternalDBIndex
 
   public static final ThreadLocal<Set<IDBField>> NULLABLE_INDEX_FIELDS = new InheritableThreadLocal<Set<IDBField>>();
 
-  private static final boolean DISABLE_NULLABLE_CHECK = Boolean.parseBoolean(OMPlatform.INSTANCE.getProperty(
-      "org.eclipse.net4j.db.DisableNullableCheck", "true"));
+  private static final boolean DISABLE_NULLABLE_CHECK = Boolean
+      .parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.db.DisableNullableCheck", "true"));
 
   private static final long serialVersionUID = 1L;
 
@@ -128,7 +128,9 @@ public class DBIndex extends DBSchemaElement implements InternalDBIndex
       {
         Exception constructionStackTrace = ((InternalDBField)field).getConstructionStackTrace();
         throw new DBException(
-            "Index field is nullable: " + field + " (to disable this check run with '-Dorg.eclipse.net4j.db.DisableNullableCheck=true')", constructionStackTrace); //$NON-NLS-1$
+            "Index field is nullable: " + field //$NON-NLS-1$
+                + " (to disable this check run with '-Dorg.eclipse.net4j.db.DisableNullableCheck=true')",
+            constructionStackTrace);
       }
 
       Set<IDBField> nullableIndexFields = NULLABLE_INDEX_FIELDS.get();
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java
index c5cfc1cc88..4dfa4c7cb8 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java
@@ -68,8 +68,8 @@ public class DBSchema extends DBSchemaElement implements InternalDBSchema
 
       for (IDBField sourceField : sourceTable.getFields())
       {
-        table.addField(sourceField.getName(), sourceField.getType(), sourceField.getPrecision(),
-            sourceField.getScale(), sourceField.isNotNull());
+        table.addField(sourceField.getName(), sourceField.getType(), sourceField.getPrecision(), sourceField.getScale(),
+            sourceField.isNotNull());
       }
 
       for (IDBIndex sourceIndex : sourceTable.getIndices())
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBFieldDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBFieldDelta.java
index e9eb5232d1..de372eba6b 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBFieldDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBFieldDelta.java
@@ -56,24 +56,24 @@ public final class DBFieldDelta extends DBDeltaWithPosition implements IDBFieldD
     Integer oldScale = oldField == null ? null : oldField.getScale();
     if (!ObjectUtil.equals(scale, oldScale))
     {
-      addPropertyDelta(new DBPropertyDelta<Integer>(this, SCALE_PROPERTY, IDBPropertyDelta.Type.INTEGER, scale,
-          oldScale));
+      addPropertyDelta(
+          new DBPropertyDelta<Integer>(this, SCALE_PROPERTY, IDBPropertyDelta.Type.INTEGER, scale, oldScale));
     }
 
     Boolean notNull = field == null ? null : field.isNotNull();
     Boolean oldNotNull = oldField == null ? null : oldField.isNotNull();
     if (!ObjectUtil.equals(notNull, oldNotNull))
     {
-      addPropertyDelta(new DBPropertyDelta<Boolean>(this, NOT_NULL_PROPERTY, IDBPropertyDelta.Type.BOOLEAN, notNull,
-          oldNotNull));
+      addPropertyDelta(
+          new DBPropertyDelta<Boolean>(this, NOT_NULL_PROPERTY, IDBPropertyDelta.Type.BOOLEAN, notNull, oldNotNull));
     }
 
     Integer position = field == null ? null : field.getPosition();
     Integer oldPosition = oldField == null ? null : oldField.getPosition();
     if (!ObjectUtil.equals(position, oldPosition))
     {
-      addPropertyDelta(new DBPropertyDelta<Integer>(this, POSITION_PROPERTY, IDBPropertyDelta.Type.INTEGER, position,
-          oldPosition));
+      addPropertyDelta(
+          new DBPropertyDelta<Integer>(this, POSITION_PROPERTY, IDBPropertyDelta.Type.INTEGER, position, oldPosition));
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexDelta.java
index ca401cb962..51ee8f0603 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexDelta.java
@@ -51,8 +51,8 @@ public final class DBIndexDelta extends DBDeltaWithProperties implements IDBInde
     IDBIndex.Type oldType = oldIndex == null ? null : oldIndex.getType();
     if (!ObjectUtil.equals(type, oldType))
     {
-      addPropertyDelta(new DBPropertyDelta<IDBIndex.Type>(this, TYPE_PROPERTY, IDBPropertyDelta.Type.STRING, type,
-          oldType));
+      addPropertyDelta(
+          new DBPropertyDelta<IDBIndex.Type>(this, TYPE_PROPERTY, IDBPropertyDelta.Type.STRING, type, oldType));
     }
 
     IDBIndexField[] indexFields = index == null ? InternalDBIndex.NO_INDEX_FIELDS : index.getIndexFields();
@@ -137,8 +137,8 @@ public final class DBIndexDelta extends DBDeltaWithProperties implements IDBInde
   @Override
   public String toString()
   {
-    return MessageFormat.format("DBIndexDelta[name={0}, kind={1}, propertyDeltas={2}, indexFieldDeltas={3}]",
-        getName(), getChangeKind(), getPropertyDeltas().values(), indexFieldDeltas.values());
+    return MessageFormat.format("DBIndexDelta[name={0}, kind={1}, propertyDeltas={2}, indexFieldDeltas={3}]", getName(),
+        getChangeKind(), getPropertyDeltas().values(), indexFieldDeltas.values());
   }
 
   public void addIndexFieldDelta(DBIndexFieldDelta indexFieldDelta)
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexFieldDelta.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexFieldDelta.java
index d33c71885c..3a7c235ceb 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexFieldDelta.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/delta/DBIndexFieldDelta.java
@@ -40,8 +40,8 @@ public final class DBIndexFieldDelta extends DBDeltaWithPosition implements IDBI
     Integer oldPosition = oldIndexField == null ? null : oldIndexField.getPosition();
     if (!ObjectUtil.equals(position, oldPosition))
     {
-      addPropertyDelta(new DBPropertyDelta<Integer>(this, POSITION_PROPERTY, IDBPropertyDelta.Type.INTEGER, position,
-          oldPosition));
+      addPropertyDelta(
+          new DBPropertyDelta<Integer>(this, POSITION_PROPERTY, IDBPropertyDelta.Type.INTEGER, position, oldPosition));
     }
   }
 
@@ -77,8 +77,8 @@ public final class DBIndexFieldDelta extends DBDeltaWithPosition implements IDBI
   @Override
   public String toString()
   {
-    return MessageFormat.format("DBIndexFieldDelta[name={0}, kind={1}, propertyDeltas={2}]", getName(),
-        getChangeKind(), getPropertyDeltas().values());
+    return MessageFormat.format("DBIndexFieldDelta[name={0}, kind={1}, propertyDeltas={2}]", getName(), getChangeKind(),
+        getPropertyDeltas().values());
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
index a914c14822..ae939543af 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
@@ -59,38 +59,38 @@ public abstract class DBAdapter implements IDBAdapter
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SQL, DBAdapter.class);
 
   private static final String[] SQL92_RESERVED_WORDS = { "ABSOLUTE", "ACTION", "ADD", "AFTER", "ALL", "ALLOCATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-      "ALTER", "AND", "ANY", "ARE", "ARRAY", "AS", "ASC", "ASENSITIVE", "ASSERTION", "ASYMMETRIC", "AT", "ATOMIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "AUTHORIZATION", "AVG", "BEFORE", "BEGIN", "BETWEEN", "BIGINT", "BINARY", "BIT", "BIT_LENGTH", "BLOB", "BOOLEAN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "BOTH", "BREADTH", "BY", "CALL", "CALLED", "CASCADE", "CASCADED", "CASE", "CAST", "CATALOG", "CHAR", "CHARACTER", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "CHARACTER_LENGTH", "CHAR_LENGTH", "CHECK", "CLOB", "CLOSE", "COALESCE", "COLLATE", "COLLATION", "COLUMN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "COMMIT", "CONDITION", "CONNECT", "CONNECTION", "CONSTRAINT", "CONSTRAINTS", "CONSTRUCTOR", "CONTAINS", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "CONTINUE", "CONVERT", "CORRESPONDING", "COUNT", "CREATE", "CROSS", "CUBE", "CURRENT", "CURRENT_DATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "CURRENT_DEFAULT_TRANSFORM_GROUP", "CURRENT_PATH", "CURRENT_ROLE", "CURRENT_TIME", "CURRENT_TIMESTAMP", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-      "CURRENT_TRANSFORM_GROUP_FOR_TYPE", "CURRENT_USER", "CURSOR", "CYCLE", "DATA", "DATE", "DAY", "DEALLOCATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-      "DEC", "DECIMAL", "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "DELETE", "DEPTH", "DEREF", "DESC", "DESCRIBE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "DESCRIPTOR", "DETERMINISTIC", "DIAGNOSTICS", "DISCONNECT", "DISTINCT", "DO", "DOMAIN", "DOUBLE", "DROP", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "DYNAMIC", "EACH", "ELEMENT", "ELSE", "ELSEIF", "END", "EQUALS", "ESCAPE", "EXCEPT", "EXCEPTION", "EXEC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "EXECUTE", "EXISTS", "EXIT", "EXTERNAL", "EXTRACT", "FALSE", "FETCH", "FILTER", "FIRST", "FLOAT", "FOR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "FOREIGN", "FOUND", "FREE", "FROM", "FULL", "FUNCTION", "GENERAL", "GET", "GLOBAL", "GO", "GOTO", "GRANT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "GROUP", "GROUPING", "HANDLER", "HAVING", "HOLD", "HOUR", "IDENTITY", "IF", "IMMEDIATE", "IN", "INDICATOR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "INITIALLY", "INNER", "INOUT", "INPUT", "INSENSITIVE", "INSERT", "INT", "INTEGER", "INTERSECT", "INTERVAL", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "INTO", "IS", "ISOLATION", "ITERATE", "JOIN", "KEY", "LANGUAGE", "LARGE", "LAST", "LATERAL", "LEADING", "LEAVE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "LEFT", "LEVEL", "LIKE", "LOCAL", "LOCALTIME", "LOCALTIMESTAMP", "LOCATOR", "LOOP", "LOWER", "MAP", "MATCH", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "MAX", "MEMBER", "MERGE", "METHOD", "MIN", "MINUTE", "MODIFIES", "MODULE", "MONTH", "MULTISET", "NAMES", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "NATIONAL", "NATURAL", "NCHAR", "NCLOB", "NEW", "NEXT", "NO", "NONE", "NOT", "NULL", "NULLIF", "NUMERIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "OBJECT", "OCTET_LENGTH", "OF", "OLD", "ON", "ONLY", "OPEN", "OPTION", "OR", "ORDER", "ORDINALITY", "OUT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "OUTER", "OUTPUT", "OVER", "OVERLAPS", "PAD", "PARAMETER", "PARTIAL", "PARTITION", "PATH", "POSITION", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "PRECISION", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", "PROCEDURE", "PUBLIC", "RANGE", "READ", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "READS", "REAL", "RECURSIVE", "REF", "REFERENCES", "REFERENCING", "RELATIVE", "RELEASE", "REPEAT", "RESIGNAL", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "RESTRICT", "RESULT", "RETURN", "RETURNS", "REVOKE", "RIGHT", "ROLE", "ROLLBACK", "ROLLUP", "ROUTINE", "ROW", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "ROWS", "SAVEPOINT", "SCHEMA", "SCOPE", "SCROLL", "SEARCH", "SECOND", "SECTION", "SELECT", "SENSITIVE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-      "SESSION", "SESSION_USER", "SET", "SETS", "SIGNAL", "SIMILAR", "SIZE", "SMALLINT", "SOME", "SPACE", "SPECIFIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "SPECIFICTYPE", "SQL", "SQLCODE", "SQLERROR", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING", "START", "STATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "STATIC", "SUBMULTISET", "SUBSTRING", "SUM", "SYMMETRIC", "SYSTEM", "SYSTEM_USER", "TABLE", "TABLESAMPLE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "TEMPORARY", "THEN", "TIME", "TIMESTAMP", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TO", "TRAILING", "TRANSACTION", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "TRANSLATE", "TRANSLATION", "TREAT", "TRIGGER", "TRIM", "TRUE", "UNDER", "UNDO", "UNION", "UNIQUE", "UNKNOWN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
-      "UNNEST", "UNTIL", "UPDATE", "UPPER", "USAGE", "USER", "USING", "VALUE", "VALUES", "VARCHAR", "VARYING", "VIEW", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-      "WHEN", "WHENEVER", "WHERE", "WHILE", "WINDOW", "WITH", "WITHIN", "WITHOUT", "WORK", "WRITE", "YEAR", "ZONE" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "ALTER", "AND", "ANY", "ARE", "ARRAY", "AS", "ASC", "ASENSITIVE", "ASSERTION", "ASYMMETRIC", "AT", "ATOMIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "AUTHORIZATION", "AVG", "BEFORE", "BEGIN", "BETWEEN", "BIGINT", "BINARY", "BIT", "BIT_LENGTH", "BLOB", "BOOLEAN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "BOTH", "BREADTH", "BY", "CALL", "CALLED", "CASCADE", "CASCADED", "CASE", "CAST", "CATALOG", "CHAR", "CHARACTER", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "CHARACTER_LENGTH", "CHAR_LENGTH", "CHECK", "CLOB", "CLOSE", "COALESCE", "COLLATE", "COLLATION", "COLUMN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+    "COMMIT", "CONDITION", "CONNECT", "CONNECTION", "CONSTRAINT", "CONSTRAINTS", "CONSTRUCTOR", "CONTAINS", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "CONTINUE", "CONVERT", "CORRESPONDING", "COUNT", "CREATE", "CROSS", "CUBE", "CURRENT", "CURRENT_DATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+    "CURRENT_DEFAULT_TRANSFORM_GROUP", "CURRENT_PATH", "CURRENT_ROLE", "CURRENT_TIME", "CURRENT_TIMESTAMP", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+    "CURRENT_TRANSFORM_GROUP_FOR_TYPE", "CURRENT_USER", "CURSOR", "CYCLE", "DATA", "DATE", "DAY", "DEALLOCATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
+    "DEC", "DECIMAL", "DECLARE", "DEFAULT", "DEFERRABLE", "DEFERRED", "DELETE", "DEPTH", "DEREF", "DESC", "DESCRIBE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "DESCRIPTOR", "DETERMINISTIC", "DIAGNOSTICS", "DISCONNECT", "DISTINCT", "DO", "DOMAIN", "DOUBLE", "DROP", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+    "DYNAMIC", "EACH", "ELEMENT", "ELSE", "ELSEIF", "END", "EQUALS", "ESCAPE", "EXCEPT", "EXCEPTION", "EXEC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "EXECUTE", "EXISTS", "EXIT", "EXTERNAL", "EXTRACT", "FALSE", "FETCH", "FILTER", "FIRST", "FLOAT", "FOR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "FOREIGN", "FOUND", "FREE", "FROM", "FULL", "FUNCTION", "GENERAL", "GET", "GLOBAL", "GO", "GOTO", "GRANT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "GROUP", "GROUPING", "HANDLER", "HAVING", "HOLD", "HOUR", "IDENTITY", "IF", "IMMEDIATE", "IN", "INDICATOR", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "INITIALLY", "INNER", "INOUT", "INPUT", "INSENSITIVE", "INSERT", "INT", "INTEGER", "INTERSECT", "INTERVAL", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "INTO", "IS", "ISOLATION", "ITERATE", "JOIN", "KEY", "LANGUAGE", "LARGE", "LAST", "LATERAL", "LEADING", "LEAVE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "LEFT", "LEVEL", "LIKE", "LOCAL", "LOCALTIME", "LOCALTIMESTAMP", "LOCATOR", "LOOP", "LOWER", "MAP", "MATCH", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "MAX", "MEMBER", "MERGE", "METHOD", "MIN", "MINUTE", "MODIFIES", "MODULE", "MONTH", "MULTISET", "NAMES", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "NATIONAL", "NATURAL", "NCHAR", "NCLOB", "NEW", "NEXT", "NO", "NONE", "NOT", "NULL", "NULLIF", "NUMERIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "OBJECT", "OCTET_LENGTH", "OF", "OLD", "ON", "ONLY", "OPEN", "OPTION", "OR", "ORDER", "ORDINALITY", "OUT", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "OUTER", "OUTPUT", "OVER", "OVERLAPS", "PAD", "PARAMETER", "PARTIAL", "PARTITION", "PATH", "POSITION", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "PRECISION", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", "PROCEDURE", "PUBLIC", "RANGE", "READ", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "READS", "REAL", "RECURSIVE", "REF", "REFERENCES", "REFERENCING", "RELATIVE", "RELEASE", "REPEAT", "RESIGNAL", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "RESTRICT", "RESULT", "RETURN", "RETURNS", "REVOKE", "RIGHT", "ROLE", "ROLLBACK", "ROLLUP", "ROUTINE", "ROW", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "ROWS", "SAVEPOINT", "SCHEMA", "SCOPE", "SCROLL", "SEARCH", "SECOND", "SECTION", "SELECT", "SENSITIVE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+    "SESSION", "SESSION_USER", "SET", "SETS", "SIGNAL", "SIMILAR", "SIZE", "SMALLINT", "SOME", "SPACE", "SPECIFIC", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "SPECIFICTYPE", "SQL", "SQLCODE", "SQLERROR", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING", "START", "STATE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+    "STATIC", "SUBMULTISET", "SUBSTRING", "SUM", "SYMMETRIC", "SYSTEM", "SYSTEM_USER", "TABLE", "TABLESAMPLE", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+    "TEMPORARY", "THEN", "TIME", "TIMESTAMP", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", "TO", "TRAILING", "TRANSACTION", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+    "TRANSLATE", "TRANSLATION", "TREAT", "TRIGGER", "TRIM", "TRUE", "UNDER", "UNDO", "UNION", "UNIQUE", "UNKNOWN", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
+    "UNNEST", "UNTIL", "UPDATE", "UPPER", "USAGE", "USER", "USING", "VALUE", "VALUES", "VARCHAR", "VARYING", "VIEW", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
+    "WHEN", "WHENEVER", "WHERE", "WHILE", "WINDOW", "WITH", "WITHIN", "WITHOUT", "WORK", "WRITE", "YEAR", "ZONE" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
 
   private String name;
 
@@ -359,8 +359,7 @@ public abstract class DBAdapter implements IDBAdapter
   /**
    * @since 4.2
    */
-  public void updateSchema(final Connection connection, final IDBSchema schema, IDBSchemaDelta delta)
-      throws DBException
+  public void updateSchema(final Connection connection, final IDBSchema schema, IDBSchemaDelta delta) throws DBException
   {
     // Apply delta to in-memory representation of the schema
     delta.applyTo(schema);
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/ddl/package-info.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/ddl/package-info.java
index 17d9bcca61..ed9b1456b4 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/ddl/package-info.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/ddl/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2013 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) 2013 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
  */
 
 /**
  * Server service provider interfaces for the Net4j DB framework.
  */
 package org.eclipse.net4j.spi.db.ddl;
-
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/package-info.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/package-info.java
index 1c69a41e20..aa6c6cca76 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/package-info.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server service provider interfaces and useful base implementations for the Net4j DB framework.
  */
 package org.eclipse.net4j.spi.db;
-
diff --git a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
index 2da285625a..069fa1deee 100644
--- a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.debug; singleton:=true
-Bundle-Version: 3.0.200.qualifier
+Bundle-Version: 3.0.300.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.internal.debug.bundle.OM$Activator
@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.net4j.internal.debug;version="3.0.200";x-internal:=true,
- org.eclipse.net4j.internal.debug.bundle;version="3.0.200";x-internal:=true,
- org.eclipse.net4j.internal.debug.messages;version="3.0.200";x-internal:=true,
- org.eclipse.net4j.internal.debug.views;version="3.0.200";x-internal:=true
+Export-Package: org.eclipse.net4j.internal.debug;version="3.0.300";x-internal:=true,
+ org.eclipse.net4j.internal.debug.bundle;version="3.0.300";x-internal:=true,
+ org.eclipse.net4j.internal.debug.messages;version="3.0.300";x-internal:=true,
+ org.eclipse.net4j.internal.debug.views;version="3.0.300";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
index fbc6215343..53c284dcbf 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
index bbcced65b3..63e6f1f84c 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.ui.UIActivator;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/messages/Messages.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/messages/Messages.java
index a3d323270b..20410992a0 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
index a98c359564..6a0f605ebd 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
@@ -92,8 +92,10 @@ public class RemoteTraceView extends ViewPart
 
   protected void createColmuns(TableViewer viewer)
   {
-    final String[] columnNames = {
-        Messages.getString("RemoteTraceView.0"), Messages.getString("RemoteTraceView.1"), Messages.getString("RemoteTraceView.2"), Messages.getString("RemoteTraceView.3"), Messages.getString("RemoteTraceView.4"), Messages.getString("RemoteTraceView.5"), Messages.getString("RemoteTraceView.6"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+    final String[] columnNames = { Messages.getString("RemoteTraceView.0"), Messages.getString("RemoteTraceView.1"), //$NON-NLS-1$ //$NON-NLS-2$
+        Messages.getString("RemoteTraceView.2"), Messages.getString("RemoteTraceView.3"), //$NON-NLS-1$ //$NON-NLS-2$
+        Messages.getString("RemoteTraceView.4"), Messages.getString("RemoteTraceView.5"), //$NON-NLS-1$ //$NON-NLS-2$
+        Messages.getString("RemoteTraceView.6"), //$NON-NLS-1$
         Messages.getString("RemoteTraceView.7") }; //$NON-NLS-1$
     final int[] columnWidths = { 60, 170, 80, 160, 120, 120, 400, 200 };
     TableColumn[] columns = new TableColumn[columnNames.length];
@@ -175,8 +177,8 @@ public class RemoteTraceView extends ViewPart
 
     clearAction.setText(Messages.getString("RemoteTraceView.9")); //$NON-NLS-1$
     clearAction.setToolTipText(Messages.getString("RemoteTraceView.10")); //$NON-NLS-1$
-    clearAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages()
-        .getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
+    clearAction.setImageDescriptor(
+        PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
 
     doubleClickAction = new Action()
     {
diff --git a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
index b73a9b4ace..233f95f22e 100644
--- a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.defs;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.net4j.util.defs;bundle-version="[4.0.0,5.0.0)";visib
  org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.http;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.net4j.defs;version="4.0.300",
- org.eclipse.net4j.defs.impl;version="4.0.300",
- org.eclipse.net4j.defs.util;version="4.0.300"
+Export-Package: org.eclipse.net4j.defs;version="4.0.400",
+ org.eclipse.net4j.defs.impl;version="4.0.400",
+ org.eclipse.net4j.defs.util;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java
index e0ece3a97f..c09afdaf38 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
index 46fb4ab65c..d57c5a63dc 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
index 42e112334c..b791b133f3 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.defs.Def;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Buffer Provider Def</b></em>'. <!-- end-user-doc
  * -->
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getBufferProviderDef()
  * @model abstract="true"
  * @generated
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
index 74b85a8069..ffe3526377 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java
index 1055e67092..cf8a9f6349 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -58,7 +58,7 @@ public interface ConnectorDef extends Def
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>User ID</em>' attribute.
    * @see #isSetUserID()
@@ -71,7 +71,7 @@ public interface ConnectorDef extends Def
   /**
    * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isSetUserID()
    * @see #getUserID()
    * @see #setUserID(String)
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java
index ec1cff09c3..7c9ce70339 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -20,7 +20,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getHTTPConnectorDef()
  * @model
  * @generated
@@ -45,7 +45,7 @@ public interface HTTPConnectorDef extends ConnectorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Url</em>' attribute.
    * @see #getUrl()
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java
index e4904dc62c..a061203b9f 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -20,7 +20,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMAcceptorDef()
  * @model
  * @generated
@@ -45,7 +45,7 @@ public interface JVMAcceptorDef extends AcceptorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java
index 6095b3a4de..1fdf4d716c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -20,7 +20,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMConnectorDef()
  * @model
  * @generated
@@ -45,7 +45,7 @@ public interface JVMConnectorDef extends ConnectorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java
index e532fa70b8..caefc2d46c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java
index 659e705ec4..dc9199595a 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -114,7 +114,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>Connector Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -242,7 +242,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl <em>Acceptor Def</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.net4j.defs.impl.AcceptorDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getAcceptorDef()
    * @generated
@@ -285,7 +285,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>Acceptor Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -634,7 +634,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.ConnectorDef <em>Connector Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Connector Def</em>'.
    * @see org.eclipse.net4j.defs.ConnectorDef
    * @generated
@@ -685,7 +685,7 @@ public interface Net4jDefsPackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Client Protocol Provider</em>'.
    * @see org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider()
    * @see #getConnectorDef()
@@ -705,7 +705,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPConnectorDef <em>TCP Connector Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>TCP Connector Def</em>'.
    * @see org.eclipse.net4j.defs.TCPConnectorDef
    * @generated
@@ -745,7 +745,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.AcceptorDef <em>Acceptor Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Acceptor Def</em>'.
    * @see org.eclipse.net4j.defs.AcceptorDef
    * @generated
@@ -786,7 +786,7 @@ public interface Net4jDefsPackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Server Protocol Provider</em>'.
    * @see org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider()
    * @see #getAcceptorDef()
@@ -797,7 +797,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPAcceptorDef <em>TCP Acceptor Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>TCP Acceptor Def</em>'.
    * @see org.eclipse.net4j.defs.TCPAcceptorDef
    * @generated
@@ -837,7 +837,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.JVMAcceptorDef <em>JVM Acceptor Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>JVM Acceptor Def</em>'.
    * @see org.eclipse.net4j.defs.JVMAcceptorDef
    * @generated
@@ -857,7 +857,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.JVMConnectorDef <em>JVM Connector Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>JVM Connector Def</em>'.
    * @see org.eclipse.net4j.defs.JVMConnectorDef
    * @generated
@@ -896,7 +896,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPSelectorDef <em>TCP Selector Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>TCP Selector Def</em>'.
    * @see org.eclipse.net4j.defs.TCPSelectorDef
    * @generated
@@ -924,7 +924,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.BufferPoolDef <em>Buffer Pool Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Buffer Pool Def</em>'.
    * @see org.eclipse.net4j.defs.BufferPoolDef
    * @generated
@@ -1005,7 +1005,7 @@ public interface Net4jDefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Client Protocol Provider</b></em>' reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = eINSTANCE.getConnectorDef_ClientProtocolProvider();
@@ -1088,7 +1088,7 @@ public interface Net4jDefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Server Protocol Provider</b></em>' reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = eINSTANCE.getAcceptorDef_ServerProtocolProvider();
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
index cd550efcd7..7d2f722082 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
index ede50c4232..4a026160bd 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java
index 7120873dd3..f8e7e7740c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -22,7 +22,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef()
  * @model
  * @generated
@@ -47,7 +47,7 @@ public interface TCPAcceptorDef extends AcceptorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getHost <em>Host</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Host</em>' attribute.
    * @see #getHost()
@@ -73,7 +73,7 @@ public interface TCPAcceptorDef extends AcceptorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getPort <em>Port</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Port</em>' attribute.
    * @see #getPort()
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java
index eb8435d239..ecca541366 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -22,7 +22,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPConnectorDef()
  * @model
  * @generated
@@ -72,7 +72,7 @@ public interface TCPConnectorDef extends ConnectorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getHost <em>Host</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Host</em>' attribute.
    * @see #getHost()
@@ -100,7 +100,7 @@ public interface TCPConnectorDef extends ConnectorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Port</em>' attribute.
    * @see #isSetPort()
@@ -113,7 +113,7 @@ public interface TCPConnectorDef extends ConnectorDef
   /**
    * Unsets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isSetPort()
    * @see #getPort()
    * @see #setPort(int)
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
index 4b8e06ede7..a2fb4921c6 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.defs.Def;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Selector Def</b></em>'. <!-- end-user-doc
  * -->
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPSelectorDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java
index 3d09dbed9b..ab896ce136 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *   Andre Dietisheim - initial API and implementation
  *   Eike Stepper - maintenance
@@ -131,8 +131,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
       if (bufferProvider != oldBufferProvider)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
               oldBufferProvider, bufferProvider));
+        }
       }
     }
     return bufferProvider;
@@ -156,8 +158,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     BufferPoolDef oldBufferProvider = bufferProvider;
     bufferProvider = newBufferProvider;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
           oldBufferProvider, bufferProvider));
+    }
   }
 
   /**
@@ -173,8 +177,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
       if (executorService != oldExecutorService)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
               oldExecutorService, executorService));
+        }
       }
     }
     return executorService;
@@ -198,8 +204,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     ThreadPoolDef oldExecutorService = executorService;
     executorService = newExecutorService;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
           oldExecutorService, executorService));
+    }
   }
 
   /**
@@ -215,8 +223,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
       if (negotiator != oldNegotiator)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR,
               oldNegotiator, negotiator));
+        }
       }
     }
     return negotiator;
@@ -242,8 +252,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     boolean oldNegotiatorESet = negotiatorESet;
     negotiatorESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
           negotiator, !oldNegotiatorESet));
+    }
   }
 
   /**
@@ -257,8 +269,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     negotiator = null;
     negotiatorESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
           null, oldNegotiatorESet));
+    }
   }
 
   /**
@@ -291,7 +305,9 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
   public void unsetServerProtocolProvider()
   {
     if (serverProtocolProvider != null)
+    {
       ((InternalEList.Unsettable<?>)serverProtocolProvider).unset();
+    }
   }
 
   /**
@@ -314,15 +330,21 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     {
     case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
       if (resolve)
+      {
         return getBufferProvider();
+      }
       return basicGetBufferProvider();
     case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
       if (resolve)
+      {
         return getExecutorService();
+      }
       return basicGetExecutorService();
     case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
       if (resolve)
+      {
         return getNegotiator();
+      }
       return basicGetNegotiator();
     case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
       return getServerProtocolProvider();
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java
index 432afc7766..ee64e75e8c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *   Andre Dietisheim - initial API and implementation
  *   Eike Stepper - maintenance
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EClass;
  * -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPoolDef
@@ -49,7 +49,7 @@ public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPo
 
   /**
    * creates and returns a buffer provider.
-   * 
+   *
    * @generated NOT
    */
   @Override
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java
index 009d7846ea..8d6a02baba 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java
index a2fe995eb7..d311700a8d 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java
index 8e3673f30b..372dc3c7f9 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -168,8 +168,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     boolean oldUserIDESet = userIDESet;
     userIDESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID, userID,
           !oldUserIDESet));
+    }
   }
 
   /**
@@ -183,8 +185,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     userID = USER_ID_EDEFAULT;
     userIDESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID,
           USER_ID_EDEFAULT, oldUserIDESet));
+    }
   }
 
   /**
@@ -209,8 +213,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       if (bufferProvider != oldBufferProvider)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER,
               oldBufferProvider, bufferProvider));
+        }
       }
     }
     return bufferProvider;
@@ -234,8 +240,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     BufferProviderDef oldBufferProvider = bufferProvider;
     bufferProvider = newBufferProvider;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER,
           oldBufferProvider, bufferProvider));
+    }
   }
 
   /**
@@ -251,8 +259,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       if (executorService != oldExecutorService)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE,
               oldExecutorService, executorService));
+        }
       }
     }
     return executorService;
@@ -276,8 +286,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     ExecutorServiceDef oldExecutorService = executorService;
     executorService = newExecutorService;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE,
           oldExecutorService, executorService));
+    }
   }
 
   /**
@@ -293,8 +305,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       if (negotiator != oldNegotiator)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR,
               oldNegotiator, negotiator));
+        }
       }
     }
     return negotiator;
@@ -320,8 +334,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     boolean oldNegotiatorESet = negotiatorESet;
     negotiatorESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator,
           negotiator, !oldNegotiatorESet));
+    }
   }
 
   /**
@@ -335,8 +351,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     negotiator = null;
     negotiatorESet = false;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR,
-          oldNegotiator, null, oldNegotiatorESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator,
+          null, oldNegotiatorESet));
+    }
   }
 
   /**
@@ -369,7 +387,9 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   public void unsetClientProtocolProvider()
   {
     if (clientProtocolProvider != null)
+    {
       ((InternalEList.Unsettable<?>)clientProtocolProvider).unset();
+    }
   }
 
   /**
@@ -394,15 +414,21 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       return getUserID();
     case Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER:
       if (resolve)
+      {
         return getBufferProvider();
+      }
       return basicGetBufferProvider();
     case Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE:
       if (resolve)
+      {
         return getExecutorService();
+      }
       return basicGetExecutorService();
     case Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR:
       if (resolve)
+      {
         return getNegotiator();
+      }
       return basicGetNegotiator();
     case Net4jDefsPackage.CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER:
       return getClientProtocolProvider();
@@ -499,14 +525,20 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (userID: ");
     if (userIDESet)
+    {
       result.append(userID);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
@@ -519,7 +551,7 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
    * <li>{@link INegotiator}</li>
    * <li>{@link IProtocolProvider}</li>
    * </ul>
-   * 
+   *
    * @param config
    *          the transport config
    * @ADDED
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java
index b569697aea..aa56b1141c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnectorDef
@@ -90,7 +90,9 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
     String oldUrl = url;
     url = newUrl;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL, oldUrl, url));
+    }
   }
 
   /**
@@ -163,7 +165,9 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (url: ");
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java
index f3abc271b4..2b3db3ba29 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -28,7 +28,7 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -81,7 +81,9 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME, oldName, name));
+    }
   }
 
   /**
@@ -154,7 +156,9 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
@@ -186,4 +190,3 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
     CheckUtil.checkState(eIsSet(Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME), "name not set!");
   }
 } // JVMAcceptorDefImpl
-
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java
index 24d28cea02..d3021ee0d8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnectorDef
@@ -38,7 +38,7 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -91,7 +91,9 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME, oldName, name));
+    }
   }
 
   /**
@@ -164,7 +166,9 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java
index e8e9b0df68..8f32dbefe8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java
index e53985d37e..6ba1382bfe 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -125,7 +125,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#eNS_URI
    * @see #init()
@@ -144,7 +144,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Net4jDefsPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc
@@ -157,11 +157,14 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   public static Net4jDefsPackage init()
   {
     if (isInited)
+    {
       return (Net4jDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jDefsPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Net4jDefsPackageImpl theNet4jDefsPackage = (Net4jDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Net4jDefsPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Net4jDefsPackageImpl());
+    Net4jDefsPackageImpl theNet4jDefsPackage = (Net4jDefsPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Net4jDefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new Net4jDefsPackageImpl());
 
     isInited = true;
 
@@ -485,7 +488,9 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -549,7 +554,9 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -567,17 +574,17 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     // Add supertypes to classes
     connectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    clientProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
-    tcpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
+    clientProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
+    tcpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
     acceptorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    tcpAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
-    jvmAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
-    jvmConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
-    httpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
+    tcpAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
+    jvmAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
+    jvmConnectorDefEClass.getESuperTypes().add(getConnectorDef());
+    httpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
     tcpSelectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    serverProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
+    serverProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
     bufferProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    bufferPoolDefEClass.getESuperTypes().add(this.getBufferProviderDef());
+    bufferPoolDefEClass.getESuperTypes().add(getBufferProviderDef());
     protocolProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
 
     // Initialize classes and features; add operations and parameters
@@ -585,7 +592,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getConnectorDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, ConnectorDef.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConnectorDef_BufferProvider(), this.getBufferProviderDef(), null, "bufferProvider", null, 1, 1,
+    initEReference(getConnectorDef_BufferProvider(), getBufferProviderDef(), null, "bufferProvider", null, 1, 1,
         ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getConnectorDef_ExecutorService(), theNet4jUtilDefsPackage.getExecutorServiceDef(), null,
@@ -594,7 +601,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
     initEReference(getConnectorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null,
         0, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConnectorDef_ClientProtocolProvider(), this.getClientProtocolFactoryDef(), null,
+    initEReference(getConnectorDef_ClientProtocolProvider(), getClientProtocolFactoryDef(), null,
         "clientProtocolProvider", null, 1, -1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -603,7 +610,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTCPConnectorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1,
+    initEReference(getTCPConnectorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1,
         TCPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTCPConnectorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPConnectorDef.class,
@@ -613,16 +620,16 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAcceptorDef_BufferProvider(), this.getBufferPoolDef(), null, "bufferProvider", null, 0, 1,
+    initEReference(getAcceptorDef_BufferProvider(), getBufferPoolDef(), null, "bufferProvider", null, 0, 1,
         AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getAcceptorDef_ExecutorService(), theNet4jUtilDefsPackage.getThreadPoolDef(), null,
         "executorService", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getAcceptorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null,
-        0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getAcceptorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null, 0,
+        1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getAcceptorDef_ServerProtocolProvider(), this.getServerProtocolFactoryDef(), null,
+    initEReference(getAcceptorDef_ServerProtocolProvider(), getServerProtocolFactoryDef(), null,
         "serverProtocolProvider", null, 1, -1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -632,7 +639,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTCPAcceptorDef_Port(), ecorePackage.getEInt(), "port", null, 1, 1, TCPAcceptorDef.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTCPAcceptorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1,
+    initEReference(getTCPAcceptorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1,
         TCPAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java
index 1855a0c9ec..a16b0f4b43 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
index 1f311d50dd..3edc7075bb 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java
index 868afe5743..4d59942853 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -35,7 +35,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDef
@@ -43,7 +43,7 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   /**
    * The default value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getHost()
    * @generated
    * @ordered
@@ -62,7 +62,7 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   /**
    * The default value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getPort()
    * @generated
    * @ordered
@@ -125,7 +125,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     String oldHost = host;
     host = newHost;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST, oldHost, host));
+    }
   }
 
   /**
@@ -146,7 +148,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     int oldPort = port;
     port = newPort;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT, oldPort, port));
+    }
   }
 
   /**
@@ -162,8 +166,10 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
       if (tcpSelectorDef != oldTcpSelectorDef)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF,
+              oldTcpSelectorDef, tcpSelectorDef));
+        }
       }
     }
     return tcpSelectorDef;
@@ -187,8 +193,10 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
     tcpSelectorDef = newTcpSelectorDef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF,
           oldTcpSelectorDef, tcpSelectorDef));
+    }
   }
 
   /**
@@ -206,7 +214,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
       return getPort();
     case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
       if (resolve)
+      {
         return getTcpSelectorDef();
+      }
       return basicGetTcpSelectorDef();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -283,7 +293,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (host: ");
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java
index b676c04e1b..92c8b07ed8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -35,7 +35,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl#getPort <em>Port</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnectorDef
@@ -53,7 +53,7 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   /**
    * The default value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getHost()
    * @generated
    * @ordered
@@ -72,7 +72,7 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   /**
    * The default value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getPort()
    * @generated
    * @ordered
@@ -128,8 +128,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
       if (tcpSelectorDef != oldTcpSelectorDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
+        }
       }
     }
     return tcpSelectorDef;
@@ -153,8 +155,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
     tcpSelectorDef = newTcpSelectorDef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF,
           oldTcpSelectorDef, tcpSelectorDef));
+    }
   }
 
   /**
@@ -175,13 +179,15 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     String oldHost = host;
     host = newHost;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST, oldHost, host));
+    }
   }
 
   /**
    * <!-- begin-user-doc -->gets the <b>port</b> of this connector. If the port was not set, the
    * {@link ITCPConnector#DEFAULT_PORT} is returned<!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public int getPort()
@@ -215,8 +221,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     boolean oldPortESet = portESet;
     portESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort, port,
           !oldPortESet));
+    }
   }
 
   /**
@@ -230,8 +238,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     port = PORT_EDEFAULT;
     portESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort,
           PORT_EDEFAULT, oldPortESet));
+    }
   }
 
   /**
@@ -254,7 +264,9 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     {
     case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
       if (resolve)
+      {
         return getTcpSelectorDef();
+      }
       return basicGetTcpSelectorDef();
     case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
       return getHost();
@@ -335,16 +347,22 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (host: ");
     result.append(host);
     result.append(", port: ");
     if (portESet)
+    {
       result.append(port);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java
index e0a70dc3df..e3a37a1e79 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -41,7 +41,7 @@ public class TCPSelectorDefImpl extends DefImpl implements TCPSelectorDef
 
   /**
    * Creates and returns a {@link TCPSelector}.
-   * 
+   *
    * @return a new tcp selector instance
    * @generated NOT
    */
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java
index 45c17f6c40..74dc5fff19 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -373,7 +373,7 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.defs.Def
    * @generated
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java
index a5753b982c..f2093c82a8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -37,7 +37,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage
  * @generated
  */
@@ -45,14 +45,14 @@ public class Net4jDefsSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static Net4jDefsPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Net4jDefsSwitch()
@@ -66,7 +66,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -78,7 +78,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -98,7 +98,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -328,7 +328,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Connector Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Connector Def</em>'.
@@ -344,7 +344,7 @@ public class Net4jDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'.
@@ -359,7 +359,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>TCP Connector Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>TCP Connector Def</em>'.
@@ -374,7 +374,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Acceptor Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Acceptor Def</em>'.
@@ -389,7 +389,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>TCP Acceptor Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>TCP Acceptor Def</em>'.
@@ -404,7 +404,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>JVM Acceptor Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>JVM Acceptor Def</em>'.
@@ -419,7 +419,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>JVM Connector Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>JVM Connector Def</em>'.
@@ -434,7 +434,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>HTTP Connector Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>HTTP Connector Def</em>'.
@@ -449,7 +449,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>TCP Selector Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>TCP Selector Def</em>'.
@@ -465,7 +465,7 @@ public class Net4jDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Server Protocol Factory Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Server Protocol Factory Def</em>'.
@@ -480,7 +480,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Buffer Provider Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Buffer Provider Def</em>'.
@@ -495,7 +495,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Buffer Pool Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Buffer Pool Def</em>'.
@@ -511,7 +511,7 @@ public class Net4jDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'.
@@ -526,7 +526,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
@@ -542,7 +542,7 @@ public class Net4jDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
index 5df744eeb4..ac1b4683cd 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -27,7 +27,7 @@ public class Net4jDefsUtil
 {
   /**
    * Creates the factories protocol provider. The current implementation uses a {@link FactoriesProtocolProvider}.
-   * 
+   *
    * @param clientProtocolFactoryDef
    *          the client protocol factory definition
    * @return the protocol provider
diff --git a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Legal.java b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Legal.java
index 0cff7eb12a..4decb65fb0 100644
--- a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Legal.java
+++ b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Legal.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.doc;
 
 /**
  * Legal
- * 
+ *
  * @external about.html
  * @number 666
  */
diff --git a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Overview.java b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Overview.java
index 81127d5ea9..c80ed8adf4 100644
--- a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Overview.java
+++ b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Overview.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ package org.eclipse.net4j.doc;
  * Overview
  * <p>
  * {@toc}
- * 
+ *
  * @default
  */
 public class Overview
diff --git a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/Homepage.java b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/Homepage.java
index 5fff45cd69..81f5f8c688 100644
--- a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/Homepage.java
+++ b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/Homepage.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.doc.online;
 
 /**
  * Homepage
- * 
+ *
  * @external http://www.eclipse.org/cdo
  * @number 1
  */
diff --git a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/Wiki.java b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/Wiki.java
index c4af375040..4f7b492ec8 100644
--- a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/Wiki.java
+++ b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/Wiki.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.doc.online;
 
 /**
  * Wiki
- * 
+ *
  * @external http://wiki.eclipse.org/CDO
  * @number 2
  */
diff --git a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/package-info.java b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/package-info.java
index 60349f6bcc..cee43d18f9 100644
--- a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/package-info.java
+++ b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/online/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Online Docs
- * 
+ *
  * @number 555
  */
 package org.eclipse.net4j.doc.online;
-
diff --git a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/api/package-info.java b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/api/package-info.java
index 352f7d14ac..9bade8b3b9 100644
--- a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/api/package-info.java
+++ b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/api/package-info.java
@@ -4,14 +4,14 @@
  * 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
  */
 
 /**
  * API Reference
- * 
+ *
  * @number 1
  */
 package org.eclipse.net4j.doc.reference.api;
diff --git a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/package-info.java b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/package-info.java
index 3ecee40f2b..a7b055e23d 100644
--- a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/package-info.java
+++ b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Reference
- * 
+ *
  * @number 444
  */
 package org.eclipse.net4j.doc.reference;
-
diff --git a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/schema/package-info.java b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/schema/package-info.java
index 3f2bc81d14..60c636253c 100644
--- a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/schema/package-info.java
+++ b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/reference/schema/package-info.java
@@ -4,14 +4,14 @@
  * 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
  */
 
 /**
  * Extension Point Reference
- * 
+ *
  * @number 2
  */
 package org.eclipse.net4j.doc.reference.schema;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
index 0355846f76..7067940008 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.chat.ui;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Activator: org.eclipse.net4j.buddies.chat.internal.ui.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.ui;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.buddies.chat.internal.ui;version="4.0.300",
- org.eclipse.net4j.buddies.chat.internal.ui.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.buddies.chat.internal.ui.messages;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.net4j.buddies.chat.internal.ui;version="4.0.400",
+ org.eclipse.net4j.buddies.chat.internal.ui.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.buddies.chat.internal.ui.messages;version="4.0.400";x-internal:=true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java
index c83bf23914..41b2993880 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPane.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java
index d9497e1cf2..6b8a97dab4 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/ChatPaneCreator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/bundle/OM.java
index 68604114c3..695027386c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.ui.UIActivator;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/messages/Messages.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/messages/Messages.java
index f1f3685b04..b5d3c30637 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat.ui/src/org/eclipse/net4j/buddies/chat/internal/ui/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
index 9fcab23f21..67f4c25d08 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.chat;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.net4j.buddies.internal.chat.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.chat;version="4.0.300",
- org.eclipse.net4j.buddies.internal.chat;version="4.0.300",
- org.eclipse.net4j.buddies.internal.chat.bundle;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.net4j.buddies.chat;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.chat;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.chat.bundle;version="4.0.400";x-internal:=true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IChat.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IChat.java
index a640482fb8..35024ca423 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IChat.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IChat.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IComment.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IComment.java
index 877592232e..f4cc31597e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IComment.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/chat/IComment.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatFactory.java
index 2a99072ffe..85c8971135 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoom.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoom.java
index 2e25d50ec2..a48b929866 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoom.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoom.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoomFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoomFactory.java
index 58b207bcd4..6452a5c3c2 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoomFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/ChatRoomFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/Comment.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/Comment.java
index 250c3fde3c..ba63933438 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/Comment.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/Comment.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/TextMessage.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/TextMessage.java
index 91be25fb44..59d3b75b34 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/TextMessage.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/TextMessage.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/bundle/OM.java
index f82380e21e..86dfca4ccc 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.chat/src/org/eclipse/net4j/buddies/internal/chat/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IAccount.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IAccount.java
index edbba6441b..2da8082817 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IAccount.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IAccount.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddy.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddy.java
index 9fd3333fea..b63167d5a1 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddy.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddy.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyContainer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyContainer.java
index b92d2ada15..b0702f6f71 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyContainer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyProvider.java
index bdb0cb0ab4..f983eed7fa 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IBuddyProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaboration.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaboration.java
index 3325597819..a0f6d9b8f0 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaboration.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaboration.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationContainer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationContainer.java
index b9253542d9..a0edb049ef 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationContainer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationProvider.java
index 7e0e903fc9..04e20e6096 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ICollaborationProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IFacility.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IFacility.java
index 67e543f4b3..1271ce0573 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IFacility.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IFacility.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembership.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembership.java
index bdbef42523..667defb76d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembership.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembership.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipContainer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipContainer.java
index 480c13d028..d7eb8e6a9e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipContainer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipKey.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipKey.java
index ea9bf89ce3..60c2e2da14 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipKey.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipKey.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipProvider.java
index 259a4395a0..3579af74bb 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMembershipProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessage.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessage.java
index 1e9700d5d6..a1612c84ba 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessage.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessage.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessageEvent.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessageEvent.java
index 53b3f9298d..aa18a8f5ae 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessageEvent.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/IMessageEvent.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISession.java
index 502070050b..4665ad9296 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISession.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISessionProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISessionProvider.java
index 2851597fb6..da50ad0088 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISessionProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/common/ISessionProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Account.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Account.java
index b8aaeb0498..dfefa32ead 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Account.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/Account.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
index d3d70dfb8e..e5d7d9c0eb 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipContainer.java
@@ -69,7 +69,8 @@ public class MembershipContainer extends Lifecycle implements IMembershipContain
       IListener[] listeners = getListeners();
       if (listeners != null)
       {
-        fireEvent(new SingleDeltaContainerEvent<IMembership>(this, membership, IContainerDelta.Kind.REMOVED), listeners);
+        fireEvent(new SingleDeltaContainerEvent<IMembership>(this, membership, IContainerDelta.Kind.REMOVED),
+            listeners);
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
index 0c0072c540..f1c305edd3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MembershipKey.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MessageEvent.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MessageEvent.java
index 4d83522f01..64eb687c59 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MessageEvent.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/MessageEvent.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/bundle/OM.java
index 3571ae0f87..bb591d81a5 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java
index a89caf23ab..c427700d5a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java
index 42c8544530..4967b8005d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/BuddyStateNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
index 50360c8fb7..1f53df7564 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java
index 49b2a65fec..f89b20d6a0 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/CollaborationLeftNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java
index adab0d254e..56d6a5fbf3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java
index f6e179d958..4ce22b025d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/MessageNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/ProtocolConstants.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/ProtocolConstants.java
index b79ebd39ff..64691e98cb 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/ProtocolConstants.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/internal/common/protocol/ProtocolConstants.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ClientFacilityFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ClientFacilityFactory.java
index e14b8ddfa7..26a7e10eaf 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ClientFacilityFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ClientFacilityFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/Message.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/Message.java
index 14c6e3ac09..89a0486b3a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/Message.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/Message.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ServerFacilityFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ServerFacilityFactory.java
index 971eb26d43..9a21b9b936 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ServerFacilityFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.common/src/org/eclipse/net4j/buddies/spi/common/ServerFacilityFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
index 7e5e15c075..e50a3b0048 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
index 23c9bb28cc..02ffdce761 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/messages/Messages.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/messages/Messages.java
index ab1aaecc4a..448a78346b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java
index a8c4728537..d433394925 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java
index eb170a0625..8848436e56 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java
index a38f121431..e23628a5a9 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
index a8e863ae55..e8a95520ef 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java
index 6030c09c3f..e7395725ee 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java
index 6a67001ddd..de4a5163dd 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java
index c414f8c539..8d48e418a0 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java
index 8486e1a33e..5f29a24c04 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java
index ffe5dad751..22816c45ae 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java
index 6b0339c429..2f8eed9270 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java
index fe403858b8..ea50bb386c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java
index 7f567028c8..7137f78319 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java
index 00dffb4bca..e4473fb12c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/ServerConstants.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
index 249c40aa41..9859bed4c2 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.buddies.ui;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Activator: org.eclipse.net4j.buddies.internal.ui.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -16,12 +16,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.buddies;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
  org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.buddies.internal.ui;version="4.0.300",
- org.eclipse.net4j.buddies.internal.ui.actions;version="4.0.300",
- org.eclipse.net4j.buddies.internal.ui.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.buddies.internal.ui.dnd;version="4.0.300",
- org.eclipse.net4j.buddies.internal.ui.messages;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.buddies.internal.ui.preferences;version="4.0.300",
- org.eclipse.net4j.buddies.internal.ui.views;version="4.0.300",
- org.eclipse.net4j.buddies.ui;version="4.0.300"
+Export-Package: org.eclipse.net4j.buddies.internal.ui;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.ui.actions;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.ui.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.ui.dnd;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.ui.messages;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.ui.preferences;version="4.0.400",
+ org.eclipse.net4j.buddies.internal.ui.views;version="4.0.400",
+ org.eclipse.net4j.buddies.ui;version="4.0.400"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
index d819fdfe95..2702a30ec3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
@@ -190,14 +190,14 @@ public abstract class AbstractItemProvider extends ContainerItemProvider<IContai
       else if (obj instanceof IBuddyCollaboration)
       {
         final IBuddyCollaboration collaboration = (IBuddyCollaboration)obj;
-        manager.add(new SafeAction(
-            Messages.getString("AbstractItemProvider.0"), Messages.getString("AbstractItemProvider.1")) //$NON-NLS-1$ //$NON-NLS-2$
+        manager.add(
+            new SafeAction(Messages.getString("AbstractItemProvider.0"), Messages.getString("AbstractItemProvider.1")) //$NON-NLS-1$ //$NON-NLS-2$
             {
-              @Override
-              protected void safeRun() throws Exception
-              {
-                collaboration.leave();
-              }
+          @Override
+          protected void safeRun() throws Exception
+          {
+            collaboration.leave();
+          }
             });
       }
     }
@@ -220,8 +220,8 @@ public abstract class AbstractItemProvider extends ContainerItemProvider<IContai
 
     public RemoveAction(Object object)
     {
-      super(
-          Messages.getString("AbstractItemProvider.2"), Messages.getString("AbstractItemProvider.3"), ContainerView.getDeleteImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
+      super(Messages.getString("AbstractItemProvider.2"), Messages.getString("AbstractItemProvider.3"), //$NON-NLS-1$ //$NON-NLS-2$
+          ContainerView.getDeleteImageDescriptor());
       this.object = object;
     }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
index cc999fc595..94e72013d4 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
index 60c9c900e3..15474ab6d9 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
index 82de32611e..b8e97d1efa 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
index d52da85076..1e171edcd3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
index 7c02119c54..42ff0b1c1f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
index ad261b8ebe..03f50aa980 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
index 44aa6496c9..d92253a90c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
index 419750582d..f2218983e3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
index 3da388957a..efb9a01559 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
index 88a7f590fd..377b99baa3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.ui.UIActivator;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
index 6484e57a67..4d36bce199 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/messages/Messages.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/messages/Messages.java
index e8ef2338d2..dd42fcbccc 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
index 2987318552..df0a7684e9 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
index 64121564f6..7d869f94b1 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java
index 837689daa8..29a09e2823 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -206,7 +206,7 @@ public class CollaborationsView extends SessionManagerView
     private StartFacilityAction(IBuddyCollaboration collaboration, String type, ImageDescriptor descriptor)
     {
       super(MessageFormat.format(Messages.getString("CollaborationsView_2"), StringUtil.cap(type)), AS_RADIO_BUTTON); //$NON-NLS-1$
-      setToolTipText(MessageFormat.format(Messages.getString("CollaborationsView_3"), type)); //$NON-NLS-1$ 
+      setToolTipText(MessageFormat.format(Messages.getString("CollaborationsView_3"), type)); //$NON-NLS-1$
       setImageDescriptor(descriptor);
       this.collaboration = collaboration;
       this.type = type;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
index 2377dd1d1c..a41666307b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
index 94f56f70c6..e1a647e042 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java
index 393e0bf0c2..9c5abc2e7b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/IFacilityPaneCreator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
index 360e995824..081e0ff0d9 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
index 3c994acf85..6254417d7a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManager.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManager.java
index 66b19e13ac..f4fb78681e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManager.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManager.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManagerEvent.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManagerEvent.java
index 56470dbc47..a80a8366dd 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManagerEvent.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/ISessionManagerEvent.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
index c80b3966ef..e9dd20cdd4 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
index 394fb36d8e..86a1dc08c5 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java
index 9901771045..c58a440e14 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
@@ -36,16 +36,16 @@ public abstract class OM
   public static final OMPreferences PREFS = BUNDLE.preferences();
 
   public static final OMPreference<String> PREF_CONNECTOR_DESCRIPTION = //
-  PREFS.init("PREF_CONNECTOR_DESCRIPTION", "tcp://localhost"); //$NON-NLS-1$ //$NON-NLS-2$
+      PREFS.init("PREF_CONNECTOR_DESCRIPTION", "tcp://localhost"); //$NON-NLS-1$ //$NON-NLS-2$
 
   public static final OMPreference<String> PREF_USER_ID = //
-  PREFS.init("PREF_USER_ID", System.getProperty("user.name")); //$NON-NLS-1$ //$NON-NLS-2$
+      PREFS.init("PREF_USER_ID", System.getProperty("user.name")); //$NON-NLS-1$ //$NON-NLS-2$
 
   public static final OMPreference<String> PREF_PASSWORD = //
-  PREFS.initString("PREF_PASSWORD"); //$NON-NLS-1$
+      PREFS.initString("PREF_PASSWORD"); //$NON-NLS-1$
 
   public static final OMPreference<Boolean> PREF_AUTO_CONNECT = //
-  PREFS.init("PREF_AUTO_CONNECT", false); //$NON-NLS-1$
+      PREFS.init("PREF_AUTO_CONNECT", false); //$NON-NLS-1$
 
   /**
    * @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
index 7ea8f14f1c..f3c07368f8 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
index e430b60cda..61c0fe2364 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
index 7d747cc7e1..5ef0de0bf3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
index 500e56caf9..b6adccf4a4 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java
index 82e3243321..3c2a84b2b7 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientCollaborationLeftIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
index 7f0e323b03..02af883236 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/CollaborationInitiatedIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
index 5b5a3c433e..eea09de9cc 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/FacilityInstalledIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
index d138e1857e..92afc85665 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
index 7d6ccc645f..348b06c459 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
index 0b1c3bfe73..a3f404fb9e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
index 2b4144745a..9406d1698f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
index 8c81d557bd..efacb85d62 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
index adaffccc9a..7b55808de9 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.admin
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.jms.internal.admin.bundle.OM
@@ -10,8 +10,8 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.jms;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.jms.admin;version="4.0.300",
- org.eclipse.net4j.jms.internal.admin;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.internal.admin.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.internal.admin.protocol;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.net4j.jms.admin;version="4.0.400",
+ org.eclipse.net4j.jms.internal.admin;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.internal.admin.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.internal.admin.protocol;version="4.0.400";x-internal:=true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java
index f8336ddd89..bd76cee07e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java
index 7bc2d9aa17..cd17f1d056 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java
index 40602b7baf..c2083d8332 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
index e5cf3bf8de..483ef9bcdb 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
index c095b580f3..62fbb3f0de 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java
index 7a7da05c49..0d2854fd0a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
index 09e394fde1..bd9d798a60 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.api
-Bundle-Version: 3.1.100.qualifier
+Bundle-Version: 3.1.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java
index 669d1b3891..139d5a2da3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java
@@ -1,577 +1,519 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
- 
 package javax.jms;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/** A <CODE>BytesMessage</CODE> object is used to send a message containing a 
-  * stream of uninterpreted bytes. It inherits from the <CODE>Message</CODE> 
-  * interface and adds a bytes
-  * message body. The receiver of the message supplies the interpretation
-  * of the bytes.
-  *
-  * <P>The <CODE>BytesMessage</CODE> methods are based largely on those found in
-  * <CODE>java.io.DataInputStream</CODE> and
-  * <CODE>java.io.DataOutputStream</CODE>.
-  *
-  * <P>This message type is for client encoding of existing message formats. 
-  * If possible, one of the other self-defining message types should be used 
-  * instead.
-  *
-  * <P>Although the JMS API allows the use of message properties with byte 
-  * messages, they are typically not used, since the inclusion of properties 
-  * may affect the format.
-  *
-  * <P>The primitive types can be written explicitly using methods
-  * for each type. They may also be written generically as objects.
-  * For instance, a call to <CODE>BytesMessage.writeInt(6)</CODE> is
-  * equivalent to <CODE>BytesMessage.writeObject(new Integer(6))</CODE>.
-  * Both forms are provided, because the explicit form is convenient for
-  * static programming, and the object form is needed when types are not known
-  * at compile time.
-  *
-  * <P>When the message is first created, and when <CODE>clearBody</CODE>
-  * is called, the body of the message is in write-only mode. After the 
-  * first call to <CODE>reset</CODE> has been made, the message body is in 
-  * read-only mode. 
-  * After a message has been sent, the client that sent it can retain and 
-  * modify it without affecting the message that has been sent. The same message
-  * object can be sent multiple times.
-  * When a message has been received, the provider has called 
-  * <CODE>reset</CODE> so that the message body is in read-only mode for the client.
-  *
-  * <P>If <CODE>clearBody</CODE> is called on a message in read-only mode, 
-  * the message body is cleared and the message is in write-only mode.
-  *
-  * <P>If a client attempts to read a message in write-only mode, a 
-  * <CODE>MessageNotReadableException</CODE> is thrown.
-  *
-  * <P>If a client attempts to write a message in read-only mode, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown.
-  *
-  * @version     1.1 April 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session#createBytesMessage()
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.StreamMessage
-  * @see         javax.jms.TextMessage
-  */
-
-public interface BytesMessage extends Message {
-    
-     /** Gets the number of bytes of the message body when the message
-       * is in read-only mode. The value returned can be used to allocate 
-       * a byte array. The value returned is the entire length of the message
-       *  body, regardless of where the pointer for reading the message 
-       * is currently located.
-       * 
-       * @return number of bytes in the message 
-       * @exception JMSException if the JMS provider fails to read the message 
-       *                         due to some internal error.
-       * @exception MessageNotReadableException if the message is in write-only
-       *                         mode.
-       * @since 1.1 
-       */
-       
-      long getBodyLength() throws JMSException;
-
-    /** Reads a <code>boolean</code> from the bytes message stream.
-      *
-      * @return the <code>boolean</code> value read
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */
-    
- 
-    boolean 
-    readBoolean() throws JMSException;
-
-
-    /** Reads a signed 8-bit value from the bytes message stream.
-      *
-      * @return the next byte from the bytes message stream as a signed 8-bit
-      * <code>byte</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    byte 
-    readByte() throws JMSException;
-
-
-    /** Reads an unsigned 8-bit number from the bytes message stream.
-      *  
-      * @return the next byte from the bytes message stream, interpreted as an
-      * unsigned 8-bit number
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */
-
-    int
-    readUnsignedByte() throws JMSException;
-
-
-    /** Reads a signed 16-bit number from the bytes message stream.
-      *
-      * @return the next two bytes from the bytes message stream, interpreted as
-      * a signed 16-bit number
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    short 
-    readShort() throws JMSException;
-
-
-    /** Reads an unsigned 16-bit number from the bytes message stream.
-      *  
-      * @return the next two bytes from the bytes message stream, interpreted as
-      * an unsigned 16-bit integer
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
- 
-    int
-    readUnsignedShort() throws JMSException;
-
-
-    /** Reads a Unicode character value from the bytes message stream.
-      *
-      * @return the next two bytes from the bytes message stream as a Unicode
-      * character
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    char 
-    readChar() throws JMSException;
-
-
-    /** Reads a signed 32-bit integer from the bytes message stream.
-      *
-      * @return the next four bytes from the bytes message stream, interpreted
-      * as an <code>int</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    int 
-    readInt() throws JMSException;
-
-
-    /** Reads a signed 64-bit integer from the bytes message stream.
-      *
-      * @return the next eight bytes from the bytes message stream, interpreted
-      * as a <code>long</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    long 
-    readLong() throws JMSException;
-
-
-    /** Reads a <code>float</code> from the bytes message stream.
-      *
-      * @return the next four bytes from the bytes message stream, interpreted
-      * as a <code>float</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    float 
-    readFloat() throws JMSException;
-
-
-    /** Reads a <code>double</code> from the bytes message stream.
-      *
-      * @return the next eight bytes from the bytes message stream, interpreted
-      * as a <code>double</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    double 
-    readDouble() throws JMSException;
-
-
-    /** Reads a string that has been encoded using a modified UTF-8
-      * format from the bytes message stream.
-      *
-      * <P>For more information on the UTF-8 format, see "File System Safe
-      * UCS Transformation Format (FSS_UTF)", X/Open Preliminary Specification,
-      * X/Open Company Ltd., Document Number: P316. This information also
-      * appears in ISO/IEC 10646, Annex P.
-      *
-      * @return a Unicode string from the bytes message stream
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    String 
-    readUTF() throws JMSException;
-
-
-    /** Reads a byte array from the bytes message stream.
-      *
-      * <P>If the length of array <code>value</code> is less than the number of 
-      * bytes remaining to be read from the stream, the array should 
-      * be filled. A subsequent call reads the next increment, and so on.
-      * 
-      * <P>If the number of bytes remaining in the stream is less than the 
-      * length of 
-      * array <code>value</code>, the bytes should be read into the array. 
-      * The return value of the total number of bytes read will be less than
-      * the length of the array, indicating that there are no more bytes left 
-      * to be read from the stream. The next read of the stream returns -1.
-      *
-      * @param value the buffer into which the data is read
-      *
-      * @return the total number of bytes read into the buffer, or -1 if 
-      * there is no more data because the end of the stream has been reached
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    int
-    readBytes(byte[] value) throws JMSException;
-
-
-    /** Reads a portion of the bytes message stream.
-      *
-      * <P>If the length of array <code>value</code> is less than the number of
-      * bytes remaining to be read from the stream, the array should 
-      * be filled. A subsequent call reads the next increment, and so on.
-      * 
-      * <P>If the number of bytes remaining in the stream is less than the 
-      * length of 
-      * array <code>value</code>, the bytes should be read into the array. 
-      * The return value of the total number of bytes read will be less than
-      * the length of the array, indicating that there are no more bytes left 
-      * to be read from the stream. The next read of the stream returns -1.
-      *
-      * <p> If <code>length</code> is negative, or
-      * <code>length</code> is greater than the length of the array
-      * <code>value</code>, then an <code>IndexOutOfBoundsException</code> is
-      * thrown. No bytes will be read from the stream for this exception case.
-      *  
-      * @param value the buffer into which the data is read
-      * @param length the number of bytes to read; must be less than or equal to
-      *        <code>value.length</code>
-      * 
-      * @return the total number of bytes read into the buffer, or -1 if
-      * there is no more data because the end of the stream has been reached
-      *  
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    int
-    readBytes(byte[] value, int length) 
-			throws JMSException;
-
-
-    /** Writes a <code>boolean</code> to the bytes message stream as a 1-byte 
-      * value.
-      * The value <code>true</code> is written as the value 
-      * <code>(byte)1</code>; the value <code>false</code> is written as 
-      * the value <code>(byte)0</code>.
-      *
-      * @param value the <code>boolean</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */
-
-    void 
-    writeBoolean(boolean value) 
-			throws JMSException;
-
-
-    /** Writes a <code>byte</code> to the bytes message stream as a 1-byte 
-      * value.
-      *
-      * @param value the <code>byte</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeByte(byte value) throws JMSException;
-
-
-    /** Writes a <code>short</code> to the bytes message stream as two bytes,
-      * high byte first.
-      *
-      * @param value the <code>short</code> to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeShort(short value) throws JMSException;
-
-
-    /** Writes a <code>char</code> to the bytes message stream as a 2-byte
-      * value, high byte first.
-      *
-      * @param value the <code>char</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeChar(char value) throws JMSException;
-
-
-    /** Writes an <code>int</code> to the bytes message stream as four bytes, 
-      * high byte first.
-      *
-      * @param value the <code>int</code> to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeInt(int value) throws JMSException;
-
-
-    /** Writes a <code>long</code> to the bytes message stream as eight bytes, 
-      * high byte first.
-      *
-      * @param value the <code>long</code> to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeLong(long value) throws JMSException;
-
-
-    /** Converts the <code>float</code> argument to an <code>int</code> using 
-      * the
-      * <code>floatToIntBits</code> method in class <code>Float</code>,
-      * and then writes that <code>int</code> value to the bytes message
-      * stream as a 4-byte quantity, high byte first.
-      *
-      * @param value the <code>float</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeFloat(float value) throws JMSException;
-
-
-    /** Converts the <code>double</code> argument to a <code>long</code> using 
-      * the
-      * <code>doubleToLongBits</code> method in class <code>Double</code>,
-      * and then writes that <code>long</code> value to the bytes message
-      * stream as an 8-byte quantity, high byte first.
-      *
-      * @param value the <code>double</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeDouble(double value) throws JMSException;
-
-
-    /** Writes a string to the bytes message stream using UTF-8 encoding in a 
-      * machine-independent manner.
-      *
-      * <P>For more information on the UTF-8 format, see "File System Safe 
-      * UCS Transformation Format (FSS_UTF)", X/Open Preliminary Specification,       
-      * X/Open Company Ltd., Document Number: P316. This information also 
-      * appears in ISO/IEC 10646, Annex P. 
-      *
-      * @param value the <code>String</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeUTF(String value) throws JMSException;
-
-
-    /** Writes a byte array to the bytes message stream.
-      *
-      * @param value the byte array to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void
-    writeBytes(byte[] value) throws JMSException;
-
-
-    /** Writes a portion of a byte array to the bytes message stream.
-      *  
-      * @param value the byte array value to be written
-      * @param offset the initial offset within the byte array
-      * @param length the number of bytes to use
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
- 
-    void
-    writeBytes(byte[] value, int offset, int length) 
-			throws JMSException;
-
-
-    /** Writes an object to the bytes message stream.
-      *
-      * <P>This method works only for the objectified primitive
-      * object types (<code>Integer</code>, <code>Double</code>, 
-      * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
-      * arrays.
-      *
-      * @param value the object in the Java programming language ("Java 
-      *              object") to be written; it must not be null
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if the object is of an invalid type.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      * @exception java.lang.NullPointerException if the parameter 
-      *                                           <code>value</code> is null.
-      */ 
-
-    void 
-    writeObject(Object value) throws JMSException;
-
-
-    /** Puts the message body in read-only mode and repositions the stream of 
-      * bytes to the beginning.
-      *  
-      * @exception JMSException if the JMS provider fails to reset the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if the message has an invalid
-      *                         format.
-      */ 
-
-    void
-    reset() throws JMSException;
+/** A <CODE>BytesMessage</CODE> object is used to send a message containing a
+ * stream of uninterpreted bytes. It inherits from the <CODE>Message</CODE>
+ * interface and adds a bytes
+ * message body. The receiver of the message supplies the interpretation
+ * of the bytes.
+ *
+ * <P>The <CODE>BytesMessage</CODE> methods are based largely on those found in
+ * <CODE>java.io.DataInputStream</CODE> and
+ * <CODE>java.io.DataOutputStream</CODE>.
+ *
+ * <P>This message type is for client encoding of existing message formats.
+ * If possible, one of the other self-defining message types should be used
+ * instead.
+ *
+ * <P>Although the JMS API allows the use of message properties with byte
+ * messages, they are typically not used, since the inclusion of properties
+ * may affect the format.
+ *
+ * <P>The primitive types can be written explicitly using methods
+ * for each type. They may also be written generically as objects.
+ * For instance, a call to <CODE>BytesMessage.writeInt(6)</CODE> is
+ * equivalent to <CODE>BytesMessage.writeObject(new Integer(6))</CODE>.
+ * Both forms are provided, because the explicit form is convenient for
+ * static programming, and the object form is needed when types are not known
+ * at compile time.
+ *
+ * <P>When the message is first created, and when <CODE>clearBody</CODE>
+ * is called, the body of the message is in write-only mode. After the
+ * first call to <CODE>reset</CODE> has been made, the message body is in
+ * read-only mode.
+ * After a message has been sent, the client that sent it can retain and
+ * modify it without affecting the message that has been sent. The same message
+ * object can be sent multiple times.
+ * When a message has been received, the provider has called
+ * <CODE>reset</CODE> so that the message body is in read-only mode for the client.
+ *
+ * <P>If <CODE>clearBody</CODE> is called on a message in read-only mode,
+ * the message body is cleared and the message is in write-only mode.
+ *
+ * <P>If a client attempts to read a message in write-only mode, a
+ * <CODE>MessageNotReadableException</CODE> is thrown.
+ *
+ * <P>If a client attempts to write a message in read-only mode, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown.
+ *
+ * @version     1.1 April 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session#createBytesMessage()
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.StreamMessage
+ * @see         javax.jms.TextMessage
+ */
+
+public interface BytesMessage extends Message
+{
+
+  /** Gets the number of bytes of the message body when the message
+    * is in read-only mode. The value returned can be used to allocate 
+    * a byte array. The value returned is the entire length of the message
+    *  body, regardless of where the pointer for reading the message 
+    * is currently located.
+    * 
+    * @return number of bytes in the message 
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageNotReadableException if the message is in write-only
+    *                         mode.
+    * @since 1.1 
+    */
+
+  long getBodyLength() throws JMSException;
+
+  /** Reads a <code>boolean</code> from the bytes message stream.
+    *
+    * @return the <code>boolean</code> value read
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  boolean readBoolean() throws JMSException;
+
+  /** Reads a signed 8-bit value from the bytes message stream.
+    *
+    * @return the next byte from the bytes message stream as a signed 8-bit
+    * <code>byte</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  byte readByte() throws JMSException;
+
+  /** Reads an unsigned 8-bit number from the bytes message stream.
+    *  
+    * @return the next byte from the bytes message stream, interpreted as an
+    * unsigned 8-bit number
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readUnsignedByte() throws JMSException;
+
+  /** Reads a signed 16-bit number from the bytes message stream.
+    *
+    * @return the next two bytes from the bytes message stream, interpreted as
+    * a signed 16-bit number
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  short readShort() throws JMSException;
+
+  /** Reads an unsigned 16-bit number from the bytes message stream.
+    *  
+    * @return the next two bytes from the bytes message stream, interpreted as
+    * an unsigned 16-bit integer
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readUnsignedShort() throws JMSException;
+
+  /** Reads a Unicode character value from the bytes message stream.
+    *
+    * @return the next two bytes from the bytes message stream as a Unicode
+    * character
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  char readChar() throws JMSException;
+
+  /** Reads a signed 32-bit integer from the bytes message stream.
+    *
+    * @return the next four bytes from the bytes message stream, interpreted
+    * as an <code>int</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readInt() throws JMSException;
+
+  /** Reads a signed 64-bit integer from the bytes message stream.
+    *
+    * @return the next eight bytes from the bytes message stream, interpreted
+    * as a <code>long</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  long readLong() throws JMSException;
+
+  /** Reads a <code>float</code> from the bytes message stream.
+    *
+    * @return the next four bytes from the bytes message stream, interpreted
+    * as a <code>float</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  float readFloat() throws JMSException;
+
+  /** Reads a <code>double</code> from the bytes message stream.
+    *
+    * @return the next eight bytes from the bytes message stream, interpreted
+    * as a <code>double</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  double readDouble() throws JMSException;
+
+  /** Reads a string that has been encoded using a modified UTF-8
+    * format from the bytes message stream.
+    *
+    * <P>For more information on the UTF-8 format, see "File System Safe
+    * UCS Transformation Format (FSS_UTF)", X/Open Preliminary Specification,
+    * X/Open Company Ltd., Document Number: P316. This information also
+    * appears in ISO/IEC 10646, Annex P.
+    *
+    * @return a Unicode string from the bytes message stream
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  String readUTF() throws JMSException;
+
+  /** Reads a byte array from the bytes message stream.
+    *
+    * <P>If the length of array <code>value</code> is less than the number of 
+    * bytes remaining to be read from the stream, the array should 
+    * be filled. A subsequent call reads the next increment, and so on.
+    * 
+    * <P>If the number of bytes remaining in the stream is less than the 
+    * length of 
+    * array <code>value</code>, the bytes should be read into the array. 
+    * The return value of the total number of bytes read will be less than
+    * the length of the array, indicating that there are no more bytes left 
+    * to be read from the stream. The next read of the stream returns -1.
+    *
+    * @param value the buffer into which the data is read
+    *
+    * @return the total number of bytes read into the buffer, or -1 if 
+    * there is no more data because the end of the stream has been reached
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readBytes(byte[] value) throws JMSException;
+
+  /** Reads a portion of the bytes message stream.
+    *
+    * <P>If the length of array <code>value</code> is less than the number of
+    * bytes remaining to be read from the stream, the array should 
+    * be filled. A subsequent call reads the next increment, and so on.
+    * 
+    * <P>If the number of bytes remaining in the stream is less than the 
+    * length of 
+    * array <code>value</code>, the bytes should be read into the array. 
+    * The return value of the total number of bytes read will be less than
+    * the length of the array, indicating that there are no more bytes left 
+    * to be read from the stream. The next read of the stream returns -1.
+    *
+    * <p> If <code>length</code> is negative, or
+    * <code>length</code> is greater than the length of the array
+    * <code>value</code>, then an <code>IndexOutOfBoundsException</code> is
+    * thrown. No bytes will be read from the stream for this exception case.
+    *  
+    * @param value the buffer into which the data is read
+    * @param length the number of bytes to read; must be less than or equal to
+    *        <code>value.length</code>
+    * 
+    * @return the total number of bytes read into the buffer, or -1 if
+    * there is no more data because the end of the stream has been reached
+    *  
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readBytes(byte[] value, int length) throws JMSException;
+
+  /** Writes a <code>boolean</code> to the bytes message stream as a 1-byte 
+    * value.
+    * The value <code>true</code> is written as the value 
+    * <code>(byte)1</code>; the value <code>false</code> is written as 
+    * the value <code>(byte)0</code>.
+    *
+    * @param value the <code>boolean</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBoolean(boolean value) throws JMSException;
+
+  /** Writes a <code>byte</code> to the bytes message stream as a 1-byte 
+    * value.
+    *
+    * @param value the <code>byte</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeByte(byte value) throws JMSException;
+
+  /** Writes a <code>short</code> to the bytes message stream as two bytes,
+    * high byte first.
+    *
+    * @param value the <code>short</code> to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeShort(short value) throws JMSException;
+
+  /** Writes a <code>char</code> to the bytes message stream as a 2-byte
+    * value, high byte first.
+    *
+    * @param value the <code>char</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeChar(char value) throws JMSException;
+
+  /** Writes an <code>int</code> to the bytes message stream as four bytes, 
+    * high byte first.
+    *
+    * @param value the <code>int</code> to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeInt(int value) throws JMSException;
+
+  /** Writes a <code>long</code> to the bytes message stream as eight bytes, 
+    * high byte first.
+    *
+    * @param value the <code>long</code> to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeLong(long value) throws JMSException;
+
+  /** Converts the <code>float</code> argument to an <code>int</code> using 
+    * the
+    * <code>floatToIntBits</code> method in class <code>Float</code>,
+    * and then writes that <code>int</code> value to the bytes message
+    * stream as a 4-byte quantity, high byte first.
+    *
+    * @param value the <code>float</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeFloat(float value) throws JMSException;
+
+  /** Converts the <code>double</code> argument to a <code>long</code> using 
+    * the
+    * <code>doubleToLongBits</code> method in class <code>Double</code>,
+    * and then writes that <code>long</code> value to the bytes message
+    * stream as an 8-byte quantity, high byte first.
+    *
+    * @param value the <code>double</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeDouble(double value) throws JMSException;
+
+  /** Writes a string to the bytes message stream using UTF-8 encoding in a 
+    * machine-independent manner.
+    *
+    * <P>For more information on the UTF-8 format, see "File System Safe 
+    * UCS Transformation Format (FSS_UTF)", X/Open Preliminary Specification,       
+    * X/Open Company Ltd., Document Number: P316. This information also 
+    * appears in ISO/IEC 10646, Annex P. 
+    *
+    * @param value the <code>String</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeUTF(String value) throws JMSException;
+
+  /** Writes a byte array to the bytes message stream.
+    *
+    * @param value the byte array to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBytes(byte[] value) throws JMSException;
+
+  /** Writes a portion of a byte array to the bytes message stream.
+    *  
+    * @param value the byte array value to be written
+    * @param offset the initial offset within the byte array
+    * @param length the number of bytes to use
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBytes(byte[] value, int offset, int length) throws JMSException;
+
+  /** Writes an object to the bytes message stream.
+    *
+    * <P>This method works only for the objectified primitive
+    * object types (<code>Integer</code>, <code>Double</code>, 
+    * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
+    * arrays.
+    *
+    * @param value the object in the Java programming language ("Java 
+    *              object") to be written; it must not be null
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if the object is of an invalid type.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    * @exception java.lang.NullPointerException if the parameter 
+    *                                           <code>value</code> is null.
+    */
+
+  void writeObject(Object value) throws JMSException;
+
+  /** Puts the message body in read-only mode and repositions the stream of 
+    * bytes to the beginning.
+    *  
+    * @exception JMSException if the JMS provider fails to reset the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if the message has an invalid
+    *                         format.
+    */
+
+  void reset() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
index 93e1361bd0..690d89bf72 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
@@ -1,414 +1,388 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A <CODE>Connection</CODE> object is a client's active connection to its JMS 
-  * provider. It typically allocates provider resources outside the Java virtual
-  * machine (JVM).
-  *
-  * <P>Connections support concurrent use.
-  *
-  * <P>A connection serves several purposes:
-  *
-  * <UL>
-  *   <LI>It encapsulates an open connection with a JMS provider. It 
-  *       typically represents an open TCP/IP socket between a client and 
-  *       the service provider software.
-  *   <LI>Its creation is where client authentication takes place.
-  *   <LI>It can specify a unique client identifier.
-  *   <LI>It provides a <CODE>ConnectionMetaData</CODE> object.
-  *   <LI>It supports an optional <CODE>ExceptionListener</CODE> object.
-  * </UL>
-  *
-  * <P>Because the creation of a connection involves setting up authentication 
-  * and communication, a connection is a relatively heavyweight 
-  * object. Most clients will do all their messaging with a single connection.
-  * Other more advanced applications may use several connections. The JMS API
-  * does 
-  * not architect a reason for using multiple connections; however, there may 
-  * be operational reasons for doing so.
-  *
-  * <P>A JMS client typically creates a connection, one or more sessions, 
-  * and a number of message producers and consumers. When a connection is
-  * created, it is in stopped mode. That means that no messages are being
-  * delivered.
-  *
-  * <P>It is typical to leave the connection in stopped mode until setup 
-  * is complete (that is, until all message consumers have been 
-  * created).  At that point, the client calls 
-  * the connection's <CODE>start</CODE> method, and messages begin arriving at 
-  * the connection's consumers. This setup
-  * convention minimizes any client confusion that may result from 
-  * asynchronous message delivery while the client is still in the process 
-  * of setting itself up.
-  *
-  * <P>A connection can be started immediately, and the setup can be done 
-  * afterwards. Clients that do this must be prepared to handle asynchronous 
-  * message delivery while they are still in the process of setting up.
-  *
-  * <P>A message producer can send messages while a connection is stopped.
-  *
-  * @version     1.1 - February 1, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.ConnectionFactory
-  * @see         javax.jms.QueueConnection
-  * @see         javax.jms.TopicConnection
-  */
+/** A <CODE>Connection</CODE> object is a client's active connection to its JMS
+ * provider. It typically allocates provider resources outside the Java virtual
+ * machine (JVM).
+ *
+ * <P>Connections support concurrent use.
+ *
+ * <P>A connection serves several purposes:
+ *
+ * <UL>
+ *   <LI>It encapsulates an open connection with a JMS provider. It
+ *       typically represents an open TCP/IP socket between a client and
+ *       the service provider software.
+ *   <LI>Its creation is where client authentication takes place.
+ *   <LI>It can specify a unique client identifier.
+ *   <LI>It provides a <CODE>ConnectionMetaData</CODE> object.
+ *   <LI>It supports an optional <CODE>ExceptionListener</CODE> object.
+ * </UL>
+ *
+ * <P>Because the creation of a connection involves setting up authentication
+ * and communication, a connection is a relatively heavyweight
+ * object. Most clients will do all their messaging with a single connection.
+ * Other more advanced applications may use several connections. The JMS API
+ * does
+ * not architect a reason for using multiple connections; however, there may
+ * be operational reasons for doing so.
+ *
+ * <P>A JMS client typically creates a connection, one or more sessions,
+ * and a number of message producers and consumers. When a connection is
+ * created, it is in stopped mode. That means that no messages are being
+ * delivered.
+ *
+ * <P>It is typical to leave the connection in stopped mode until setup
+ * is complete (that is, until all message consumers have been
+ * created).  At that point, the client calls
+ * the connection's <CODE>start</CODE> method, and messages begin arriving at
+ * the connection's consumers. This setup
+ * convention minimizes any client confusion that may result from
+ * asynchronous message delivery while the client is still in the process
+ * of setting itself up.
+ *
+ * <P>A connection can be started immediately, and the setup can be done
+ * afterwards. Clients that do this must be prepared to handle asynchronous
+ * message delivery while they are still in the process of setting up.
+ *
+ * <P>A message producer can send messages while a connection is stopped.
+ *
+ * @version     1.1 - February 1, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.ConnectionFactory
+ * @see         javax.jms.QueueConnection
+ * @see         javax.jms.TopicConnection
+ */
 
-public interface Connection {
+public interface Connection
+{
 
- /** Creates a <CODE>Session</CODE> object.
-      *  
-      * @param transacted indicates whether the session is transacted
-      * @param acknowledgeMode indicates whether the consumer or the
-      * client will acknowledge any messages it receives; ignored if the session
-      * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
-      * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
-      * <code>Session.DUPS_OK_ACKNOWLEDGE</code>.
-      *  
-      * @return a newly created  session
-      *  
-      * @exception JMSException if the <CODE>Connection</CODE> object fails
-      *                         to create a session due to some internal error or
-      *                         lack of support for the specific transaction
-      *                         and acknowledgement mode.
-      * @since 1.1
-      *
-      * @see Session#AUTO_ACKNOWLEDGE 
-      * @see Session#CLIENT_ACKNOWLEDGE 
-      * @see Session#DUPS_OK_ACKNOWLEDGE 
-  
-      */ 
+  /** Creates a <CODE>Session</CODE> object.
+   *
+   * @param transacted indicates whether the session is transacted
+   * @param acknowledgeMode indicates whether the consumer or the
+   * client will acknowledge any messages it receives; ignored if the session
+   * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>,
+   * <code>Session.CLIENT_ACKNOWLEDGE</code>, and
+   * <code>Session.DUPS_OK_ACKNOWLEDGE</code>.
+   *
+   * @return a newly created  session
+   *
+   * @exception JMSException if the <CODE>Connection</CODE> object fails
+   *                         to create a session due to some internal error or
+   *                         lack of support for the specific transaction
+   *                         and acknowledgement mode.
+   * @since 1.1
+   *
+   * @see Session#AUTO_ACKNOWLEDGE
+   * @see Session#CLIENT_ACKNOWLEDGE
+   * @see Session#DUPS_OK_ACKNOWLEDGE
 
-    Session
-    createSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
-    
-    
-    /** Gets the client identifier for this connection.
-      *  
-      * <P>This value is specific to the JMS provider.  It is either preconfigured 
-      * by an administrator in a <CODE>ConnectionFactory</CODE> object
-      * or assigned dynamically by the application by calling the
-      * <code>setClientID</code> method.
-      * 
-      * 
-      * @return the unique client identifier
-      *  
-      * @exception JMSException if the JMS provider fails to return
-      *                         the client ID for this connection due
-      *                         to some internal error.
-      *
-      **/
-    String
-    getClientID() throws JMSException;
+   */
 
+  Session createSession(boolean transacted, int acknowledgeMode) throws JMSException;
 
-    /** Sets the client identifier for this connection.
-      *  
-      * <P>The preferred way to assign a JMS client's client identifier is for
-      * it to be configured in a client-specific <CODE>ConnectionFactory</CODE>
-      * object and transparently assigned to the <CODE>Connection</CODE> object
-      * it creates.
-      * 
-      * <P>Alternatively, a client can set a connection's client identifier
-      * using a provider-specific value. The facility to set a connection's
-      * client identifier explicitly is not a mechanism for overriding the
-      * identifier that has been administratively configured. It is provided
-      * for the case where no administratively specified identifier exists.
-      * If one does exist, an attempt to change it by setting it must throw an
-      * <CODE>IllegalStateException</CODE>. If a client sets the client identifier
-      * explicitly, it must do so immediately after it creates the connection 
-      * and before any other
-      * action on the connection is taken. After this point, setting the
-      * client identifier is a programming error that should throw an
-      * <CODE>IllegalStateException</CODE>.
-      *
-      * <P>The purpose of the client identifier is to associate a connection and
-      * its objects with a state maintained on behalf of the client by a 
-      * provider. The only such state identified by the JMS API is that required
-      * to support durable subscriptions.
-      *
-      * <P>If another connection with the same <code>clientID</code> is already running when
-      * this method is called, the JMS provider should detect the duplicate ID and throw
-      * an <CODE>InvalidClientIDException</CODE>.
-      *
-      * @param clientID the unique client identifier
-      * 
-      * @exception JMSException if the JMS provider fails to
-      *                         set the client ID for this connection due
-      *                         to some internal error.
-      *
-      * @exception InvalidClientIDException if the JMS client specifies an
-      *                         invalid or duplicate client ID.
-      * @exception IllegalStateException if the JMS client attempts to set
-      *       a connection's client ID at the wrong time or
-      *       when it has been administratively configured.
-      */
+  /** Gets the client identifier for this connection.
+    *  
+    * <P>This value is specific to the JMS provider.  It is either preconfigured 
+    * by an administrator in a <CODE>ConnectionFactory</CODE> object
+    * or assigned dynamically by the application by calling the
+    * <code>setClientID</code> method.
+    * 
+    * 
+    * @return the unique client identifier
+    *  
+    * @exception JMSException if the JMS provider fails to return
+    *                         the client ID for this connection due
+    *                         to some internal error.
+    *
+    **/
+  String getClientID() throws JMSException;
 
-    void
-    setClientID(String clientID) throws JMSException;
+  /** Sets the client identifier for this connection.
+    *  
+    * <P>The preferred way to assign a JMS client's client identifier is for
+    * it to be configured in a client-specific <CODE>ConnectionFactory</CODE>
+    * object and transparently assigned to the <CODE>Connection</CODE> object
+    * it creates.
+    * 
+    * <P>Alternatively, a client can set a connection's client identifier
+    * using a provider-specific value. The facility to set a connection's
+    * client identifier explicitly is not a mechanism for overriding the
+    * identifier that has been administratively configured. It is provided
+    * for the case where no administratively specified identifier exists.
+    * If one does exist, an attempt to change it by setting it must throw an
+    * <CODE>IllegalStateException</CODE>. If a client sets the client identifier
+    * explicitly, it must do so immediately after it creates the connection 
+    * and before any other
+    * action on the connection is taken. After this point, setting the
+    * client identifier is a programming error that should throw an
+    * <CODE>IllegalStateException</CODE>.
+    *
+    * <P>The purpose of the client identifier is to associate a connection and
+    * its objects with a state maintained on behalf of the client by a 
+    * provider. The only such state identified by the JMS API is that required
+    * to support durable subscriptions.
+    *
+    * <P>If another connection with the same <code>clientID</code> is already running when
+    * this method is called, the JMS provider should detect the duplicate ID and throw
+    * an <CODE>InvalidClientIDException</CODE>.
+    *
+    * @param clientID the unique client identifier
+    * 
+    * @exception JMSException if the JMS provider fails to
+    *                         set the client ID for this connection due
+    *                         to some internal error.
+    *
+    * @exception InvalidClientIDException if the JMS client specifies an
+    *                         invalid or duplicate client ID.
+    * @exception IllegalStateException if the JMS client attempts to set
+    *       a connection's client ID at the wrong time or
+    *       when it has been administratively configured.
+    */
 
- 
-    /** Gets the metadata for this connection.
-      *  
-      * @return the connection metadata
-      *  
-      * @exception JMSException if the JMS provider fails to
-      *                         get the connection metadata for this connection.
-      *
-      * @see javax.jms.ConnectionMetaData
-      */
+  void setClientID(String clientID) throws JMSException;
 
-    ConnectionMetaData
-    getMetaData() throws JMSException;
+  /** Gets the metadata for this connection.
+    *  
+    * @return the connection metadata
+    *  
+    * @exception JMSException if the JMS provider fails to
+    *                         get the connection metadata for this connection.
+    *
+    * @see javax.jms.ConnectionMetaData
+    */
 
-    /**
-     * Gets the <CODE>ExceptionListener</CODE> object for this connection. 
-     * Not every <CODE>Connection</CODE> has an <CODE>ExceptionListener</CODE>
-     * associated with it.
-     *
-     * @return the <CODE>ExceptionListener</CODE> for this connection, or null. 
-     *              if no <CODE>ExceptionListener</CODE> is associated
-     *              with this connection.
-     *
-     * @exception JMSException if the JMS provider fails to
-     *                         get the <CODE>ExceptionListener</CODE> for this 
-     *                         connection. 
-     * @see javax.jms.Connection#setExceptionListener
-     */
+  ConnectionMetaData getMetaData() throws JMSException;
 
-    ExceptionListener 
-    getExceptionListener() throws JMSException;
+  /**
+   * Gets the <CODE>ExceptionListener</CODE> object for this connection. 
+   * Not every <CODE>Connection</CODE> has an <CODE>ExceptionListener</CODE>
+   * associated with it.
+   *
+   * @return the <CODE>ExceptionListener</CODE> for this connection, or null. 
+   *              if no <CODE>ExceptionListener</CODE> is associated
+   *              with this connection.
+   *
+   * @exception JMSException if the JMS provider fails to
+   *                         get the <CODE>ExceptionListener</CODE> for this 
+   *                         connection. 
+   * @see javax.jms.Connection#setExceptionListener
+   */
 
+  ExceptionListener getExceptionListener() throws JMSException;
 
-    /** Sets an exception listener for this connection.
-      *
-      * <P>If a JMS provider detects a serious problem with a connection, it
-      * informs the connection's <CODE>ExceptionListener</CODE>, if one has been
-      * registered. It does this by calling the listener's
-      * <CODE>onException</CODE> method, passing it a <CODE>JMSException</CODE>
-      * object describing the problem.
-      *
-      * <P>An exception listener allows a client to be notified of a problem
-      * asynchronously.
-      * Some connections only consume messages, so they would have no other 
-      * way to learn their connection has failed.
-      *
-      * <P>A connection serializes execution of its
-      * <CODE>ExceptionListener</CODE>.
-      *
-      * <P>A JMS provider should attempt to resolve connection problems 
-      * itself before it notifies the client of them.
-      *
-      * @param listener the exception listener
-      *
-      * @exception JMSException if the JMS provider fails to
-      *                         set the exception listener for this connection.
-      *
-      */
+  /** Sets an exception listener for this connection.
+    *
+    * <P>If a JMS provider detects a serious problem with a connection, it
+    * informs the connection's <CODE>ExceptionListener</CODE>, if one has been
+    * registered. It does this by calling the listener's
+    * <CODE>onException</CODE> method, passing it a <CODE>JMSException</CODE>
+    * object describing the problem.
+    *
+    * <P>An exception listener allows a client to be notified of a problem
+    * asynchronously.
+    * Some connections only consume messages, so they would have no other 
+    * way to learn their connection has failed.
+    *
+    * <P>A connection serializes execution of its
+    * <CODE>ExceptionListener</CODE>.
+    *
+    * <P>A JMS provider should attempt to resolve connection problems 
+    * itself before it notifies the client of them.
+    *
+    * @param listener the exception listener
+    *
+    * @exception JMSException if the JMS provider fails to
+    *                         set the exception listener for this connection.
+    *
+    */
 
-    void 
-    setExceptionListener(ExceptionListener listener) throws JMSException;
+  void setExceptionListener(ExceptionListener listener) throws JMSException;
 
-    /** Starts (or restarts) a connection's delivery of incoming messages.
-      * A call to <CODE>start</CODE> on a connection that has already been
-      * started is ignored.
-      * 
-      * @exception JMSException if the JMS provider fails to start
-      *                         message delivery due to some internal error.
-      *
-      * @see javax.jms.Connection#stop
-      */
+  /** Starts (or restarts) a connection's delivery of incoming messages.
+    * A call to <CODE>start</CODE> on a connection that has already been
+    * started is ignored.
+    * 
+    * @exception JMSException if the JMS provider fails to start
+    *                         message delivery due to some internal error.
+    *
+    * @see javax.jms.Connection#stop
+    */
 
-    void
-    start() throws JMSException;
+  void start() throws JMSException;
 
- 
-    /** Temporarily stops a connection's delivery of incoming messages.
-      * Delivery can be restarted using the connection's <CODE>start</CODE>
-      * method. When the connection is stopped,
-      * delivery to all the connection's message consumers is inhibited:
-      * synchronous receives block, and messages are not delivered to message
-      * listeners.
-      *
-      * <P>This call blocks until receives and/or message listeners in progress
-      * have completed.
-      *
-      * <P>Stopping a connection has no effect on its ability to send messages.
-      * A call to <CODE>stop</CODE> on a connection that has already been
-      * stopped is ignored.
-      *
-      * <P>A call to <CODE>stop</CODE> must not return until delivery of messages
-      * has paused. This means that a client can rely on the fact that none of 
-      * its message listeners will be called and that all threads of control 
-      * waiting for <CODE>receive</CODE> calls to return will not return with a 
-      * message until the
-      * connection is restarted. The receive timers for a stopped connection
-      * continue to advance, so receives may time out while the connection is
-      * stopped.
-      * 
-      * <P>If message listeners are running when <CODE>stop</CODE> is invoked, 
-      * the <CODE>stop</CODE> call must
-      * wait until all of them have returned before it may return. While these
-      * message listeners are completing, they must have the full services of the
-      * connection available to them.
-      *  
-      * @exception JMSException if the JMS provider fails to stop
-      *                         message delivery due to some internal error.
-      *
-      * @see javax.jms.Connection#start
-      */
+  /** Temporarily stops a connection's delivery of incoming messages.
+    * Delivery can be restarted using the connection's <CODE>start</CODE>
+    * method. When the connection is stopped,
+    * delivery to all the connection's message consumers is inhibited:
+    * synchronous receives block, and messages are not delivered to message
+    * listeners.
+    *
+    * <P>This call blocks until receives and/or message listeners in progress
+    * have completed.
+    *
+    * <P>Stopping a connection has no effect on its ability to send messages.
+    * A call to <CODE>stop</CODE> on a connection that has already been
+    * stopped is ignored.
+    *
+    * <P>A call to <CODE>stop</CODE> must not return until delivery of messages
+    * has paused. This means that a client can rely on the fact that none of 
+    * its message listeners will be called and that all threads of control 
+    * waiting for <CODE>receive</CODE> calls to return will not return with a 
+    * message until the
+    * connection is restarted. The receive timers for a stopped connection
+    * continue to advance, so receives may time out while the connection is
+    * stopped.
+    * 
+    * <P>If message listeners are running when <CODE>stop</CODE> is invoked, 
+    * the <CODE>stop</CODE> call must
+    * wait until all of them have returned before it may return. While these
+    * message listeners are completing, they must have the full services of the
+    * connection available to them.
+    *  
+    * @exception JMSException if the JMS provider fails to stop
+    *                         message delivery due to some internal error.
+    *
+    * @see javax.jms.Connection#start
+    */
 
-    void
-    stop() throws JMSException;
+  void stop() throws JMSException;
 
- 
-    /** Closes the connection.
-      *
-      * <P>Since a provider typically allocates significant resources outside 
-      * the JVM on behalf of a connection, clients should close these resources
-      * when they are not needed. Relying on garbage collection to eventually 
-      * reclaim these resources may not be timely enough.
-      *
-      * <P>There is no need to close the sessions, producers, and consumers
-      * of a closed connection.
-      *
-      * <P>Closing a connection causes all temporary destinations to be
-      * deleted.
-      *
-      * <P>When this method is invoked, it should not return until message
-      * processing has been shut down in an orderly fashion. This means that all
-      * message 
-      * listeners that may have been running have returned, and that all pending 
-      * receives have returned. A close terminates all pending message receives 
-      * on the connection's sessions' consumers. The receives may return with a 
-      * message or with null, depending on whether there was a message available 
-      * at the time of the close. If one or more of the connection's sessions' 
-      * message listeners is processing a message at the time when connection 
-      * <CODE>close</CODE> is invoked, all the facilities of the connection and 
-      * its sessions must remain available to those listeners until they return 
-      * control to the JMS provider. 
-      *
-      * <P>Closing a connection causes any of its sessions' transactions
-      * in progress to be rolled back. In the case where a session's
-      * work is coordinated by an external transaction manager, a session's 
-      * <CODE>commit</CODE> and <CODE>rollback</CODE> methods are
-      * not used and the result of a closed session's work is determined
-      * later by the transaction manager.
-      *
-      * Closing a connection does NOT force an 
-      * acknowledgment of client-acknowledged sessions. 
-      * 
-      * <P>Invoking the <CODE>acknowledge</CODE> method of a received message 
-      * from a closed connection's session must throw an 
-      * <CODE>IllegalStateException</CODE>.  Closing a closed connection must 
-      * NOT throw an exception.
-      *  
-      * @exception JMSException if the JMS provider fails to close the
-      *                         connection due to some internal error. For 
-      *                         example, a failure to release resources
-      *                         or to close a socket connection can cause
-      *                         this exception to be thrown.
-      *
-      */
+  /** Closes the connection.
+    *
+    * <P>Since a provider typically allocates significant resources outside 
+    * the JVM on behalf of a connection, clients should close these resources
+    * when they are not needed. Relying on garbage collection to eventually 
+    * reclaim these resources may not be timely enough.
+    *
+    * <P>There is no need to close the sessions, producers, and consumers
+    * of a closed connection.
+    *
+    * <P>Closing a connection causes all temporary destinations to be
+    * deleted.
+    *
+    * <P>When this method is invoked, it should not return until message
+    * processing has been shut down in an orderly fashion. This means that all
+    * message 
+    * listeners that may have been running have returned, and that all pending 
+    * receives have returned. A close terminates all pending message receives 
+    * on the connection's sessions' consumers. The receives may return with a 
+    * message or with null, depending on whether there was a message available 
+    * at the time of the close. If one or more of the connection's sessions' 
+    * message listeners is processing a message at the time when connection 
+    * <CODE>close</CODE> is invoked, all the facilities of the connection and 
+    * its sessions must remain available to those listeners until they return 
+    * control to the JMS provider. 
+    *
+    * <P>Closing a connection causes any of its sessions' transactions
+    * in progress to be rolled back. In the case where a session's
+    * work is coordinated by an external transaction manager, a session's 
+    * <CODE>commit</CODE> and <CODE>rollback</CODE> methods are
+    * not used and the result of a closed session's work is determined
+    * later by the transaction manager.
+    *
+    * Closing a connection does NOT force an 
+    * acknowledgment of client-acknowledged sessions. 
+    * 
+    * <P>Invoking the <CODE>acknowledge</CODE> method of a received message 
+    * from a closed connection's session must throw an 
+    * <CODE>IllegalStateException</CODE>.  Closing a closed connection must 
+    * NOT throw an exception.
+    *  
+    * @exception JMSException if the JMS provider fails to close the
+    *                         connection due to some internal error. For 
+    *                         example, a failure to release resources
+    *                         or to close a socket connection can cause
+    *                         this exception to be thrown.
+    *
+    */
 
-    void 
-    close() throws JMSException; 
-    
-      /** Creates a connection consumer for this connection (optional operation).
-      * This is an expert facility not used by regular JMS clients.
-      *  
-      * @param destination the destination to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector  
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the connection consumer
-      *
-      * @exception JMSException if the <CODE>Connection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid destination is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1
-      * @see javax.jms.ConnectionConsumer
-      */ 
+  void close() throws JMSException;
 
-    ConnectionConsumer
-    createConnectionConsumer(Destination destination,
-                             String messageSelector,
-                             ServerSessionPool sessionPool,
-			     int maxMessages)
-			     throws JMSException;
+  /** Creates a connection consumer for this connection (optional operation).
+  * This is an expert facility not used by regular JMS clients.
+  *  
+  * @param destination the destination to access
+  * @param messageSelector only messages with properties matching the
+  * message selector expression are delivered.  A value of null or
+  * an empty string indicates that there is no message selector  
+  * for the message consumer.
+  * @param sessionPool the server session pool to associate with this 
+  * connection consumer
+  * @param maxMessages the maximum number of messages that can be
+  * assigned to a server session at one time
+  *
+  * @return the connection consumer
+  *
+  * @exception JMSException if the <CODE>Connection</CODE> object fails
+  *                         to create a connection consumer due to some
+  *                         internal error or invalid arguments for 
+  *                         <CODE>sessionPool</CODE> and 
+  *                         <CODE>messageSelector</CODE>.
+  * @exception InvalidDestinationException if an invalid destination is specified.
+  * @exception InvalidSelectorException if the message selector is invalid.
+  *
+  * @since 1.1
+  * @see javax.jms.ConnectionConsumer
+  */
 
+  ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
+      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 
-    /** Create a durable connection consumer for this connection (optional operation). 
-      * This is an expert facility not used by regular JMS clients.
-      *                
-      * @param topic topic to access
-      * @param subscriptionName durable subscription name
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * durable connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the durable connection consumer
-      *  
-      * @exception JMSException if the <CODE>Connection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid destination
-      *             is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      * @since 1.1
-      * @see javax.jms.ConnectionConsumer
-      */
+  /** Create a durable connection consumer for this connection (optional operation). 
+    * This is an expert facility not used by regular JMS clients.
+    *                
+    * @param topic topic to access
+    * @param subscriptionName durable subscription name
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param sessionPool the server session pool to associate with this 
+    * durable connection consumer
+    * @param maxMessages the maximum number of messages that can be
+    * assigned to a server session at one time
+    *
+    * @return the durable connection consumer
+    *  
+    * @exception JMSException if the <CODE>Connection</CODE> object fails
+    *                         to create a connection consumer due to some
+    *                         internal error or invalid arguments for 
+    *                         <CODE>sessionPool</CODE> and 
+    *                         <CODE>messageSelector</CODE>.
+    * @exception InvalidDestinationException if an invalid destination
+    *             is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    * @since 1.1
+    * @see javax.jms.ConnectionConsumer
+    */
 
-    ConnectionConsumer
-    createDurableConnectionConsumer(Topic topic,
-				    String subscriptionName,
-                                    String messageSelector,
-                                    ServerSessionPool sessionPool,
-				    int maxMessages)
-                             throws JMSException;
+  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
+      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 }
-
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java
index d6876fbaac..1c09a0f4f8 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java
@@ -1,85 +1,82 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** For application servers, <CODE>Connection</CODE> objects provide a special 
-  * facility 
-  * for creating a <CODE>ConnectionConsumer</CODE> (optional). The messages it 
-  * is to consume are 
-  * specified by a <CODE>Destination</CODE> and a message selector. In addition,
-  * a <CODE>ConnectionConsumer</CODE> must be given a 
-  * <CODE>ServerSessionPool</CODE> to use for 
-  * processing its messages.
-  *
-  * <P>Normally, when traffic is light, a <CODE>ConnectionConsumer</CODE> gets a
-  * <CODE>ServerSession</CODE> from its pool, loads it with a single message, and
-  * starts it. As traffic picks up, messages can back up. If this happens, 
-  * a <CODE>ConnectionConsumer</CODE> can load each <CODE>ServerSession</CODE>
-  * with more than one 
-  * message. This reduces the thread context switches and minimizes resource 
-  * use at the expense of some serialization of message processing.
-  *
-  * @version     1.1 February 8, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see javax.jms.Connection#createConnectionConsumer
-  * @see javax.jms.Connection#createDurableConnectionConsumer
-  * @see javax.jms.QueueConnection#createConnectionConsumer
-  * @see javax.jms.TopicConnection#createConnectionConsumer
-  * @see javax.jms.TopicConnection#createDurableConnectionConsumer
-  */
+/** For application servers, <CODE>Connection</CODE> objects provide a special
+ * facility
+ * for creating a <CODE>ConnectionConsumer</CODE> (optional). The messages it
+ * is to consume are
+ * specified by a <CODE>Destination</CODE> and a message selector. In addition,
+ * a <CODE>ConnectionConsumer</CODE> must be given a
+ * <CODE>ServerSessionPool</CODE> to use for
+ * processing its messages.
+ *
+ * <P>Normally, when traffic is light, a <CODE>ConnectionConsumer</CODE> gets a
+ * <CODE>ServerSession</CODE> from its pool, loads it with a single message, and
+ * starts it. As traffic picks up, messages can back up. If this happens,
+ * a <CODE>ConnectionConsumer</CODE> can load each <CODE>ServerSession</CODE>
+ * with more than one
+ * message. This reduces the thread context switches and minimizes resource
+ * use at the expense of some serialization of message processing.
+ *
+ * @version     1.1 February 8, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see javax.jms.Connection#createConnectionConsumer
+ * @see javax.jms.Connection#createDurableConnectionConsumer
+ * @see javax.jms.QueueConnection#createConnectionConsumer
+ * @see javax.jms.TopicConnection#createConnectionConsumer
+ * @see javax.jms.TopicConnection#createDurableConnectionConsumer
+ */
 
-public interface ConnectionConsumer {
+public interface ConnectionConsumer
+{
 
-    /** Gets the server session pool associated with this connection consumer.
-      *  
-      * @return the server session pool used by this connection consumer
-      *  
-      * @exception JMSException if the JMS provider fails to get the server 
-      *                         session pool associated with this consumer due
-      *                         to some internal error.
-      */
+  /** Gets the server session pool associated with this connection consumer.
+    *  
+    * @return the server session pool used by this connection consumer
+    *  
+    * @exception JMSException if the JMS provider fails to get the server 
+    *                         session pool associated with this consumer due
+    *                         to some internal error.
+    */
 
-    ServerSessionPool 
-    getServerSessionPool() throws JMSException; 
+  ServerSessionPool getServerSessionPool() throws JMSException;
 
- 
-    /** Closes the connection consumer.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a 
-      * connection consumer outside the Java virtual machine, clients should 
-      * close these resources when
-      * they are not needed. Relying on garbage collection to eventually 
-      * reclaim these resources may not be timely enough.
-      *  
-      * @exception JMSException if the JMS provider fails to release resources 
-      *                         on behalf of the connection consumer or fails
-      *                         to close the connection consumer.
-      */
+  /** Closes the connection consumer.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a 
+    * connection consumer outside the Java virtual machine, clients should 
+    * close these resources when
+    * they are not needed. Relying on garbage collection to eventually 
+    * reclaim these resources may not be timely enough.
+    *  
+    * @exception JMSException if the JMS provider fails to release resources 
+    *                         on behalf of the connection consumer or fails
+    *                         to close the connection consumer.
+    */
 
-    void 
-    close() throws JMSException; 
+  void close() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java
index 9916d5c3d6..8936d5e705 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java
@@ -1,126 +1,123 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A <CODE>ConnectionFactory</CODE> object encapsulates a set of connection 
-  * configuration 
-  * parameters that has been defined by an administrator. A client uses 
-  * it to create a connection with a JMS provider.
-  *
-  * <P>A <CODE>ConnectionFactory</CODE> object is a JMS administered object and
-  *  supports concurrent use.
-  *
-  * <P>JMS administered objects are objects containing configuration 
-  * information that are created by an administrator and later used by 
-  * JMS clients. They make it practical to administer the JMS API in the 
-  * enterprise.
-  *
-  * <P>Although the interfaces for administered objects do not explicitly 
-  * depend on the Java Naming and Directory Interface (JNDI) API, the JMS API 
-  * establishes the convention that JMS clients find administered objects by 
-  * looking them up in a JNDI namespace.
-  *
-  * <P>An administrator can place an administered object anywhere in a 
-  * namespace. The JMS API does not define a naming policy.
-  *
-  * <P>It is expected that JMS providers will provide the tools an
-  * administrator needs to create and configure administered objects in a 
-  * JNDI namespace. JMS provider implementations of administered objects 
-  * should be both <CODE>javax.jndi.Referenceable</CODE> and 
-  * <CODE>java.io.Serializable</CODE> so that they can be stored in all 
-  * JNDI naming contexts. In addition, it is recommended that these 
-  * implementations follow the JavaBeans<SUP><FONT SIZE="-2">TM</FONT></SUP> 
-  * design patterns.
-  *
-  * <P>This strategy provides several benefits:
-  *
-  * <UL>
-  *   <LI>It hides provider-specific details from JMS clients.
-  *   <LI>It abstracts administrative information into objects in the Java 
-  *       programming language ("Java objects")
-  *       that are easily organized and administered from a common 
-  *       management console.
-  *   <LI>Since there will be JNDI providers for all popular naming 
-  *       services, this means that JMS providers can deliver one implementation 
-  *       of administered objects that will run everywhere.
-  * </UL>
-  *
-  * <P>An administered object should not hold on to any remote resources. 
-  * Its lookup should not use remote resources other than those used by the
-  * JNDI API itself.
-  *
-  * <P>Clients should think of administered objects as local Java objects. 
-  * Looking them up should not have any hidden side effects or use surprising 
-  * amounts of local resources.
+/** A <CODE>ConnectionFactory</CODE> object encapsulates a set of connection
+ * configuration
+ * parameters that has been defined by an administrator. A client uses
+ * it to create a connection with a JMS provider.
+ *
+ * <P>A <CODE>ConnectionFactory</CODE> object is a JMS administered object and
+ *  supports concurrent use.
+ *
+ * <P>JMS administered objects are objects containing configuration
+ * information that are created by an administrator and later used by
+ * JMS clients. They make it practical to administer the JMS API in the
+ * enterprise.
+ *
+ * <P>Although the interfaces for administered objects do not explicitly
+ * depend on the Java Naming and Directory Interface (JNDI) API, the JMS API
+ * establishes the convention that JMS clients find administered objects by
+ * looking them up in a JNDI namespace.
+ *
+ * <P>An administrator can place an administered object anywhere in a
+ * namespace. The JMS API does not define a naming policy.
+ *
+ * <P>It is expected that JMS providers will provide the tools an
+ * administrator needs to create and configure administered objects in a
+ * JNDI namespace. JMS provider implementations of administered objects
+ * should be both <CODE>javax.jndi.Referenceable</CODE> and
+ * <CODE>java.io.Serializable</CODE> so that they can be stored in all
+ * JNDI naming contexts. In addition, it is recommended that these
+ * implementations follow the JavaBeans<SUP><FONT SIZE="-2">TM</FONT></SUP>
+ * design patterns.
+ *
+ * <P>This strategy provides several benefits:
+ *
+ * <UL>
+ *   <LI>It hides provider-specific details from JMS clients.
+ *   <LI>It abstracts administrative information into objects in the Java
+ *       programming language ("Java objects")
+ *       that are easily organized and administered from a common
+ *       management console.
+ *   <LI>Since there will be JNDI providers for all popular naming
+ *       services, this means that JMS providers can deliver one implementation
+ *       of administered objects that will run everywhere.
+ * </UL>
+ *
+ * <P>An administered object should not hold on to any remote resources.
+ * Its lookup should not use remote resources other than those used by the
+ * JNDI API itself.
+ *
+ * <P>Clients should think of administered objects as local Java objects.
+ * Looking them up should not have any hidden side effects or use surprising
+ * amounts of local resources.
+ *
+ * @version     1.1 - February 1, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Connection
+ * @see         javax.jms.QueueConnectionFactory
+ * @see         javax.jms.TopicConnectionFactory
+ */
+
+public interface ConnectionFactory
+{
+  /** Creates a connection with the default user identity.
+  * The connection is created in stopped mode. No messages 
+  * will be delivered until the <code>Connection.start</code> method
+  * is explicitly called.
   *
-  * @version     1.1 - February 1, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
+  * @return a newly created connection
   *
-  * @see         javax.jms.Connection
-  * @see         javax.jms.QueueConnectionFactory
-  * @see         javax.jms.TopicConnectionFactory
+  * @exception JMSException if the JMS provider fails to create the
+  *                         connection due to some internal error.
+  * @exception JMSSecurityException  if client authentication fails due to 
+  *                         an invalid user name or password.
+  * @since 1.1 
   */
 
-public interface ConnectionFactory {
-        /** Creates a connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created connection
-      *
-      * @exception JMSException if the JMS provider fails to create the
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-       * @since 1.1 
-     */ 
-
-    Connection
-    createConnection() throws JMSException;
-
+  Connection createConnection() throws JMSException;
 
-    /** Creates a connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created  connection
-      *
-      * @exception JMSException if the JMS provider fails to create the 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      * @since 1.1  
-      */ 
+  /** Creates a connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created  connection
+    *
+    * @exception JMSException if the JMS provider fails to create the 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    * @since 1.1  
+    */
 
-    Connection
-    createConnection(String userName, String password) 
-					     throws JMSException;
+  Connection createConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java
index 8fb3d50964..183c2e0801 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java
@@ -1,133 +1,118 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.util.Enumeration;
 
-/** A <CODE>ConnectionMetaData</CODE> object provides information describing the 
-  * <CODE>Connection</CODE> object.
-  *
-  * @version     1.0 - 13 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  */
-
-public interface ConnectionMetaData {
-
-    /** Gets the JMS API version.
-      *
-      * @return the JMS API version
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    String 
-    getJMSVersion() throws JMSException;
-
-
-    /** Gets the JMS major version number.
-      *  
-      * @return the JMS API major version number
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    int 
-    getJMSMajorVersion() throws JMSException; 
- 
-
-    /** Gets the JMS minor version number.
-      *  
-      * @return the JMS API minor version number
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    int  
-    getJMSMinorVersion() throws JMSException;
-
-
-    /** Gets the JMS provider name.
-      *
-      * @return the JMS provider name
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */ 
-
-    String 
-    getJMSProviderName() throws JMSException;
-
-
-    /** Gets the JMS provider version.
-      *
-      * @return the JMS provider version
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */ 
-
-    String 
-    getProviderVersion() throws JMSException;
-
-
-    /** Gets the JMS provider major version number.
-      *  
-      * @return the JMS provider major version number
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    int
-    getProviderMajorVersion() throws JMSException; 
-
- 
-    /** Gets the JMS provider minor version number.
-      *  
-      * @return the JMS provider minor version number
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    int  
-    getProviderMinorVersion() throws JMSException;
-
- 
-    /** Gets an enumeration of the JMSX property names.
-      *  
-      * @return an Enumeration of JMSX property names
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    Enumeration
-    getJMSXPropertyNames() throws JMSException;
+/** A <CODE>ConnectionMetaData</CODE> object provides information describing the
+ * <CODE>Connection</CODE> object.
+ *
+ * @version     1.0 - 13 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ */
+
+public interface ConnectionMetaData
+{
+
+  /** Gets the JMS API version.
+    *
+    * @return the JMS API version
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  String getJMSVersion() throws JMSException;
+
+  /** Gets the JMS major version number.
+    *  
+    * @return the JMS API major version number
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  int getJMSMajorVersion() throws JMSException;
+
+  /** Gets the JMS minor version number.
+    *  
+    * @return the JMS API minor version number
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  int getJMSMinorVersion() throws JMSException;
+
+  /** Gets the JMS provider name.
+    *
+    * @return the JMS provider name
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  String getJMSProviderName() throws JMSException;
+
+  /** Gets the JMS provider version.
+    *
+    * @return the JMS provider version
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  String getProviderVersion() throws JMSException;
+
+  /** Gets the JMS provider major version number.
+    *  
+    * @return the JMS provider major version number
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  int getProviderMajorVersion() throws JMSException;
+
+  /** Gets the JMS provider minor version number.
+    *  
+    * @return the JMS provider minor version number
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  int getProviderMinorVersion() throws JMSException;
+
+  /** Gets an enumeration of the JMSX property names.
+    *  
+    * @return an Enumeration of JMSX property names
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  Enumeration getJMSXPropertyNames() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java
index b5cab804c1..a110311baa 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java
@@ -1,79 +1,79 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** The delivery modes supported by the JMS API are <CODE>PERSISTENT</CODE> and
-  * <CODE>NON_PERSISTENT</CODE>.
-  *
-  * <P>A client marks a message as persistent if it feels that the 
-  * application will have problems if the message is lost in transit.
-  * A client marks a message as non-persistent if an occasional
-  * lost message is tolerable. Clients use delivery mode to tell a
-  * JMS provider how to balance message transport reliability with throughput.
-  *
-  * <P>Delivery mode covers only the transport of the message to its 
-  * destination. Retention of a message at the destination until
-  * its receipt is acknowledged is not guaranteed by a <CODE>PERSISTENT</CODE> 
-  * delivery mode. Clients should assume that message retention 
-  * policies are set administratively. Message retention policy
-  * governs the reliability of message delivery from destination
-  * to message consumer. For example, if a client's message storage 
-  * space is exhausted, some messages may be dropped in accordance with 
-  * a site-specific message retention policy.
-  *
-  * <P>A message is guaranteed to be delivered once and only once
-  * by a JMS provider if the delivery mode of the message is 
-  * <CODE>PERSISTENT</CODE> 
-  * and if the destination has a sufficient message retention policy.
-  *
-  *
-  *
-  * @version     1.0 - 7 August 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  */
+ * <CODE>NON_PERSISTENT</CODE>.
+ *
+ * <P>A client marks a message as persistent if it feels that the
+ * application will have problems if the message is lost in transit.
+ * A client marks a message as non-persistent if an occasional
+ * lost message is tolerable. Clients use delivery mode to tell a
+ * JMS provider how to balance message transport reliability with throughput.
+ *
+ * <P>Delivery mode covers only the transport of the message to its
+ * destination. Retention of a message at the destination until
+ * its receipt is acknowledged is not guaranteed by a <CODE>PERSISTENT</CODE>
+ * delivery mode. Clients should assume that message retention
+ * policies are set administratively. Message retention policy
+ * governs the reliability of message delivery from destination
+ * to message consumer. For example, if a client's message storage
+ * space is exhausted, some messages may be dropped in accordance with
+ * a site-specific message retention policy.
+ *
+ * <P>A message is guaranteed to be delivered once and only once
+ * by a JMS provider if the delivery mode of the message is
+ * <CODE>PERSISTENT</CODE>
+ * and if the destination has a sufficient message retention policy.
+ *
+ *
+ *
+ * @version     1.0 - 7 August 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ */
 
-public interface DeliveryMode {
+public interface DeliveryMode
+{
 
-    /** This is the lowest-overhead delivery mode because it does not require 
-      * that the message be logged to stable storage. The level of JMS provider
-      * failure that causes a <CODE>NON_PERSISTENT</CODE> message to be lost is 
-      * not defined.
-      *
-      * <P>A JMS provider must deliver a <CODE>NON_PERSISTENT</CODE> message 
-      * with an 
-      * at-most-once guarantee. This means that it may lose the message, but it 
-      * must not deliver it twice.
-      */
+  /** This is the lowest-overhead delivery mode because it does not require 
+    * that the message be logged to stable storage. The level of JMS provider
+    * failure that causes a <CODE>NON_PERSISTENT</CODE> message to be lost is 
+    * not defined.
+    *
+    * <P>A JMS provider must deliver a <CODE>NON_PERSISTENT</CODE> message 
+    * with an 
+    * at-most-once guarantee. This means that it may lose the message, but it 
+    * must not deliver it twice.
+    */
 
-    static final int NON_PERSISTENT = 1;
+  static final int NON_PERSISTENT = 1;
 
-    /** This delivery mode instructs the JMS provider to log the message to stable 
-      * storage as part of the client's send operation. Only a hard media 
-      * failure should cause a <CODE>PERSISTENT</CODE> message to be lost.
-      */
+  /** This delivery mode instructs the JMS provider to log the message to stable 
+    * storage as part of the client's send operation. Only a hard media 
+    * failure should cause a <CODE>PERSISTENT</CODE> message to be lost.
+    */
 
-    static final int PERSISTENT = 2;
+  static final int PERSISTENT = 2;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Destination.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Destination.java
index a7bec1ae86..39eb480c1b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Destination.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Destination.java
@@ -1,97 +1,97 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>Destination</CODE> object encapsulates a provider-specific 
-  * address.
-  * The JMS API does not define a standard address syntax. Although a standard
-  * address syntax was considered, it was decided that the differences in 
-  * address semantics between existing message-oriented middleware (MOM) 
-  * products were too wide to bridge with a single syntax. 
-  *
-  * <P>Since <CODE>Destination</CODE> is an administered object, it may 
-  * contain 
-  * provider-specific configuration information in addition to its address.
-  *
-  * <P>The JMS API also supports a client's use of provider-specific address 
-  * names.
-  *
-  * <P><CODE>Destination</CODE> objects support concurrent use.
-  *
-  * <P>A <CODE>Destination</CODE> object is a JMS administered object.
-  *
-  * <P>JMS administered objects are objects containing configuration 
-  * information that are created by an administrator and later used by 
-  * JMS clients. They make it practical to administer the JMS API in the 
-  * enterprise.
-  *
-  * <P>Although the interfaces for administered objects do not explicitly 
-  * depend on the Java Naming and Directory Interface (JNDI) API, the JMS API 
-  * establishes the convention that JMS clients find administered objects by
-  * looking them up in a JNDI namespace.
-  *
-  * <P>An administrator can place an administered object anywhere in a 
-  * namespace. The JMS API does not define a naming policy.
-  *
-  * <P>It is expected that JMS providers will provide the tools an
-  * administrator needs to create and configure administered objects in a
-  * JNDI namespace. JMS provider implementations of administered objects
-  * should implement the <CODE>javax.naming.Referenceable</CODE> and
-  * <CODE>java.io.Serializable</CODE> interfaces so that they can be stored in 
-  * all JNDI naming contexts. In addition, it is recommended that these
-  * implementations follow the JavaBeans<SUP><FONT SIZE="-2">TM</FONT></SUP> 
-  * design patterns.
-  *
-  * <P>This strategy provides several benefits:
-  *
-  * <UL>
-  *   <LI>It hides provider-specific details from JMS clients.
-  *   <LI>It abstracts JMS administrative information into objects in the Java 
-  *       programming language ("Java objects") 
-  *       that are easily organized and administered from a common 
-  *       management console.
-  *   <LI>Since there will be JNDI providers for all popular naming 
-  *       services, JMS providers can deliver one implementation
-  *       of administered objects that will run everywhere.
-  * </UL>
-  *
-  * <P>An administered object should not hold on to any remote resources. 
-  * Its lookup should not use remote resources other than those used by the
-  * JNDI API itself.
-  *
-  * <P>Clients should think of administered objects as local Java objects. 
-  * Looking them up should not have any hidden side effects or use surprising 
-  * amounts of local resources.
-  *
-  * @version     1.0 - 3 August 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.Queue
-  * @see         javax.jms.Topic
-  */
+/** A <CODE>Destination</CODE> object encapsulates a provider-specific
+ * address.
+ * The JMS API does not define a standard address syntax. Although a standard
+ * address syntax was considered, it was decided that the differences in
+ * address semantics between existing message-oriented middleware (MOM)
+ * products were too wide to bridge with a single syntax.
+ *
+ * <P>Since <CODE>Destination</CODE> is an administered object, it may
+ * contain
+ * provider-specific configuration information in addition to its address.
+ *
+ * <P>The JMS API also supports a client's use of provider-specific address
+ * names.
+ *
+ * <P><CODE>Destination</CODE> objects support concurrent use.
+ *
+ * <P>A <CODE>Destination</CODE> object is a JMS administered object.
+ *
+ * <P>JMS administered objects are objects containing configuration
+ * information that are created by an administrator and later used by
+ * JMS clients. They make it practical to administer the JMS API in the
+ * enterprise.
+ *
+ * <P>Although the interfaces for administered objects do not explicitly
+ * depend on the Java Naming and Directory Interface (JNDI) API, the JMS API
+ * establishes the convention that JMS clients find administered objects by
+ * looking them up in a JNDI namespace.
+ *
+ * <P>An administrator can place an administered object anywhere in a
+ * namespace. The JMS API does not define a naming policy.
+ *
+ * <P>It is expected that JMS providers will provide the tools an
+ * administrator needs to create and configure administered objects in a
+ * JNDI namespace. JMS provider implementations of administered objects
+ * should implement the <CODE>javax.naming.Referenceable</CODE> and
+ * <CODE>java.io.Serializable</CODE> interfaces so that they can be stored in
+ * all JNDI naming contexts. In addition, it is recommended that these
+ * implementations follow the JavaBeans<SUP><FONT SIZE="-2">TM</FONT></SUP>
+ * design patterns.
+ *
+ * <P>This strategy provides several benefits:
+ *
+ * <UL>
+ *   <LI>It hides provider-specific details from JMS clients.
+ *   <LI>It abstracts JMS administrative information into objects in the Java
+ *       programming language ("Java objects")
+ *       that are easily organized and administered from a common
+ *       management console.
+ *   <LI>Since there will be JNDI providers for all popular naming
+ *       services, JMS providers can deliver one implementation
+ *       of administered objects that will run everywhere.
+ * </UL>
+ *
+ * <P>An administered object should not hold on to any remote resources.
+ * Its lookup should not use remote resources other than those used by the
+ * JNDI API itself.
+ *
+ * <P>Clients should think of administered objects as local Java objects.
+ * Looking them up should not have any hidden side effects or use surprising
+ * amounts of local resources.
+ *
+ * @version     1.0 - 3 August 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.Queue
+ * @see         javax.jms.Topic
+ */
 
-public interface Destination {
+public interface Destination
+{
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ExceptionListener.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ExceptionListener.java
index 24904bb097..f08dbef80e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ExceptionListener.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ExceptionListener.java
@@ -1,57 +1,55 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-
 /** If a JMS provider detects a serious problem with a <CODE>Connection</CODE>
-  * object, it informs the <CODE>Connection</CODE> object's 
-  * <CODE>ExceptionListener</CODE>, if one has been registered. 
-  * It does this by calling the listener's <CODE>onException</CODE> method, 
-  * passing it a <CODE>JMSException</CODE> argument describing the problem.
-  *
-  * <P>An exception listener allows a client to be notified of a problem 
-  * asynchronously. Some connections only consume messages, so they would have no
-  * other way to learn that their connection has failed.
-  *
-  * <P>A JMS provider should attempt to resolve connection problems 
-  * itself before it notifies the client of them.
-  *
-  * @version     1.0 - 9 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see javax.jms.Connection#setExceptionListener(ExceptionListener)
-  */
+ * object, it informs the <CODE>Connection</CODE> object's
+ * <CODE>ExceptionListener</CODE>, if one has been registered.
+ * It does this by calling the listener's <CODE>onException</CODE> method,
+ * passing it a <CODE>JMSException</CODE> argument describing the problem.
+ *
+ * <P>An exception listener allows a client to be notified of a problem
+ * asynchronously. Some connections only consume messages, so they would have no
+ * other way to learn that their connection has failed.
+ *
+ * <P>A JMS provider should attempt to resolve connection problems
+ * itself before it notifies the client of them.
+ *
+ * @version     1.0 - 9 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see javax.jms.Connection#setExceptionListener(ExceptionListener)
+ */
 
-public interface ExceptionListener {
+public interface ExceptionListener
+{
 
-    /** Notifies user of a JMS exception.
-      *
-      * @param exception the JMS exception
-      */
+  /** Notifies user of a JMS exception.
+    *
+    * @param exception the JMS exception
+    */
 
-    void 
-    onException(JMSException exception);
+  void onException(JMSException exception);
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/IllegalStateException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/IllegalStateException.java
index 5c80831a90..cce8f931ad 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/IllegalStateException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/IllegalStateException.java
@@ -3,16 +3,15 @@
  * Use is subject to license terms.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception is thrown when a method is 
- *     invoked at an illegal or inappropriate time or if the provider is 
- *     not in an appropriate state for the requested operation. For example, 
- *     this exception must be thrown if <CODE>Session.commit</CODE> is 
+ * <P> This exception is thrown when a method is
+ *     invoked at an illegal or inappropriate time or if the provider is
+ *     not in an appropriate state for the requested operation. For example,
+ *     this exception must be thrown if <CODE>Session.commit</CODE> is
  *     called on a non-transacted session. This exception is also called when
- *     a domain inappropriate method is called, such as calling 
+ *     a domain inappropriate method is called, such as calling
  *     <CODE>TopicSession.CreateQueueBrowser</CODE>.
  *
  * @version     April 9, 2002
@@ -20,7 +19,10 @@ package javax.jms;
  * @author      Kate Stout
  **/
 
-public class IllegalStateException extends JMSException {
+public class IllegalStateException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
   /** Constructs an <CODE>IllegalStateException</CODE> with the specified reason
    *  and error code.
@@ -28,20 +30,20 @@ public class IllegalStateException extends JMSException {
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  IllegalStateException(String reason, String errorCode) {
+  public IllegalStateException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs an <CODE>IllegalStateException</CODE> with the specified 
+  /** Constructs an <CODE>IllegalStateException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  IllegalStateException(String reason) {
+  public IllegalStateException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidClientIDException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidClientIDException.java
index 0c4aae3f7e..dd1a4d45ae 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidClientIDException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidClientIDException.java
@@ -1,59 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a 
- *     client attempts to set a connection's client ID to a value that 
+ * <P> This exception must be thrown when a
+ *     client attempts to set a connection's client ID to a value that
  *     is rejected by a provider.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class InvalidClientIDException extends JMSException {
+public class InvalidClientIDException extends JMSException
+{
 
-  /** Constructs an <CODE>InvalidClientIDException</CODE> with the specified 
+  private static final long serialVersionUID = 1L;
+
+  /** Constructs an <CODE>InvalidClientIDException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  InvalidClientIDException(String reason, String errorCode) {
+  public InvalidClientIDException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs an <CODE>InvalidClientIDException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidClientIDException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  InvalidClientIDException(String reason) {
+  public InvalidClientIDException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidDestinationException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidDestinationException.java
index 410b5b1339..8356c341b2 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidDestinationException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidDestinationException.java
@@ -1,60 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a 
- *     destination either is not understood by a provider or is no 
+ * <P> This exception must be thrown when a
+ *     destination either is not understood by a provider or is no
  *     longer valid.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class InvalidDestinationException extends JMSException {
+public class InvalidDestinationException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs an <CODE>InvalidDestinationException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidDestinationException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  InvalidDestinationException(String reason, String errorCode) {
+  public InvalidDestinationException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs an <CODE>InvalidDestinationException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidDestinationException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  InvalidDestinationException(String reason) {
+  public InvalidDestinationException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidSelectorException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidSelectorException.java
index 3f55c62c6d..2143d542b1 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidSelectorException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/InvalidSelectorException.java
@@ -1,60 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a 
- *     JMS client attempts to give a provider a message selector with 
+ * <P> This exception must be thrown when a
+ *     JMS client attempts to give a provider a message selector with
  *     invalid syntax.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class InvalidSelectorException extends JMSException {
+public class InvalidSelectorException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs an <CODE>InvalidSelectorException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidSelectorException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  InvalidSelectorException(String reason, String errorCode) {
+  public InvalidSelectorException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs an <CODE>InvalidSelectorException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidSelectorException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  InvalidSelectorException(String reason) {
+  public InvalidSelectorException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/JMSException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/JMSException.java
index 38230dbabf..c082156297 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/JMSException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/JMSException.java
@@ -1,27 +1,26 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
@@ -29,12 +28,12 @@ package javax.jms;
  *
  * <P>It provides the following information:
  * <UL>
- *   <LI> A provider-specific string describing the error. This string is 
+ *   <LI> A provider-specific string describing the error. This string is
  *        the standard exception message and is available via the
  *        <CODE>getMessage</CODE> method.
- *   <LI> A provider-specific string error code 
- *   <LI> A reference to another exception. Often a JMS API exception will 
- *        be the result of a lower-level problem. If appropriate, this 
+ *   <LI> A provider-specific string error code
+ *   <LI> A reference to another exception. Often a JMS API exception will
+ *        be the result of a lower-level problem. If appropriate, this
  *        lower-level exception can be linked to the JMS API exception.
  * </UL>
  * @version     1.0 - 5 Oct 1998
@@ -42,26 +41,28 @@ package javax.jms;
  * @author      Rich Burridge
  **/
 
-public class JMSException extends Exception {
+public class JMSException extends Exception
+{
+
+  private static final long serialVersionUID = 1L;
 
   /** Vendor-specific error code.
-  **/
+   **/
   private String errorCode;
 
   /** <CODE>Exception</CODE> reference.
-  **/
+   **/
   private Exception linkedException;
 
-
-  /** Constructs a <CODE>JMSException</CODE> with the specified reason and 
+  /** Constructs a <CODE>JMSException</CODE> with the specified reason and
    *  error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
    **/
-  public 
-  JMSException(String reason, String errorCode) {
+  public JMSException(String reason, String errorCode)
+  {
     super(reason);
     this.errorCode = errorCode;
     linkedException = null;
@@ -72,39 +73,39 @@ public class JMSException extends Exception {
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  JMSException(String reason) {
+  public JMSException(String reason)
+  {
     super(reason);
-    this.errorCode = null;
+    errorCode = null;
     linkedException = null;
   }
 
   /** Gets the vendor-specific error code.
    *  @return   a string specifying the vendor-specific
    *                        error code
-  **/
-  public 
-  String getErrorCode() {
-    return this.errorCode;
+   **/
+  public String getErrorCode()
+  {
+    return errorCode;
   }
 
   /**
    * Gets the exception linked to this one.
    *
    * @return the linked <CODE>Exception</CODE>, null if none
-  **/
-  public 
-  Exception getLinkedException() {
-    return (linkedException);
+   **/
+  public Exception getLinkedException()
+  {
+    return linkedException;
   }
 
   /**
    * Adds a linked <CODE>Exception</CODE>.
    *
    * @param ex       the linked <CODE>Exception</CODE>
-  **/
-  public 
-  synchronized void setLinkedException(Exception ex) {
-      linkedException = ex;
+   **/
+  public synchronized void setLinkedException(Exception ex)
+  {
+    linkedException = ex;
   }
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/JMSSecurityException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/JMSSecurityException.java
index 61377aca20..3d21e7e4e1 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/JMSSecurityException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/JMSSecurityException.java
@@ -1,60 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a provider rejects a user 
- *     name/password submitted by a client. It may also be thrown for any case 
+ * <P> This exception must be thrown when a provider rejects a user
+ *     name/password submitted by a client. It may also be thrown for any case
  *     where a security restriction prevents a method from completing.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class JMSSecurityException extends JMSException {
+public class JMSSecurityException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>JMSSecurityException</CODE> with the specified 
+  /** Constructs a <CODE>JMSSecurityException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  JMSSecurityException(String reason, String errorCode) {
+  public JMSSecurityException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>JMSSecurityException</CODE> with the specified 
+  /** Constructs a <CODE>JMSSecurityException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  JMSSecurityException(String reason) {
+  public JMSSecurityException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java
index faada144d1..defd0a5bce 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java
@@ -1,529 +1,466 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.util.Enumeration;
 
 /** A <CODE>MapMessage</CODE> object is used to send a set of name-value pairs.
-  * The names are <CODE>String</CODE> objects, and the values are primitive 
-  * data types in the Java programming language. The names must have a value that
-  * is not null, and not an empty string. The entries can be accessed 
-  * sequentially or randomly by name. The order of the entries is undefined. 
-  * <CODE>MapMessage</CODE> inherits from the <CODE>Message</CODE> interface
-  * and adds a message body that contains a Map.
-  *
-  * <P>The primitive types can be read or written explicitly using methods
-  * for each type. They may also be read or written generically as objects.
-  * For instance, a call to <CODE>MapMessage.setInt("foo", 6)</CODE> is 
-  * equivalent to <CODE>MapMessage.setObject("foo", new Integer(6))</CODE>.
-  * Both forms are provided, because the explicit form is convenient for
-  * static programming, and the object form is needed when types are not known
-  * at compile time.
-  *
-  * <P>When a client receives a <CODE>MapMessage</CODE>, it is in read-only 
-  * mode. If a client attempts to write to the message at this point, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown. If 
-  * <CODE>clearBody</CODE> is called, the message can now be both read from and 
-  * written to.
-  *
-  * <P><CODE>MapMessage</CODE> objects support the following conversion table. 
-  * The marked cases must be supported. The unmarked cases must throw a 
-  * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions 
-  * may throw a runtime exception if the primitive's <CODE>valueOf()</CODE> 
-  * method does not accept it as a valid <CODE>String</CODE> representation of 
-  * the primitive.
-  *
-  * <P>A value written as the row type can be read as the column type.
-  *
-  * <PRE>
-  * |        | boolean byte short char int long float double String byte[]
-  * |----------------------------------------------------------------------
-  * |boolean |    X                                            X
-  * |byte    |          X     X         X   X                  X
-  * |short   |                X         X   X                  X
-  * |char    |                     X                           X
-  * |int     |                          X   X                  X
-  * |long    |                              X                  X
-  * |float   |                                    X     X      X
-  * |double  |                                          X      X
-  * |String  |    X     X     X         X   X     X     X      X
-  * |byte[]  |                                                        X
-  * |----------------------------------------------------------------------
-  * </PRE>
-  *
-  * <P>Attempting to read a null value as a primitive type must be treated
-  * as calling the primitive's corresponding <code>valueOf(String)</code> 
-  * conversion method with a null value. Since <code>char</code> does not 
-  * support a <code>String</code> conversion, attempting to read a null value 
-  * as a <code>char</code> must throw a <code>NullPointerException</code>.
-  *
-  * @version     1.1 February 2, 002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.Session#createMapMessage()
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.StreamMessage
-  * @see         javax.jms.TextMessage
-  */
- 
-public interface MapMessage extends Message { 
-
-
-    /** Returns the <CODE>boolean</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>boolean</CODE>
-      *
-      * @return the <CODE>boolean</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */
-
-    boolean 
-    getBoolean(String name) throws JMSException;
-
-
-    /** Returns the <CODE>byte</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>byte</CODE>
-      *
-      * @return the <CODE>byte</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    byte 
-    getByte(String name) throws JMSException;
-
-
-    /** Returns the <CODE>short</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>short</CODE>
-      *
-      * @return the <CODE>short</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    short 
-    getShort(String name) throws JMSException;
-
-
-    /** Returns the Unicode character value with the specified name.
-      *
-      * @param name the name of the Unicode character
-      *
-      * @return the Unicode character value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.     
-      */ 
-
-    char 
-    getChar(String name) throws JMSException;
-
-
-    /** Returns the <CODE>int</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>int</CODE>
-      *
-      * @return the <CODE>int</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    int 
-    getInt(String name) throws JMSException;
-
-
-    /** Returns the <CODE>long</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>long</CODE>
-      *
-      * @return the <CODE>long</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    long 
-    getLong(String name) throws JMSException;
-
-
-    /** Returns the <CODE>float</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>float</CODE>
-      *
-      * @return the <CODE>float</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.     
-      */ 
-
-    float 
-    getFloat(String name) throws JMSException;
-
-
-    /** Returns the <CODE>double</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>double</CODE>
-      *
-      * @return the <CODE>double</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    double 
-    getDouble(String name) throws JMSException;
-
-
-    /** Returns the <CODE>String</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>String</CODE>
-      *
-      * @return the <CODE>String</CODE> value with the specified name; if there 
-      * is no item by this name, a null value is returned
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    String 
-    getString(String name) throws JMSException;
-
-
-    /** Returns the byte array value with the specified name.
-      *
-      * @param name the name of the byte array
-      *
-      * @return a copy of the byte array value with the specified name; if there
-      * is no
-      * item by this name, a null value is returned.
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    byte[] 
-    getBytes(String name) throws JMSException;
-
-
-    /** Returns the value of the object with the specified name.
-      *
-      * <P>This method can be used to return, in objectified format,
-      * an object in the Java programming language ("Java object") that had 
-      * been stored in the Map with the equivalent
-      * <CODE>setObject</CODE> method call, or its equivalent primitive
-      * <CODE>set<I>type</I></CODE> method.
-      *
-      * <P>Note that byte values are returned as <CODE>byte[]</CODE>, not 
-      * <CODE>Byte[]</CODE>.
-      *
-      * @param name the name of the Java object
-      *
-      * @return a copy of the Java object value with the specified name, in 
-      * objectified format (for example, if the object was set as an 
-      * <CODE>int</CODE>, an <CODE>Integer</CODE> is returned); if there is no 
-      * item by this name, a null value is returned
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      */ 
-
-    Object 
-    getObject(String name) throws JMSException;
-
-
-
-    /** Returns an <CODE>Enumeration</CODE> of all the names in the 
-      * <CODE>MapMessage</CODE> object.
-      *
-      * @return an enumeration of all the names in this <CODE>MapMessage</CODE>
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      */
-
-    Enumeration
-    getMapNames() throws JMSException;
-
-
-    /** Sets a <CODE>boolean</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>boolean</CODE>
-      * @param value the <CODE>boolean</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */
-
-    void 
-    setBoolean(String name, boolean value) throws JMSException;
-
-
-    /** Sets a <CODE>byte</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>byte</CODE>
-      * @param value the <CODE>byte</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
+ * The names are <CODE>String</CODE> objects, and the values are primitive
+ * data types in the Java programming language. The names must have a value that
+ * is not null, and not an empty string. The entries can be accessed
+ * sequentially or randomly by name. The order of the entries is undefined.
+ * <CODE>MapMessage</CODE> inherits from the <CODE>Message</CODE> interface
+ * and adds a message body that contains a Map.
+ *
+ * <P>The primitive types can be read or written explicitly using methods
+ * for each type. They may also be read or written generically as objects.
+ * For instance, a call to <CODE>MapMessage.setInt("foo", 6)</CODE> is
+ * equivalent to <CODE>MapMessage.setObject("foo", new Integer(6))</CODE>.
+ * Both forms are provided, because the explicit form is convenient for
+ * static programming, and the object form is needed when types are not known
+ * at compile time.
+ *
+ * <P>When a client receives a <CODE>MapMessage</CODE>, it is in read-only
+ * mode. If a client attempts to write to the message at this point, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown. If
+ * <CODE>clearBody</CODE> is called, the message can now be both read from and
+ * written to.
+ *
+ * <P><CODE>MapMessage</CODE> objects support the following conversion table.
+ * The marked cases must be supported. The unmarked cases must throw a
+ * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions
+ * may throw a runtime exception if the primitive's <CODE>valueOf()</CODE>
+ * method does not accept it as a valid <CODE>String</CODE> representation of
+ * the primitive.
+ *
+ * <P>A value written as the row type can be read as the column type.
+ *
+ * <PRE>
+ * |        | boolean byte short char int long float double String byte[]
+ * |----------------------------------------------------------------------
+ * |boolean |    X                                            X
+ * |byte    |          X     X         X   X                  X
+ * |short   |                X         X   X                  X
+ * |char    |                     X                           X
+ * |int     |                          X   X                  X
+ * |long    |                              X                  X
+ * |float   |                                    X     X      X
+ * |double  |                                          X      X
+ * |String  |    X     X     X         X   X     X     X      X
+ * |byte[]  |                                                        X
+ * |----------------------------------------------------------------------
+ * </PRE>
+ *
+ * <P>Attempting to read a null value as a primitive type must be treated
+ * as calling the primitive's corresponding <code>valueOf(String)</code>
+ * conversion method with a null value. Since <code>char</code> does not
+ * support a <code>String</code> conversion, attempting to read a null value
+ * as a <code>char</code> must throw a <code>NullPointerException</code>.
+ *
+ * @version     1.1 February 2, 002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.Session#createMapMessage()
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.StreamMessage
+ * @see         javax.jms.TextMessage
+ */
+
+public interface MapMessage extends Message
+{
+
+  /** Returns the <CODE>boolean</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>boolean</CODE>
+    *
+    * @return the <CODE>boolean</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  boolean getBoolean(String name) throws JMSException;
+
+  /** Returns the <CODE>byte</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>byte</CODE>
+    *
+    * @return the <CODE>byte</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  byte getByte(String name) throws JMSException;
+
+  /** Returns the <CODE>short</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>short</CODE>
+    *
+    * @return the <CODE>short</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  short getShort(String name) throws JMSException;
+
+  /** Returns the Unicode character value with the specified name.
+    *
+    * @param name the name of the Unicode character
+    *
+    * @return the Unicode character value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.     
+    */
+
+  char getChar(String name) throws JMSException;
+
+  /** Returns the <CODE>int</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>int</CODE>
+    *
+    * @return the <CODE>int</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  int getInt(String name) throws JMSException;
+
+  /** Returns the <CODE>long</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>long</CODE>
+    *
+    * @return the <CODE>long</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  long getLong(String name) throws JMSException;
+
+  /** Returns the <CODE>float</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>float</CODE>
+    *
+    * @return the <CODE>float</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.     
+    */
+
+  float getFloat(String name) throws JMSException;
+
+  /** Returns the <CODE>double</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>double</CODE>
+    *
+    * @return the <CODE>double</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  double getDouble(String name) throws JMSException;
+
+  /** Returns the <CODE>String</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>String</CODE>
+    *
+    * @return the <CODE>String</CODE> value with the specified name; if there 
+    * is no item by this name, a null value is returned
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  String getString(String name) throws JMSException;
+
+  /** Returns the byte array value with the specified name.
+    *
+    * @param name the name of the byte array
+    *
+    * @return a copy of the byte array value with the specified name; if there
+    * is no
+    * item by this name, a null value is returned.
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  byte[] getBytes(String name) throws JMSException;
+
+  /** Returns the value of the object with the specified name.
+    *
+    * <P>This method can be used to return, in objectified format,
+    * an object in the Java programming language ("Java object") that had 
+    * been stored in the Map with the equivalent
+    * <CODE>setObject</CODE> method call, or its equivalent primitive
+    * <CODE>set<I>type</I></CODE> method.
+    *
+    * <P>Note that byte values are returned as <CODE>byte[]</CODE>, not 
+    * <CODE>Byte[]</CODE>.
+    *
+    * @param name the name of the Java object
+    *
+    * @return a copy of the Java object value with the specified name, in 
+    * objectified format (for example, if the object was set as an 
+    * <CODE>int</CODE>, an <CODE>Integer</CODE> is returned); if there is no 
+    * item by this name, a null value is returned
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    */
+
+  Object getObject(String name) throws JMSException;
+
+  /** Returns an <CODE>Enumeration</CODE> of all the names in the 
+    * <CODE>MapMessage</CODE> object.
+    *
+    * @return an enumeration of all the names in this <CODE>MapMessage</CODE>
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    */
+
+  Enumeration getMapNames() throws JMSException;
+
+  /** Sets a <CODE>boolean</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>boolean</CODE>
+    * @param value the <CODE>boolean</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setBoolean(String name, boolean value) throws JMSException;
+
+  /** Sets a <CODE>byte</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>byte</CODE>
+    * @param value the <CODE>byte</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+   * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setByte(String name, byte value) throws JMSException;
+
+  /** Sets a <CODE>short</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>short</CODE>
+    * @param value the <CODE>short</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+     * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setShort(String name, short value) throws JMSException;
+
+  /** Sets a Unicode character value with the specified name into the Map.
+    *
+    * @param name the name of the Unicode character
+    * @param value the Unicode character value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+     * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setChar(String name, char value) throws JMSException;
+
+  /** Sets an <CODE>int</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>int</CODE>
+    * @param value the <CODE>int</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setInt(String name, int value) throws JMSException;
+
+  /** Sets a <CODE>long</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>long</CODE>
+    * @param value the <CODE>long</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setLong(String name, long value) throws JMSException;
+
+  /** Sets a <CODE>float</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>float</CODE>
+    * @param value the <CODE>float</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+     * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setFloat(String name, float value) throws JMSException;
+
+  /** Sets a <CODE>double</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>double</CODE>
+    * @param value the <CODE>double</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setDouble(String name, double value) throws JMSException;
+
+  /** Sets a <CODE>String</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>String</CODE>
+    * @param value the <CODE>String</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setString(String name, String value) throws JMSException;
+
+  /** Sets a byte array value with the specified name into the Map.
+    *
+    * @param name the name of the byte array
+    * @param value the byte array value to set in the Map; the array
+    *              is copied so that the value for <CODE>name</CODE> will
+    *              not be altered by future modifications
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception NullPointerException if the name is null, or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setBytes(String name, byte[] value) throws JMSException;
+
+  /** Sets a portion of the byte array value with the specified name into the 
+    * Map.
+    *  
+    * @param name the name of the byte array
+    * @param value the byte array value to set in the Map
+    * @param offset the initial offset within the byte array
+    * @param length the number of bytes to use
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setByte(String name, byte value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>short</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>short</CODE>
-      * @param value the <CODE>short</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-       * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setShort(String name, short value) 
-			throws JMSException;
-
-
-    /** Sets a Unicode character value with the specified name into the Map.
-      *
-      * @param name the name of the Unicode character
-      * @param value the Unicode character value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-       * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setChar(String name, char value) 
-			throws JMSException;
-
-
-    /** Sets an <CODE>int</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>int</CODE>
-      * @param value the <CODE>int</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setInt(String name, int value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>long</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>long</CODE>
-      * @param value the <CODE>long</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setLong(String name, long value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>float</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>float</CODE>
-      * @param value the <CODE>float</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-       * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setFloat(String name, float value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>double</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>double</CODE>
-      * @param value the <CODE>double</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setDouble(String name, double value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>String</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>String</CODE>
-      * @param value the <CODE>String</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setString(String name, String value) 
-			throws JMSException;
-
-
-    /** Sets a byte array value with the specified name into the Map.
-      *
-      * @param name the name of the byte array
-      * @param value the byte array value to set in the Map; the array
-      *              is copied so that the value for <CODE>name</CODE> will
-      *              not be altered by future modifications
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception NullPointerException if the name is null, or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void
-    setBytes(String name, byte[] value) 
-			throws JMSException;
-
-
-    /** Sets a portion of the byte array value with the specified name into the 
-      * Map.
-      *  
-      * @param name the name of the byte array
-      * @param value the byte array value to set in the Map
-      * @param offset the initial offset within the byte array
-      * @param length the number of bytes to use
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-       * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
- 
-    void
-    setBytes(String name, byte[] value, 
-		 int offset, int length) 
-			throws JMSException;
-
-
-    /** Sets an object value with the specified name into the Map.
-      *
-      * <P>This method works only for the objectified primitive
-      * object types (<code>Integer</code>, <code>Double</code>, 
-      * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
-      * arrays.
-      *
-      * @param name the name of the Java object
-      * @param value the Java object value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageFormatException if the object is invalid.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setObject(String name, Object value) 
-			throws JMSException;
-
-
-    /** Indicates whether an item exists in this <CODE>MapMessage</CODE> object.
-      *
-      * @param name the name of the item to test
-      *
-      * @return true if the item exists
-      *
-      * @exception JMSException if the JMS provider fails to determine if the 
-      *                         item exists due to some internal error.
-      */ 
- 
-    boolean
-    itemExists(String name) throws JMSException;
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setBytes(String name, byte[] value, int offset, int length) throws JMSException;
+
+  /** Sets an object value with the specified name into the Map.
+    *
+    * <P>This method works only for the objectified primitive
+    * object types (<code>Integer</code>, <code>Double</code>, 
+    * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
+    * arrays.
+    *
+    * @param name the name of the Java object
+    * @param value the Java object value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageFormatException if the object is invalid.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setObject(String name, Object value) throws JMSException;
+
+  /** Indicates whether an item exists in this <CODE>MapMessage</CODE> object.
+    *
+    * @param name the name of the item to test
+    *
+    * @return true if the item exists
+    *
+    * @exception JMSException if the JMS provider fails to determine if the 
+    *                         item exists due to some internal error.
+    */
+
+  boolean itemExists(String name) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Message.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Message.java
index e3148ee859..06f496571d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Message.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Message.java
@@ -1,1511 +1,1411 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.util.Enumeration;
-import java.util.Properties;
-
-/** The <CODE>Message</CODE> interface is the root interface of all JMS 
-  * messages. It defines the message header and the <CODE>acknowledge</CODE> 
-  * method used for all messages.
-  *
-  * <P>Most message-oriented middleware (MOM) products treat messages as 
-  * lightweight entities that consist
-  * of a header and a payload. The header contains fields used for message
-  * routing and identification; the payload contains the application data
-  * being sent.
-  *
-  * <P>Within this general form, the definition of a message varies
-  * significantly across products. It would be quite difficult for the JMS API
-  * to support all of these message models.
-  *
-  * <P>With this in mind, the JMS message model has the following goals:
-  * <UL>
-  *   <LI>Provide a single, unified message API
-  *   <LI>Provide an API suitable for creating messages that match the
-  *       format used by provider-native messaging applications
-  *   <LI>Support the development of heterogeneous applications that span
-  *       operating systems, machine architectures, and computer languages
-  *   <LI>Support messages containing objects in the Java programming language
-  *       ("Java objects")
-  *   <LI>Support messages containing Extensible Markup Language (XML) pages
-  * </UL>
-  *
-  * <P>JMS messages are composed of the following parts:
-  * <UL>
-  *   <LI>Header - All messages support the same set of header fields. 
-  *       Header fields contain values used by both clients and providers to 
-  *       identify and route messages.
-  *   <LI>Properties - Each message contains a built-in facility for supporting
-  *       application-defined property values. Properties provide an efficient 
-  *       mechanism for supporting application-defined message filtering.
-  *   <LI>Body - The JMS API defines several types of message body, which cover
-  *       the majority of messaging styles currently in use.
-  * </UL>
-  *
-  * <H4>Message Bodies</H4>
-  *
-  * <P>The JMS API defines five types of message body:
-  * <UL>
-  *   <LI>Stream - A <CODE>StreamMessage</CODE> object's message body contains 
-  *       a stream of primitive values in the Java programming 
-  *       language ("Java primitives"). It is filled and read sequentially.
-  *   <LI>Map - A <CODE>MapMessage</CODE> object's message body contains a set 
-  *       of name-value pairs, where names are <CODE>String</CODE> 
-  *       objects, and values are Java primitives. The entries can be accessed 
-  *       sequentially or randomly by name. The order of the entries is 
-  *       undefined.
-  *   <LI>Text - A <CODE>TextMessage</CODE> object's message body contains a 
-  *       <CODE>java.lang.String</CODE> object. This message type can be used
-  *       to transport plain-text messages, and XML messages.
-  *   <LI>Object - An <CODE>ObjectMessage</CODE> object's message body contains 
-  *       a <CODE>Serializable</CODE> Java object.
-  *   <LI>Bytes - A <CODE>BytesMessage</CODE> object's message body contains a 
-  *       stream of uninterpreted bytes. This message type is for 
-  *       literally encoding a body to match an existing message format. In 
-  *       many cases, it is possible to use one of the other body types, 
-  *       which are easier to use. Although the JMS API allows the use of  
-  *       message properties with byte messages, they are typically not used,
-  *       since the inclusion of properties may affect the format.
-  * </UL>
-  *
-  * <H4>Message Headers</H4>
-  *
-  * <P>The <CODE>JMSCorrelationID</CODE> header field is used for linking one 
-  * message with
-  * another. It typically links a reply message with its requesting message.
-  *
-  * <P><CODE>JMSCorrelationID</CODE> can hold a provider-specific message ID,
-  * an application-specific <CODE>String</CODE> object, or a provider-native 
-  * <CODE>byte[]</CODE> value.
-  *
-  * <H4>Message Properties</H4>
-  *
-  * <P>A <CODE>Message</CODE> object contains a built-in facility for supporting
-  * application-defined property values. In effect, this provides a mechanism 
-  * for adding application-specific header fields to a message.
-  *
-  * <P>Properties allow an application, via message selectors, to have a JMS 
-  * provider select, or filter, messages on its behalf using 
-  * application-specific criteria.
-  *
-  * <P>Property names must obey the rules for a message selector identifier. 
-  * Property names must not be null, and must not be empty strings. If a property
-  * name is set and it is either null or an empty string, an 
-  * <CODE>IllegalArgumentException</CODE> must be thrown.
-  *
-  * <P>Property values can be <CODE>boolean</CODE>, <CODE>byte</CODE>, 
-  * <CODE>short</CODE>, <CODE>int</CODE>, <CODE>long</CODE>, <CODE>float</CODE>,
-  * <CODE>double</CODE>, and <CODE>String</CODE>.
-  *
-  * <P>Property values are set prior to sending a message. When a client 
-  * receives a message, its properties are in read-only mode. If a 
-  * client attempts to set properties at this point, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown. If 
-  * <CODE>clearProperties</CODE> is called, the properties can now be both
-  * read from and written to. Note that header fields are distinct from 
-  * properties. Header fields are never in read-only mode. 
-  *
-  * <P>A property value may duplicate a value in a message's body, or it may 
-  * not. Although JMS does not define a policy for what should or should not 
-  * be made a property, application developers should note that JMS providers 
-  * will likely handle data in a message's body more efficiently than data in 
-  * a message's properties. For best performance, applications should use
-  * message properties only when they need to customize a message's header. 
-  * The primary reason for doing this is to support customized message 
-  * selection.
-  *
-  * <P>Message properties support the following conversion table. The marked 
-  * cases must be supported. The unmarked cases must throw a 
-  * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions 
-  * may throw a runtime exception if the
-  * primitive's <CODE>valueOf</CODE> method does not accept the 
-  * <CODE>String</CODE> as a valid representation of the primitive.
-  *
-  * <P>A value written as the row type can be read as the column type.
-  *
-  * <PRE>
-  * |        | boolean byte short int long float double String 
-  * |----------------------------------------------------------
-  * |boolean |    X                                       X
-  * |byte    |          X     X    X   X                  X 
-  * |short   |                X    X   X                  X 
-  * |int     |                     X   X                  X 
-  * |long    |                         X                  X 
-  * |float   |                               X     X      X 
-  * |double  |                                     X      X 
-  * |String  |    X     X     X    X   X     X     X      X 
-  * |----------------------------------------------------------
-  * </PRE>
-  *
-  * <P>In addition to the type-specific set/get methods for properties, JMS 
-  * provides the <CODE>setObjectProperty</CODE> and 
-  * <CODE>getObjectProperty</CODE> methods. These support the same set of 
-  * property types using the objectified primitive values. Their purpose is 
-  * to allow the decision of property type to made at execution time rather 
-  * than at compile time. They support the same property value conversions.
-  *
-  * <P>The <CODE>setObjectProperty</CODE> method accepts values of class 
-  * <CODE>Boolean</CODE>, <CODE>Byte</CODE>, <CODE>Short</CODE>, 
-  * <CODE>Integer</CODE>, <CODE>Long</CODE>, <CODE>Float</CODE>, 
-  * <CODE>Double</CODE>, and <CODE>String</CODE>. An attempt 
-  * to use any other class must throw a <CODE>JMSException</CODE>.
-  *
-  * <P>The <CODE>getObjectProperty</CODE> method only returns values of class 
-  * <CODE>Boolean</CODE>, <CODE>Byte</CODE>, <CODE>Short</CODE>, 
-  * <CODE>Integer</CODE>, <CODE>Long</CODE>, <CODE>Float</CODE>, 
-  * <CODE>Double</CODE>, and <CODE>String</CODE>.
-  *
-  * <P>The order of property values is not defined. To iterate through a 
-  * message's property values, use <CODE>getPropertyNames</CODE> to retrieve 
-  * a property name enumeration and then use the various property get methods 
-  * to retrieve their values.
-  *
-  * <P>A message's properties are deleted by the <CODE>clearProperties</CODE>
-  * method. This leaves the message with an empty set of properties.
-  *
-  * <P>Getting a property value for a name which has not been set returns a 
-  * null value. Only the <CODE>getStringProperty</CODE> and 
-  * <CODE>getObjectProperty</CODE> methods can return a null value. 
-  * Attempting to read a null value as a primitive type must be treated as 
-  * calling the primitive's corresponding <CODE>valueOf(String)</CODE> 
-  * conversion method with a null value.
-  *
-  * <P>The JMS API reserves the <CODE>JMSX</CODE> property name prefix for JMS 
-  * defined properties.
-  * The full set of these properties is defined in the Java Message Service
-  * specification. New JMS defined properties may be added in later versions 
-  * of the JMS API.  Support for these properties is optional. The 
-  * <CODE>String[] ConnectionMetaData.getJMSXPropertyNames</CODE> method 
-  * returns the names of the JMSX properties supported by a connection.
-  *
-  * <P>JMSX properties may be referenced in message selectors whether or not
-  * they are supported by a connection. If they are not present in a
-  * message, they are treated like any other absent property.
-  *
-  * <P>JMSX properties defined in the specification as "set by provider on 
-  * send" are available to both the producer and the consumers of the message. 
-  * JMSX properties defined in the specification as "set by provider on 
-  * receive" are available only to the consumers.
-  *
-  * <P><CODE>JMSXGroupID</CODE> and <CODE>JMSXGroupSeq</CODE> are standard 
-  * properties that clients 
-  * should use if they want to group messages. All providers must support them.
-  * Unless specifically noted, the values and semantics of the JMSX properties 
-  * are undefined.
-  *
-  * <P>The JMS API reserves the <CODE>JMS_<I>vendor_name</I></CODE> property 
-  * name prefix for provider-specific properties. Each provider defines its own 
-  * value for <CODE><I>vendor_name</I></CODE>. This is the mechanism a JMS 
-  * provider uses to make its special per-message services available to a JMS 
-  * client.
-  *
-  * <P>The purpose of provider-specific properties is to provide special 
-  * features needed to integrate JMS clients with provider-native clients in a 
-  * single JMS application. They should not be used for messaging between JMS 
-  * clients.
-  *
-  * <H4>Provider Implementations of JMS Message Interfaces</H4>
-  *
-  * <P>The JMS API provides a set of message interfaces that define the JMS 
-  * message 
-  * model. It does not provide implementations of these interfaces.
-  *
-  * <P>Each JMS provider supplies a set of message factories with its 
-  * <CODE>Session</CODE> object for creating instances of messages. This allows 
-  * a provider to use message implementations tailored to its specific needs.
-  *
-  * <P>A provider must be prepared to accept message implementations that are 
-  * not its own. They may not be handled as efficiently as its own 
-  * implementation; however, they must be handled.
-  *
-  * <P>Note the following exception case when a provider is handling a foreign 
-  * message implementation. If the foreign message implementation contains a 
-  * <CODE>JMSReplyTo</CODE> header field that is set to a foreign destination 
-  * implementation, the provider is not required to handle or preserve the 
-  * value of this header field. 
-  *
-  * <H4>Message Selectors</H4>
-  *
-  * <P>A JMS message selector allows a client to specify, by
-  * header field references and property references, the
-  * messages it is interested in. Only messages whose header 
-  * and property values
-  * match the 
-  * selector are delivered. What it means for a message not to be delivered
-  * depends on the <CODE>MessageConsumer</CODE> being used (see 
-  * {@link javax.jms.QueueReceiver QueueReceiver} and 
-  * {@link javax.jms.TopicSubscriber TopicSubscriber}).
-  *
-  * <P>Message selectors cannot reference message body values.
-  *
-  * <P>A message selector matches a message if the selector evaluates to 
-  * true when the message's header field values and property values are 
-  * substituted for their corresponding identifiers in the selector.
-  *
-  * <P>A message selector is a <CODE>String</CODE> whose syntax is based on a 
-  * subset of 
-  * the SQL92 conditional expression syntax. If the value of a message selector 
-  * is an empty string, the value is treated as a null and indicates that there 
-  * is no message selector for the message consumer. 
-  *
-  * <P>The order of evaluation of a message selector is from left to right 
-  * within precedence level. Parentheses can be used to change this order.
-  *
-  * <P>Predefined selector literals and operator names are shown here in 
-  * uppercase; however, they are case insensitive.
-  *
-  * <P>A selector can contain:
-  *
-  * <UL>
-  *   <LI>Literals:
-  *   <UL>
-  *     <LI>A string literal is enclosed in single quotes, with a single quote 
-  *         represented by doubled single quote; for example, 
-  *         <CODE>'literal'</CODE> and <CODE>'literal''s'</CODE>. Like 
-  *         string literals in the Java programming language, these use the 
-  *         Unicode character encoding.
-  *     <LI>An exact numeric literal is a numeric value without a decimal 
-  *         point, such as <CODE>57</CODE>, <CODE>-957</CODE>, and  
-  *         <CODE>+62</CODE>; numbers in the range of <CODE>long</CODE> are 
-  *         supported. Exact numeric literals use the integer literal 
-  *         syntax of the Java programming language.
-  *     <LI>An approximate numeric literal is a numeric value in scientific 
-  *         notation, such as <CODE>7E3</CODE> and <CODE>-57.9E2</CODE>, or a 
-  *         numeric value with a decimal, such as <CODE>7.</CODE>, 
-  *         <CODE>-95.7</CODE>, and <CODE>+6.2</CODE>; numbers in the range of 
-  *         <CODE>double</CODE> are supported. Approximate literals use the 
-  *         floating-point literal syntax of the Java programming language.
-  *     <LI>The boolean literals <CODE>TRUE</CODE> and <CODE>FALSE</CODE>.
-  *   </UL>
-  *   <LI>Identifiers:
-  *   <UL>
-  *     <LI>An identifier is an unlimited-length sequence of letters 
-  *         and digits, the first of which must be a letter. A letter is any 
-  *         character for which the method <CODE>Character.isJavaLetter</CODE>
-  *         returns true. This includes <CODE>'_'</CODE> and <CODE>'$'</CODE>.
-  *         A letter or digit is any character for which the method 
-  *         <CODE>Character.isJavaLetterOrDigit</CODE> returns true.
-  *     <LI>Identifiers cannot be the names <CODE>NULL</CODE>, 
-  *         <CODE>TRUE</CODE>, and <CODE>FALSE</CODE>.
-  *     <LI>Identifiers cannot be <CODE>NOT</CODE>, <CODE>AND</CODE>, 
-  *         <CODE>OR</CODE>, <CODE>BETWEEN</CODE>, <CODE>LIKE</CODE>, 
-  *         <CODE>IN</CODE>, <CODE>IS</CODE>, or <CODE>ESCAPE</CODE>.
-  *     <LI>Identifiers are either header field references or property 
-  *         references.  The type of a property value in a message selector 
-  *         corresponds to the type used to set the property. If a property 
-  *         that does not exist in a message is referenced, its value is 
-  *         <CODE>NULL</CODE>.
-  *     <LI>The conversions that apply to the get methods for properties do not
-  *         apply when a property is used in a message selector expression.
-  *         For example, suppose you set a property as a string value, as in the
-  *         following:
-  *         <PRE>myMessage.setStringProperty("NumberOfOrders", "2");</PRE>
-  *         The following expression in a message selector would evaluate to 
-  *         false, because a string cannot be used in an arithmetic expression:
-  *         <PRE>"NumberOfOrders > 1"</PRE>
-  *     <LI>Identifiers are case-sensitive.
-  *     <LI>Message header field references are restricted to 
-  *         <CODE>JMSDeliveryMode</CODE>, <CODE>JMSPriority</CODE>, 
-  *         <CODE>JMSMessageID</CODE>, <CODE>JMSTimestamp</CODE>, 
-  *         <CODE>JMSCorrelationID</CODE>, and <CODE>JMSType</CODE>. 
-  *         <CODE>JMSMessageID</CODE>, <CODE>JMSCorrelationID</CODE>, and 
-  *         <CODE>JMSType</CODE> values may be null and if so are treated as a 
-  *         <CODE>NULL</CODE> value.
-  *     <LI>Any name beginning with <CODE>'JMSX'</CODE> is a JMS defined  
-  *         property name.
-  *     <LI>Any name beginning with <CODE>'JMS_'</CODE> is a provider-specific 
-  *         property name.
-  *     <LI>Any name that does not begin with <CODE>'JMS'</CODE> is an 
-  *         application-specific property name.
-  *   </UL>
-  *   <LI>White space is the same as that defined for the Java programming
-  *       language: space, horizontal tab, form feed, and line terminator.
-  *   <LI>Expressions: 
-  *   <UL>
-  *     <LI>A selector is a conditional expression; a selector that evaluates 
-  *         to <CODE>true</CODE> matches; a selector that evaluates to 
-  *         <CODE>false</CODE> or unknown does not match.
-  *     <LI>Arithmetic expressions are composed of themselves, arithmetic 
-  *         operations, identifiers (whose value is treated as a numeric 
-  *         literal), and numeric literals.
-  *     <LI>Conditional expressions are composed of themselves, comparison 
-  *         operations, and logical operations.
-  *   </UL>
-  *   <LI>Standard bracketing <CODE>()</CODE> for ordering expression evaluation
-  *      is supported.
-  *   <LI>Logical operators in precedence order: <CODE>NOT</CODE>, 
-  *       <CODE>AND</CODE>, <CODE>OR</CODE>
-  *   <LI>Comparison operators: <CODE>=</CODE>, <CODE>></CODE>, <CODE>>=</CODE>,
-  *       <CODE><</CODE>, <CODE><=</CODE>, <CODE><></CODE> (not equal)
-  *   <UL>
-  *     <LI>Only like type values can be compared. One exception is that it 
-  *         is valid to compare exact numeric values and approximate numeric 
-  *         values; the type conversion required is defined by the rules of 
-  *         numeric promotion in the Java programming language. If the 
-  *         comparison of non-like type values is attempted, the value of the 
-  *         operation is false. If either of the type values evaluates to 
-  *         <CODE>NULL</CODE>, the value of the expression is unknown.   
-  *     <LI>String and boolean comparison is restricted to <CODE>=</CODE> and 
-  *         <CODE><></CODE>. Two strings are equal 
-  *         if and only if they contain the same sequence of characters.
-  *   </UL>
-  *   <LI>Arithmetic operators in precedence order:
-  *   <UL>
-  *     <LI><CODE>+</CODE>, <CODE>-</CODE> (unary)
-  *     <LI><CODE>*</CODE>, <CODE>/</CODE> (multiplication and division)
-  *     <LI><CODE>+</CODE>, <CODE>-</CODE> (addition and subtraction)
-  *     <LI>Arithmetic operations must use numeric promotion in the Java 
-  *         programming language.
-  *   </UL>
-  *   <LI><CODE><I>arithmetic-expr1</I> [NOT] BETWEEN <I>arithmetic-expr2</I> 
-  *       AND <I>arithmetic-expr3</I></CODE> (comparison operator)
-  *   <UL>
-  *     <LI><CODE>"age&nbsp;BETWEEN&nbsp;15&nbsp;AND&nbsp;19"</CODE> is 
-  *         equivalent to 
-  *         <CODE>"age&nbsp;>=&nbsp;15&nbsp;AND&nbsp;age&nbsp;<=&nbsp;19"</CODE>
-  *     <LI><CODE>"age&nbsp;NOT&nbsp;BETWEEN&nbsp;15&nbsp;AND&nbsp;19"</CODE> 
-  *         is equivalent to 
-  *         <CODE>"age&nbsp;<&nbsp;15&nbsp;OR&nbsp;age&nbsp;>&nbsp;19"</CODE>
-  *   </UL>
-  *   <LI><CODE><I>identifier</I> [NOT] IN (<I>string-literal1</I>, 
-  *       <I>string-literal2</I>,...)</CODE> (comparison operator where 
-  *       <CODE><I>identifier</I></CODE> has a <CODE>String</CODE> or 
-  *       <CODE>NULL</CODE> value)
-  *   <UL>
-  *     <LI><CODE>"Country&nbsp;IN&nbsp;('&nbsp;UK',&nbsp;'US',&nbsp;'France')"</CODE>
-  *         is true for 
-  *         <CODE>'UK'</CODE> and false for <CODE>'Peru'</CODE>; it is 
-  *         equivalent to the expression 
-  *         <CODE>"(Country&nbsp;=&nbsp;'&nbsp;UK')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;US')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;France')"</CODE>
-  *     <LI><CODE>"Country&nbsp;NOT&nbsp;IN&nbsp;('&nbsp;UK',&nbsp;'US',&nbsp;'France')"</CODE> 
-  *         is false for <CODE>'UK'</CODE> and true for <CODE>'Peru'</CODE>; it 
-  *         is equivalent to the expression 
-  *         <CODE>"NOT&nbsp;((Country&nbsp;=&nbsp;'&nbsp;UK')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;US')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;France'))"</CODE>
-  *     <LI>If identifier of an <CODE>IN</CODE> or <CODE>NOT IN</CODE> 
-  *         operation is <CODE>NULL</CODE>, the value of the operation is 
-  *         unknown.
-  *   </UL>
-  *   <LI><CODE><I>identifier</I> [NOT] LIKE <I>pattern-value</I> [ESCAPE 
-  *       <I>escape-character</I>]</CODE> (comparison operator, where 
-  *       <CODE><I>identifier</I></CODE> has a <CODE>String</CODE> value; 
-  *       <CODE><I>pattern-value</I></CODE> is a string literal where 
-  *       <CODE>'_'</CODE> stands for any single character; <CODE>'%'</CODE> 
-  *       stands for any sequence of characters, including the empty sequence; 
-  *       and all other characters stand for themselves. The optional 
-  *       <CODE><I>escape-character</I></CODE> is a single-character string 
-  *       literal whose character is used to escape the special meaning of the 
-  *       <CODE>'_'</CODE> and <CODE>'%'</CODE> in 
-  *       <CODE><I>pattern-value</I></CODE>.)
-  *   <UL>
-  *     <LI><CODE>"phone&nbsp;LIKE&nbsp;'12%3'"</CODE> is true for 
-  *         <CODE>'123'</CODE> or <CODE>'12993'</CODE> and false for 
-  *         <CODE>'1234'</CODE>
-  *     <LI><CODE>"word&nbsp;LIKE&nbsp;'l_se'"</CODE> is true for 
-  *         <CODE>'lose'</CODE> and false for <CODE>'loose'</CODE>
-  *     <LI><CODE>"underscored&nbsp;LIKE&nbsp;'\_%'&nbsp;ESCAPE&nbsp;'\'"</CODE>
-  *          is true for <CODE>'_foo'</CODE> and false for <CODE>'bar'</CODE>
-  *     <LI><CODE>"phone&nbsp;NOT&nbsp;LIKE&nbsp;'12%3'"</CODE> is false for 
-  *         <CODE>'123'</CODE> or <CODE>'12993'</CODE> and true for 
-  *         <CODE>'1234'</CODE>
-  *     <LI>If <CODE><I>identifier</I></CODE> of a <CODE>LIKE</CODE> or 
-  *         <CODE>NOT LIKE</CODE> operation is <CODE>NULL</CODE>, the value 
-  *         of the operation is unknown.
-  *   </UL>
-  *   <LI><CODE><I>identifier</I> IS NULL</CODE> (comparison operator that tests
-  *       for a null header field value or a missing property value)
-  *   <UL>
-  *     <LI><CODE>"prop_name&nbsp;IS&nbsp;NULL"</CODE>
-  *   </UL>
-  *   <LI><CODE><I>identifier</I> IS NOT NULL</CODE> (comparison operator that
-  *       tests for the existence of a non-null header field value or a property
-  *       value)
-  *   <UL>
-  *     <LI><CODE>"prop_name&nbsp;IS&nbsp;NOT&nbsp;NULL"</CODE>
-  *   </UL>
-  *
-  * <P>JMS providers are required to verify the syntactic correctness of a 
-  *    message selector at the time it is presented. A method that provides a 
-  *  syntactically incorrect selector must result in a <CODE>JMSException</CODE>.
-  * JMS providers may also optionally provide some semantic checking at the time
-  * the selector is presented. Not all semantic checking can be performed at
-  * the time a message selector is presented, because property types are not known.
-  * 
-  * <P>The following message selector selects messages with a message type 
-  * of car and color of blue and weight greater than 2500 pounds:
-  *
-  * <PRE>"JMSType&nbsp;=&nbsp;'car'&nbsp;AND&nbsp;color&nbsp;=&nbsp;'blue'&nbsp;AND&nbsp;weight&nbsp;>&nbsp;2500"</PRE>
-  *
-  * <H4>Null Values</H4>
-  *
-  * <P>As noted above, property values may be <CODE>NULL</CODE>. The evaluation 
-  * of selector expressions containing <CODE>NULL</CODE> values is defined by 
-  * SQL92 <CODE>NULL</CODE> semantics. A brief description of these semantics 
-  * is provided here.
-  *
-  * <P>SQL treats a <CODE>NULL</CODE> value as unknown. Comparison or arithmetic
-  * with an unknown value always yields an unknown value.
-  *
-  * <P>The <CODE>IS NULL</CODE> and <CODE>IS NOT NULL</CODE> operators convert 
-  * an unknown value into the respective <CODE>TRUE</CODE> and 
-  * <CODE>FALSE</CODE> values.
-  *
-  * <P>The boolean operators use three-valued logic as defined by the 
-  * following tables:
-  *
-  * <P><B>The definition of the <CODE>AND</CODE> operator</B>
-  *
-  * <PRE>
-  * | AND  |   T   |   F   |   U
-  * +------+-------+-------+-------
-  * |  T   |   T   |   F   |   U
-  * |  F   |   F   |   F   |   F
-  * |  U   |   U   |   F   |   U
-  * +------+-------+-------+-------
-  * </PRE>
-  *
-  * <P><B>The definition of the <CODE>OR</CODE> operator</B>
-  *
-  * <PRE>
-  * | OR   |   T   |   F   |   U
-  * +------+-------+-------+--------
-  * |  T   |   T   |   T   |   T
-  * |  F   |   T   |   F   |   U
-  * |  U   |   T   |   U   |   U
-  * +------+-------+-------+------- 
-  * </PRE> 
-  *
-  * <P><B>The definition of the <CODE>NOT</CODE> operator</B>
-  *
-  * <PRE>
-  * | NOT
-  * +------+------
-  * |  T   |   F
-  * |  F   |   T
-  * |  U   |   U
-  * +------+-------
-  * </PRE>
-  *
-  * <H4>Special Notes</H4>
-  *
-  * <P>When used in a message selector, the <CODE>JMSDeliveryMode</CODE> header 
-  *    field is treated as having the values <CODE>'PERSISTENT'</CODE> and 
-  *    <CODE>'NON_PERSISTENT'</CODE>.
-  *
-  * <P>Date and time values should use the standard <CODE>long</CODE> 
-  *    millisecond value. When a date or time literal is included in a message 
-  *    selector, it should be an integer literal for a millisecond value. The 
-  *    standard way to produce millisecond values is to use 
-  *    <CODE>java.util.Calendar</CODE>.
-  *
-  * <P>Although SQL supports fixed decimal comparison and arithmetic, JMS 
-  *    message selectors do not. This is the reason for restricting exact 
-  *    numeric literals to those without a decimal (and the addition of 
-  *    numerics with a decimal as an alternate representation for 
-  *    approximate numeric values).
-  *
-  * <P>SQL comments are not supported.
-  *
-  * @version     1.1 April 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.MessageConsumer#receive()
-  * @see         javax.jms.MessageConsumer#receive(long)
-  * @see         javax.jms.MessageConsumer#receiveNoWait()
-  * @see         javax.jms.MessageListener#onMessage(Message)
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.StreamMessage
-  * @see         javax.jms.TextMessage
-  */
-
-public interface Message {
-
-    /** The message producer's default delivery mode is <CODE>PERSISTENT</CODE>.
-     *
-     *  @see DeliveryMode#PERSISTENT
-     */
-    static final int DEFAULT_DELIVERY_MODE = DeliveryMode.PERSISTENT;
-
-    /** The message producer's default priority is 4. 
-     */
-    static final int DEFAULT_PRIORITY = 4;
-
-    /** The message producer's default time to live is unlimited; the message 
-     *  never expires. 
-     */
-    static final long DEFAULT_TIME_TO_LIVE = 0;
-
-
-    /** Gets the message ID.
-      *
-      * <P>The <CODE>JMSMessageID</CODE> header field contains a value that 
-      * uniquely identifies each message sent by a provider.
-      *  
-      * <P>When a message is sent, <CODE>JMSMessageID</CODE> can be ignored. 
-      * When the <CODE>send</CODE> or <CODE>publish</CODE> method returns, it 
-      * contains a provider-assigned value.
-      *
-      * <P>A <CODE>JMSMessageID</CODE> is a <CODE>String</CODE> value that 
-      * should function as a 
-      * unique key for identifying messages in a historical repository. 
-      * The exact scope of uniqueness is provider-defined. It should at 
-      * least cover all messages for a specific installation of a 
-      * provider, where an installation is some connected set of message 
-      * routers.
-      *
-      * <P>All <CODE>JMSMessageID</CODE> values must start with the prefix 
-      * <CODE>'ID:'</CODE>. 
-      * Uniqueness of message ID values across different providers is 
-      * not required.
-      *
-      * <P>Since message IDs take some effort to create and increase a
-      * message's size, some JMS providers may be able to optimize message
-      * overhead if they are given a hint that the message ID is not used by
-      * an application. By calling the 
-      * <CODE>MessageProducer.setDisableMessageID</CODE> method, a JMS client 
-      * enables this potential optimization for all messages sent by that 
-      * message producer. If the JMS provider accepts this
-      * hint, these messages must have the message ID set to null; if the 
-      * provider ignores the hint, the message ID must be set to its normal 
-      * unique value.
-      *
-      * @return the message ID
-      *
-      * @exception JMSException if the JMS provider fails to get the message ID 
-      *                         due to some internal error.
-      * @see javax.jms.Message#setJMSMessageID(String)
-      * @see javax.jms.MessageProducer#setDisableMessageID(boolean)
-      */ 
- 
-    String
-    getJMSMessageID() throws JMSException;
-
-
-    /** Sets the message ID.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method
-      * can be used to change the value for a message that has been received.
-      *
-      * @param id the ID of the message
-      *
-      * @exception JMSException if the JMS provider fails to set the message ID 
-      *                         due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSMessageID()
-      */ 
-
-    void
-    setJMSMessageID(String id) throws JMSException;
-
-
-    /** Gets the message timestamp.
-      *  
-      * <P>The <CODE>JMSTimestamp</CODE> header field contains the time a 
-      * message was 
-      * handed off to a provider to be sent. It is not the time the 
-      * message was actually transmitted, because the actual send may occur 
-      * later due to transactions or other client-side queueing of messages.
-      *
-      * <P>When a message is sent, <CODE>JMSTimestamp</CODE> is ignored. When 
-      * the <CODE>send</CODE> or <CODE>publish</CODE>
-      * method returns, it contains a time value somewhere in the interval 
-      * between the call and the return. The value is in the format of a normal 
-      * millis time value in the Java programming language.
-      *
-      * <P>Since timestamps take some effort to create and increase a 
-      * message's size, some JMS providers may be able to optimize message 
-      * overhead if they are given a hint that the timestamp is not used by an 
-      * application. By calling the
-      * <CODE>MessageProducer.setDisableMessageTimestamp</CODE> method, a JMS 
-      * client enables this potential optimization for all messages sent by 
-      * that message producer. If the JMS provider accepts this
-      * hint, these messages must have the timestamp set to zero; if the 
-      * provider ignores the hint, the timestamp must be set to its normal 
-      * value.
-      *
-      * @return the message timestamp
-      *
-      * @exception JMSException if the JMS provider fails to get the timestamp
-      *                         due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSTimestamp(long)
-      * @see javax.jms.MessageProducer#setDisableMessageTimestamp(boolean)
-      */
-
-    long
-    getJMSTimestamp() throws JMSException;
-
-
-    /** Sets the message timestamp.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method
-      * can be used to change the value for a message that has been received.
-      *
-      * @param timestamp the timestamp for this message
-      *  
-      * @exception JMSException if the JMS provider fails to set the timestamp
-      *                         due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSTimestamp()
-      */
-
-    void
-    setJMSTimestamp(long timestamp) throws JMSException;
-
-
-    /** Gets the correlation ID as an array of bytes for the message.
-      *  
-      * <P>The use of a <CODE>byte[]</CODE> value for 
-      * <CODE>JMSCorrelationID</CODE> is non-portable.
-      *
-      * @return the correlation ID of a message as an array of bytes
-      *
-      * @exception JMSException if the JMS provider fails to get the correlation
-      *                         ID due to some internal error.
-      *  
-      * @see javax.jms.Message#setJMSCorrelationID(String)
-      * @see javax.jms.Message#getJMSCorrelationID()
-      * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
-      */
-
-    byte []
-    getJMSCorrelationIDAsBytes() throws JMSException;
-
-
-    /** Sets the correlation ID as an array of bytes for the message.
-      * 
-      * <P>The array is copied before the method returns, so
-      * future modifications to the array will not alter this message header.
-      *  
-      * <P>If a provider supports the native concept of correlation ID, a 
-      * JMS client may need to assign specific <CODE>JMSCorrelationID</CODE> 
-      * values to match those expected by native messaging clients. 
-      * JMS providers without native correlation ID values are not required to 
-      * support this method and its corresponding get method; their 
-      * implementation may throw a
-      * <CODE>java.lang.UnsupportedOperationException</CODE>. 
-      *
-      * <P>The use of a <CODE>byte[]</CODE> value for 
-      * <CODE>JMSCorrelationID</CODE> is non-portable.
-      *
-      * @param correlationID the correlation ID value as an array of bytes
-      *  
-      * @exception JMSException if the JMS provider fails to set the correlation
-      *                         ID due to some internal error.
-      *  
-      * @see javax.jms.Message#setJMSCorrelationID(String)
-      * @see javax.jms.Message#getJMSCorrelationID()
-      * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
-      */
-
-    void
-    setJMSCorrelationIDAsBytes(byte[] correlationID) throws JMSException;
-
-
-    /** Sets the correlation ID for the message.
-      *  
-      * <P>A client can use the <CODE>JMSCorrelationID</CODE> header field to 
-      * link one message with another. A typical use is to link a response 
-      * message with its request message.
-      *  
-      * <P><CODE>JMSCorrelationID</CODE> can hold one of the following:
-      *    <UL>
-      *      <LI>A provider-specific message ID
-      *      <LI>An application-specific <CODE>String</CODE>
-      *      <LI>A provider-native <CODE>byte[]</CODE> value
-      *    </UL>
-      *  
-      * <P>Since each message sent by a JMS provider is assigned a message ID
-      * value, it is convenient to link messages via message ID. All message ID
-      * values must start with the <CODE>'ID:'</CODE> prefix.
-      *  
-      * <P>In some cases, an application (made up of several clients) needs to
-      * use an application-specific value for linking messages. For instance,
-      * an application may use <CODE>JMSCorrelationID</CODE> to hold a value 
-      * referencing some external information. Application-specified values 
-      * must not start with the <CODE>'ID:'</CODE> prefix; this is reserved for 
-      * provider-generated message ID values.
-      *  
-      * <P>If a provider supports the native concept of correlation ID, a JMS
-      * client may need to assign specific <CODE>JMSCorrelationID</CODE> values 
-      * to match those expected by clients that do not use the JMS API. A 
-      * <CODE>byte[]</CODE> value is used for this
-      * purpose. JMS providers without native correlation ID values are not
-      * required to support <CODE>byte[]</CODE> values. The use of a 
-      * <CODE>byte[]</CODE> value for <CODE>JMSCorrelationID</CODE> is 
-      * non-portable.
-      *  
-      * @param correlationID the message ID of a message being referred to
-      *  
-      * @exception JMSException if the JMS provider fails to set the correlation
-      *                         ID due to some internal error.
-      *  
-      * @see javax.jms.Message#getJMSCorrelationID()
-      * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
-      * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
-      */ 
-
-    void
-    setJMSCorrelationID(String correlationID) throws JMSException;
-
-
-    /** Gets the correlation ID for the message.
-      *  
-      * <P>This method is used to return correlation ID values that are 
-      * either provider-specific message IDs or application-specific 
-      * <CODE>String</CODE> values.
-      *
-      * @return the correlation ID of a message as a <CODE>String</CODE>
-      *
-      * @exception JMSException if the JMS provider fails to get the correlation
-      *                         ID due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSCorrelationID(String)
-      * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
-      * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
-      */ 
- 
-    String
-    getJMSCorrelationID() throws JMSException;
-
-
-    /** Gets the <CODE>Destination</CODE> object to which a reply to this 
-      * message should be sent.
-      *  
-      * @return <CODE>Destination</CODE> to which to send a response to this 
-      *         message
-      *
-      * @exception JMSException if the JMS provider fails to get the  
-      *                         <CODE>JMSReplyTo</CODE> destination due to some 
-      *                         internal error.
-      *
-      * @see javax.jms.Message#setJMSReplyTo(Destination)
-      */ 
- 
-    Destination
-    getJMSReplyTo() throws JMSException;
-
-
-    /** Sets the <CODE>Destination</CODE> object to which a reply to this 
-      * message should be sent.
-      *  
-      * <P>The <CODE>JMSReplyTo</CODE> header field contains the destination 
-      * where a reply 
-      * to the current message should be sent. If it is null, no reply is 
-      * expected. The destination may be either a <CODE>Queue</CODE> object or
-      * a <CODE>Topic</CODE> object.
-      *
-      * <P>Messages sent with a null <CODE>JMSReplyTo</CODE> value may be a 
-      * notification of some event, or they may just be some data the sender 
-      * thinks is of interest.
-      *
-      * <P>Messages with a <CODE>JMSReplyTo</CODE> value typically expect a 
-      * response. A response is optional; it is up to the client to decide.  
-      * These messages are called requests. A message sent in response to a 
-      * request is called a reply.
-      *
-      * <P>In some cases a client may wish to match a request it sent earlier 
-      * with a reply it has just received. The client can use the 
-      * <CODE>JMSCorrelationID</CODE> header field for this purpose.
-      *
-      * @param replyTo <CODE>Destination</CODE> to which to send a response to 
-      *                this message
-      *
-      * @exception JMSException if the JMS provider fails to set the  
-      *                         <CODE>JMSReplyTo</CODE> destination due to some 
-      *                         internal error.
-      *
-      * @see javax.jms.Message#getJMSReplyTo()
-      */ 
-
-    void
-    setJMSReplyTo(Destination replyTo) throws JMSException;
-
-
-    /** Gets the <CODE>Destination</CODE> object for this message.
-      *  
-      * <P>The <CODE>JMSDestination</CODE> header field contains the 
-      * destination to which the message is being sent.
-      *  
-      * <P>When a message is sent, this field is ignored. After completion
-      * of the <CODE>send</CODE> or <CODE>publish</CODE> method, the field 
-      * holds the destination specified by the method.
-      *  
-      * <P>When a message is received, its <CODE>JMSDestination</CODE> value 
-      * must be equivalent to the value assigned when it was sent.
-      *
-      * @return the destination of this message
-      *  
-      * @exception JMSException if the JMS provider fails to get the destination
-      *                         due to some internal error.
-      *  
-      * @see javax.jms.Message#setJMSDestination(Destination)
-      */ 
-
-    Destination
-    getJMSDestination() throws JMSException;
-
-
-    /** Sets the <CODE>Destination</CODE> object for this message.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method 
-      * can be used to change the value for a message that has been received.
-      *
-      * @param destination the destination for this message
-      *  
-      * @exception JMSException if the JMS provider fails to set the destination
-      *                         due to some internal error.
-      *  
-      * @see javax.jms.Message#getJMSDestination()
-      */ 
-
-    void
-    setJMSDestination(Destination destination) throws JMSException;
-
-
-    /** Gets the <CODE>DeliveryMode</CODE> value specified for this message.
-      *  
-      * @return the delivery mode for this message
-      *  
-      * @exception JMSException if the JMS provider fails to get the 
-      *                         delivery mode due to some internal error.
-      *  
-      * @see javax.jms.Message#setJMSDeliveryMode(int)
-      * @see javax.jms.DeliveryMode
-      */ 
- 
-    int
-    getJMSDeliveryMode() throws JMSException;
- 
- 
-    /** Sets the <CODE>DeliveryMode</CODE> value for this message.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method 
-      * can be used to change the value for a message that has been received.
-      *
-      * @param deliveryMode the delivery mode for this message
-      *  
-      * @exception JMSException if the JMS provider fails to set the 
-      *                         delivery mode due to some internal error.
-      *  
-      * @see javax.jms.Message#getJMSDeliveryMode()
-      * @see javax.jms.DeliveryMode
-      */ 
- 
-    void 
-    setJMSDeliveryMode(int deliveryMode) throws JMSException;
-
-
-    /** Gets an indication of whether this message is being redelivered.
-      *
-      * <P>If a client receives a message with the <CODE>JMSRedelivered</CODE> 
-      * field set,
-      * it is likely, but not guaranteed, that this message was delivered
-      * earlier but that its receipt was not acknowledged
-      * at that time.
-      *
-      * @return true if this message is being redelivered
-      *  
-      * @exception JMSException if the JMS provider fails to get the redelivered
-      *                         state due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSRedelivered(boolean)
-      */ 
- 
-    boolean
-    getJMSRedelivered() throws JMSException;
- 
- 
-    /** Specifies whether this message is being redelivered.
-      *  
-      * <P>This field is set at the time the message is delivered. This
-      * method can be used to change the value for a message that has
-      * been received.
-      *
-      * @param redelivered an indication of whether this message is being
-      * redelivered
-      *  
-      * @exception JMSException if the JMS provider fails to set the redelivered
-      *                         state due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSRedelivered()
-      */ 
- 
-    void
-    setJMSRedelivered(boolean redelivered) throws JMSException;
-
-
-    /** Gets the message type identifier supplied by the client when the
-      * message was sent.
-      *
-      * @return the message type
-      *  
-      * @exception JMSException if the JMS provider fails to get the message 
-      *                         type due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSType(String)
-      */
-       
-    String
-    getJMSType() throws JMSException;
-
-
-    /** Sets the message type.
-      *
-      * <P>Some JMS providers use a message repository that contains the 
-      * definitions of messages sent by applications. The <CODE>JMSType</CODE> 
-      * header field may reference a message's definition in the provider's
-      * repository.
-      *
-      * <P>The JMS API does not define a standard message definition repository,
-      * nor does it define a naming policy for the definitions it contains. 
-      *
-      * <P>Some messaging systems require that a message type definition for 
-      * each application message be created and that each message specify its 
-      * type. In order to work with such JMS providers, JMS clients should 
-      * assign a value to <CODE>JMSType</CODE>, whether the application makes 
-      * use of it or not. This ensures that the field is properly set for those 
-      * providers that require it.
-      *
-      * <P>To ensure portability, JMS clients should use symbolic values for 
-      * <CODE>JMSType</CODE> that can be configured at installation time to the 
-      * values defined in the current provider's message repository. If string 
-      * literals are used, they may not be valid type names for some JMS 
-      * providers.
-      *
-      * @param type the message type
-      *  
-      * @exception JMSException if the JMS provider fails to set the message 
-      *                         type due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSType()
-      */
-
-    void 
-    setJMSType(String type) throws JMSException;
-
-
-    /** Gets the message's expiration value.
-      *  
-      * <P>When a message is sent, the <CODE>JMSExpiration</CODE> header field 
-      * is left unassigned. After completion of the <CODE>send</CODE> or 
-      * <CODE>publish</CODE> method, it holds the expiration time of the
-      * message. This is the sum of the time-to-live value specified by the
-      * client and the GMT at the time of the <CODE>send</CODE> or 
-      * <CODE>publish</CODE>.
-      *
-      * <P>If the time-to-live is specified as zero, <CODE>JMSExpiration</CODE> 
-      * is set to zero to indicate that the message does not expire.
-      *
-      * <P>When a message's expiration time is reached, a provider should
-      * discard it. The JMS API does not define any form of notification of 
-      * message expiration.
-      *
-      * <P>Clients should not receive messages that have expired; however,
-      * the JMS API does not guarantee that this will not happen.
-      *
-      * @return the time the message expires, which is the sum of the
-      * time-to-live value specified by the client and the GMT at the
-      * time of the send
-      *  
-      * @exception JMSException if the JMS provider fails to get the message 
-      *                         expiration due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSExpiration(long)
-      */ 
- 
-    long
-    getJMSExpiration() throws JMSException;
- 
- 
-    /** Sets the message's expiration value.
-      *
-      * <P>JMS providers set this field when a message is sent. This method 
-      * can be used to change the value for a message that has been received.
-      *  
-      * @param expiration the message's expiration time
-      *  
-      * @exception JMSException if the JMS provider fails to set the message 
-      *                         expiration due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSExpiration() 
-      */
- 
-    void
-    setJMSExpiration(long expiration) throws JMSException;
-
-
-    /** Gets the message priority level.
-      *  
-      * <P>The JMS API defines ten levels of priority value, with 0 as the 
-      * lowest
-      * priority and 9 as the highest. In addition, clients should consider
-      * priorities 0-4 as gradations of normal priority and priorities 5-9
-      * as gradations of expedited priority.
-      *  
-      * <P>The JMS API does not require that a provider strictly implement 
-      * priority 
-      * ordering of messages; however, it should do its best to deliver 
-      * expedited messages ahead of normal messages.
-      *  
-      * @return the default message priority
-      *  
-      * @exception JMSException if the JMS provider fails to get the message 
-      *                         priority due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSPriority(int) 
-      */ 
-
-    int
-    getJMSPriority() throws JMSException;
-
-
-    /** Sets the priority level for this message.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method 
-      * can be used to change the value for a message that has been received.
-      *
-      * @param priority the priority of this message
-      *  
-      * @exception JMSException if the JMS provider fails to set the message 
-      *                         priority due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSPriority() 
-      */ 
-
-    void
-    setJMSPriority(int priority) throws JMSException;
-
-
-    /** Clears a message's properties.
-      *
-      * <P>The message's header fields and body are not cleared.
-      *
-      * @exception JMSException if the JMS provider fails to clear the message 
-      *                         properties due to some internal error.
-      */ 
-
-    void
-    clearProperties() throws JMSException;
-
-
-    /** Indicates whether a property value exists.
-      *
-      * @param name the name of the property to test
-      *
-      * @return true if the property exists
-      *  
-      * @exception JMSException if the JMS provider fails to determine if the 
-      *                         property exists due to some internal error.
-      */
-
-    boolean
-    propertyExists(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>boolean</CODE> property with the  
-      * specified name.
-      *  
-      * @param name the name of the <CODE>boolean</CODE> property
-      *  
-      * @return the <CODE>boolean</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid. 
-      */ 
-
-    boolean
-    getBooleanProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>byte</CODE> property with the specified 
-      * name.
-      *  
-      * @param name the name of the <CODE>byte</CODE> property
-      *  
-      * @return the <CODE>byte</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid. 
-      */ 
-
-    byte
-    getByteProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>short</CODE> property with the specified 
-      * name.
-      *
-      * @param name the name of the <CODE>short</CODE> property
-      *
-      * @return the <CODE>short</CODE> property value for the specified name
-      *
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */
-   
-    short
-    getShortProperty(String name) throws JMSException;
- 
- 
-    /** Returns the value of the <CODE>int</CODE> property with the specified 
-      * name.
-      *  
-      * @param name the name of the <CODE>int</CODE> property
-      *  
-      * @return the <CODE>int</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    int
-    getIntProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>long</CODE> property with the specified 
-      * name.
-      *  
-      * @param name the name of the <CODE>long</CODE> property
-      *  
-      * @return the <CODE>long</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    long
-    getLongProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>float</CODE> property with the specified 
-      * name.
-      *  
-      * @param name the name of the <CODE>float</CODE> property
-      *  
-      * @return the <CODE>float</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    float
-    getFloatProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>double</CODE> property with the specified
-      * name.
-      *  
-      * @param name the name of the <CODE>double</CODE> property
-      *  
-      * @return the <CODE>double</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    double
-    getDoubleProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>String</CODE> property with the specified
-      * name.
-      *  
-      * @param name the name of the <CODE>String</CODE> property
-      *  
-      * @return the <CODE>String</CODE> property value for the specified name;
-      * if there is no property by this name, a null value is returned
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    String
-    getStringProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the Java object property with the specified name.
-      *  
-      * <P>This method can be used to return, in objectified format,
-      * an object that has been stored as a property in the message with the 
-      * equivalent <CODE>setObjectProperty</CODE> method call, or its equivalent
-      * primitive <CODE>set<I>type</I>Property</CODE> method.
-      *  
-      * @param name the name of the Java object property
-      *  
-      * @return the Java object property value with the specified name, in 
-      * objectified format (for example, if the property was set as an 
-      * <CODE>int</CODE>, an <CODE>Integer</CODE> is 
-      * returned); if there is no property by this name, a null value 
-      * is returned
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      */ 
-
-    Object
-    getObjectProperty(String name) throws JMSException;
-
-
-    /** Returns an <CODE>Enumeration</CODE> of all the property names.
-      *
-      * <P>Note that JMS standard header fields are not considered
-      * properties and are not returned in this enumeration.
-      *  
-      * @return an enumeration of all the names of property values
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                          names due to some internal error.
-      */ 
-     
-    Enumeration
-    getPropertyNames() throws JMSException;
-
-
-    /** Sets a <CODE>boolean</CODE> property value with the specified name into 
-      * the message.
-      *
-      * @param name the name of the <CODE>boolean</CODE> property
-      * @param value the <CODE>boolean</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setBooleanProperty(String name, boolean value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>byte</CODE> property value with the specified name into 
-      * the message.
-      *  
-      * @param name the name of the <CODE>byte</CODE> property
-      * @param value the <CODE>byte</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setByteProperty(String name, byte value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>short</CODE> property value with the specified name into
-      * the message.
-      *  
-      * @param name the name of the <CODE>short</CODE> property
-      * @param value the <CODE>short</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setShortProperty(String name, short value)
-                        throws JMSException;
-
-
-    /** Sets an <CODE>int</CODE> property value with the specified name into
-      * the message.
-      *  
-      * @param name the name of the <CODE>int</CODE> property
-      * @param value the <CODE>int</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setIntProperty(String name, int value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>long</CODE> property value with the specified name into 
-      * the message.
-      *  
-      * @param name the name of the <CODE>long</CODE> property
-      * @param value the <CODE>long</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setLongProperty(String name, long value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>float</CODE> property value with the specified name into 
-      * the message.
-      *  
-      * @param name the name of the <CODE>float</CODE> property
-      * @param value the <CODE>float</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setFloatProperty(String name, float value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>double</CODE> property value with the specified name into 
-      * the message.
-      *  
-      * @param name the name of the <CODE>double</CODE> property
-      * @param value the <CODE>double</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setDoubleProperty(String name, double value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>String</CODE> property value with the specified name into 
-      * the message.
-      *
-      * @param name the name of the <CODE>String</CODE> property
-      * @param value the <CODE>String</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setStringProperty(String name, String value)
-                        throws JMSException;
-
-
-    /** Sets a Java object property value with the specified name into the 
-      * message.
-      *  
-      * <P>Note that this method works only for the objectified primitive
-      * object types (<CODE>Integer</CODE>, <CODE>Double</CODE>, 
-      * <CODE>Long</CODE> ...) and <CODE>String</CODE> objects.
-      *  
-      * @param name the name of the Java object property
-      * @param value the Java object property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageFormatException if the object is invalid
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setObjectProperty(String name, Object value)
-                        throws JMSException;
-
-
-    /** Acknowledges all consumed messages of the session of this consumed 
-      * message.
-      *  
-      * <P>All consumed JMS messages support the <CODE>acknowledge</CODE> 
-      * method for use when a client has specified that its JMS session's 
-      * consumed messages are to be explicitly acknowledged.  By invoking 
-      * <CODE>acknowledge</CODE> on a consumed message, a client acknowledges 
-      * all messages consumed by the session that the message was delivered to.
-      * 
-      * <P>Calls to <CODE>acknowledge</CODE> are ignored for both transacted 
-      * sessions and sessions specified to use implicit acknowledgement modes.
-      *
-      * <P>A client may individually acknowledge each message as it is consumed,
-      * or it may choose to acknowledge messages as an application-defined group 
-      * (which is done by calling acknowledge on the last received message of the group,
-      *  thereby acknowledging all messages consumed by the session.)
-      *
-      * <P>Messages that have been received but not acknowledged may be 
-      * redelivered.
-      *
-      * @exception JMSException if the JMS provider fails to acknowledge the
-      *                         messages due to some internal error.
-      * @exception IllegalStateException if this method is called on a closed
-      *                         session.
-      *
-      * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
-      */ 
-
-    void
-    acknowledge() throws JMSException;
-
-
-    /** Clears out the message body. Clearing a message's body does not clear 
-      * its header values or property entries.
-      *
-      * <P>If this message body was read-only, calling this method leaves
-      * the message body in the same state as an empty body in a newly
-      * created message.
-      *
-      * @exception JMSException if the JMS provider fails to clear the message
-      *                         body due to some internal error.
-      */
-
-    void
-    clearBody() throws JMSException;
+
+/** The <CODE>Message</CODE> interface is the root interface of all JMS
+ * messages. It defines the message header and the <CODE>acknowledge</CODE>
+ * method used for all messages.
+ *
+ * <P>Most message-oriented middleware (MOM) products treat messages as
+ * lightweight entities that consist
+ * of a header and a payload. The header contains fields used for message
+ * routing and identification; the payload contains the application data
+ * being sent.
+ *
+ * <P>Within this general form, the definition of a message varies
+ * significantly across products. It would be quite difficult for the JMS API
+ * to support all of these message models.
+ *
+ * <P>With this in mind, the JMS message model has the following goals:
+ * <UL>
+ *   <LI>Provide a single, unified message API
+ *   <LI>Provide an API suitable for creating messages that match the
+ *       format used by provider-native messaging applications
+ *   <LI>Support the development of heterogeneous applications that span
+ *       operating systems, machine architectures, and computer languages
+ *   <LI>Support messages containing objects in the Java programming language
+ *       ("Java objects")
+ *   <LI>Support messages containing Extensible Markup Language (XML) pages
+ * </UL>
+ *
+ * <P>JMS messages are composed of the following parts:
+ * <UL>
+ *   <LI>Header - All messages support the same set of header fields.
+ *       Header fields contain values used by both clients and providers to
+ *       identify and route messages.
+ *   <LI>Properties - Each message contains a built-in facility for supporting
+ *       application-defined property values. Properties provide an efficient
+ *       mechanism for supporting application-defined message filtering.
+ *   <LI>Body - The JMS API defines several types of message body, which cover
+ *       the majority of messaging styles currently in use.
+ * </UL>
+ *
+ * <H4>Message Bodies</H4>
+ *
+ * <P>The JMS API defines five types of message body:
+ * <UL>
+ *   <LI>Stream - A <CODE>StreamMessage</CODE> object's message body contains
+ *       a stream of primitive values in the Java programming
+ *       language ("Java primitives"). It is filled and read sequentially.
+ *   <LI>Map - A <CODE>MapMessage</CODE> object's message body contains a set
+ *       of name-value pairs, where names are <CODE>String</CODE>
+ *       objects, and values are Java primitives. The entries can be accessed
+ *       sequentially or randomly by name. The order of the entries is
+ *       undefined.
+ *   <LI>Text - A <CODE>TextMessage</CODE> object's message body contains a
+ *       <CODE>java.lang.String</CODE> object. This message type can be used
+ *       to transport plain-text messages, and XML messages.
+ *   <LI>Object - An <CODE>ObjectMessage</CODE> object's message body contains
+ *       a <CODE>Serializable</CODE> Java object.
+ *   <LI>Bytes - A <CODE>BytesMessage</CODE> object's message body contains a
+ *       stream of uninterpreted bytes. This message type is for
+ *       literally encoding a body to match an existing message format. In
+ *       many cases, it is possible to use one of the other body types,
+ *       which are easier to use. Although the JMS API allows the use of
+ *       message properties with byte messages, they are typically not used,
+ *       since the inclusion of properties may affect the format.
+ * </UL>
+ *
+ * <H4>Message Headers</H4>
+ *
+ * <P>The <CODE>JMSCorrelationID</CODE> header field is used for linking one
+ * message with
+ * another. It typically links a reply message with its requesting message.
+ *
+ * <P><CODE>JMSCorrelationID</CODE> can hold a provider-specific message ID,
+ * an application-specific <CODE>String</CODE> object, or a provider-native
+ * <CODE>byte[]</CODE> value.
+ *
+ * <H4>Message Properties</H4>
+ *
+ * <P>A <CODE>Message</CODE> object contains a built-in facility for supporting
+ * application-defined property values. In effect, this provides a mechanism
+ * for adding application-specific header fields to a message.
+ *
+ * <P>Properties allow an application, via message selectors, to have a JMS
+ * provider select, or filter, messages on its behalf using
+ * application-specific criteria.
+ *
+ * <P>Property names must obey the rules for a message selector identifier.
+ * Property names must not be null, and must not be empty strings. If a property
+ * name is set and it is either null or an empty string, an
+ * <CODE>IllegalArgumentException</CODE> must be thrown.
+ *
+ * <P>Property values can be <CODE>boolean</CODE>, <CODE>byte</CODE>,
+ * <CODE>short</CODE>, <CODE>int</CODE>, <CODE>long</CODE>, <CODE>float</CODE>,
+ * <CODE>double</CODE>, and <CODE>String</CODE>.
+ *
+ * <P>Property values are set prior to sending a message. When a client
+ * receives a message, its properties are in read-only mode. If a
+ * client attempts to set properties at this point, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown. If
+ * <CODE>clearProperties</CODE> is called, the properties can now be both
+ * read from and written to. Note that header fields are distinct from
+ * properties. Header fields are never in read-only mode.
+ *
+ * <P>A property value may duplicate a value in a message's body, or it may
+ * not. Although JMS does not define a policy for what should or should not
+ * be made a property, application developers should note that JMS providers
+ * will likely handle data in a message's body more efficiently than data in
+ * a message's properties. For best performance, applications should use
+ * message properties only when they need to customize a message's header.
+ * The primary reason for doing this is to support customized message
+ * selection.
+ *
+ * <P>Message properties support the following conversion table. The marked
+ * cases must be supported. The unmarked cases must throw a
+ * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions
+ * may throw a runtime exception if the
+ * primitive's <CODE>valueOf</CODE> method does not accept the
+ * <CODE>String</CODE> as a valid representation of the primitive.
+ *
+ * <P>A value written as the row type can be read as the column type.
+ *
+ * <PRE>
+ * |        | boolean byte short int long float double String
+ * |----------------------------------------------------------
+ * |boolean |    X                                       X
+ * |byte    |          X     X    X   X                  X
+ * |short   |                X    X   X                  X
+ * |int     |                     X   X                  X
+ * |long    |                         X                  X
+ * |float   |                               X     X      X
+ * |double  |                                     X      X
+ * |String  |    X     X     X    X   X     X     X      X
+ * |----------------------------------------------------------
+ * </PRE>
+ *
+ * <P>In addition to the type-specific set/get methods for properties, JMS
+ * provides the <CODE>setObjectProperty</CODE> and
+ * <CODE>getObjectProperty</CODE> methods. These support the same set of
+ * property types using the objectified primitive values. Their purpose is
+ * to allow the decision of property type to made at execution time rather
+ * than at compile time. They support the same property value conversions.
+ *
+ * <P>The <CODE>setObjectProperty</CODE> method accepts values of class
+ * <CODE>Boolean</CODE>, <CODE>Byte</CODE>, <CODE>Short</CODE>,
+ * <CODE>Integer</CODE>, <CODE>Long</CODE>, <CODE>Float</CODE>,
+ * <CODE>Double</CODE>, and <CODE>String</CODE>. An attempt
+ * to use any other class must throw a <CODE>JMSException</CODE>.
+ *
+ * <P>The <CODE>getObjectProperty</CODE> method only returns values of class
+ * <CODE>Boolean</CODE>, <CODE>Byte</CODE>, <CODE>Short</CODE>,
+ * <CODE>Integer</CODE>, <CODE>Long</CODE>, <CODE>Float</CODE>,
+ * <CODE>Double</CODE>, and <CODE>String</CODE>.
+ *
+ * <P>The order of property values is not defined. To iterate through a
+ * message's property values, use <CODE>getPropertyNames</CODE> to retrieve
+ * a property name enumeration and then use the various property get methods
+ * to retrieve their values.
+ *
+ * <P>A message's properties are deleted by the <CODE>clearProperties</CODE>
+ * method. This leaves the message with an empty set of properties.
+ *
+ * <P>Getting a property value for a name which has not been set returns a
+ * null value. Only the <CODE>getStringProperty</CODE> and
+ * <CODE>getObjectProperty</CODE> methods can return a null value.
+ * Attempting to read a null value as a primitive type must be treated as
+ * calling the primitive's corresponding <CODE>valueOf(String)</CODE>
+ * conversion method with a null value.
+ *
+ * <P>The JMS API reserves the <CODE>JMSX</CODE> property name prefix for JMS
+ * defined properties.
+ * The full set of these properties is defined in the Java Message Service
+ * specification. New JMS defined properties may be added in later versions
+ * of the JMS API.  Support for these properties is optional. The
+ * <CODE>String[] ConnectionMetaData.getJMSXPropertyNames</CODE> method
+ * returns the names of the JMSX properties supported by a connection.
+ *
+ * <P>JMSX properties may be referenced in message selectors whether or not
+ * they are supported by a connection. If they are not present in a
+ * message, they are treated like any other absent property.
+ *
+ * <P>JMSX properties defined in the specification as "set by provider on
+ * send" are available to both the producer and the consumers of the message.
+ * JMSX properties defined in the specification as "set by provider on
+ * receive" are available only to the consumers.
+ *
+ * <P><CODE>JMSXGroupID</CODE> and <CODE>JMSXGroupSeq</CODE> are standard
+ * properties that clients
+ * should use if they want to group messages. All providers must support them.
+ * Unless specifically noted, the values and semantics of the JMSX properties
+ * are undefined.
+ *
+ * <P>The JMS API reserves the <CODE>JMS_<I>vendor_name</I></CODE> property
+ * name prefix for provider-specific properties. Each provider defines its own
+ * value for <CODE><I>vendor_name</I></CODE>. This is the mechanism a JMS
+ * provider uses to make its special per-message services available to a JMS
+ * client.
+ *
+ * <P>The purpose of provider-specific properties is to provide special
+ * features needed to integrate JMS clients with provider-native clients in a
+ * single JMS application. They should not be used for messaging between JMS
+ * clients.
+ *
+ * <H4>Provider Implementations of JMS Message Interfaces</H4>
+ *
+ * <P>The JMS API provides a set of message interfaces that define the JMS
+ * message
+ * model. It does not provide implementations of these interfaces.
+ *
+ * <P>Each JMS provider supplies a set of message factories with its
+ * <CODE>Session</CODE> object for creating instances of messages. This allows
+ * a provider to use message implementations tailored to its specific needs.
+ *
+ * <P>A provider must be prepared to accept message implementations that are
+ * not its own. They may not be handled as efficiently as its own
+ * implementation; however, they must be handled.
+ *
+ * <P>Note the following exception case when a provider is handling a foreign
+ * message implementation. If the foreign message implementation contains a
+ * <CODE>JMSReplyTo</CODE> header field that is set to a foreign destination
+ * implementation, the provider is not required to handle or preserve the
+ * value of this header field.
+ *
+ * <H4>Message Selectors</H4>
+ *
+ * <P>A JMS message selector allows a client to specify, by
+ * header field references and property references, the
+ * messages it is interested in. Only messages whose header
+ * and property values
+ * match the
+ * selector are delivered. What it means for a message not to be delivered
+ * depends on the <CODE>MessageConsumer</CODE> being used (see
+ * {@link javax.jms.QueueReceiver QueueReceiver} and
+ * {@link javax.jms.TopicSubscriber TopicSubscriber}).
+ *
+ * <P>Message selectors cannot reference message body values.
+ *
+ * <P>A message selector matches a message if the selector evaluates to
+ * true when the message's header field values and property values are
+ * substituted for their corresponding identifiers in the selector.
+ *
+ * <P>A message selector is a <CODE>String</CODE> whose syntax is based on a
+ * subset of
+ * the SQL92 conditional expression syntax. If the value of a message selector
+ * is an empty string, the value is treated as a null and indicates that there
+ * is no message selector for the message consumer.
+ *
+ * <P>The order of evaluation of a message selector is from left to right
+ * within precedence level. Parentheses can be used to change this order.
+ *
+ * <P>Predefined selector literals and operator names are shown here in
+ * uppercase; however, they are case insensitive.
+ *
+ * <P>A selector can contain:
+ *
+ * <UL>
+ *   <LI>Literals:
+ *   <UL>
+ *     <LI>A string literal is enclosed in single quotes, with a single quote
+ *         represented by doubled single quote; for example,
+ *         <CODE>'literal'</CODE> and <CODE>'literal''s'</CODE>. Like
+ *         string literals in the Java programming language, these use the
+ *         Unicode character encoding.
+ *     <LI>An exact numeric literal is a numeric value without a decimal
+ *         point, such as <CODE>57</CODE>, <CODE>-957</CODE>, and
+ *         <CODE>+62</CODE>; numbers in the range of <CODE>long</CODE> are
+ *         supported. Exact numeric literals use the integer literal
+ *         syntax of the Java programming language.
+ *     <LI>An approximate numeric literal is a numeric value in scientific
+ *         notation, such as <CODE>7E3</CODE> and <CODE>-57.9E2</CODE>, or a
+ *         numeric value with a decimal, such as <CODE>7.</CODE>,
+ *         <CODE>-95.7</CODE>, and <CODE>+6.2</CODE>; numbers in the range of
+ *         <CODE>double</CODE> are supported. Approximate literals use the
+ *         floating-point literal syntax of the Java programming language.
+ *     <LI>The boolean literals <CODE>TRUE</CODE> and <CODE>FALSE</CODE>.
+ *   </UL>
+ *   <LI>Identifiers:
+ *   <UL>
+ *     <LI>An identifier is an unlimited-length sequence of letters
+ *         and digits, the first of which must be a letter. A letter is any
+ *         character for which the method <CODE>Character.isJavaLetter</CODE>
+ *         returns true. This includes <CODE>'_'</CODE> and <CODE>'$'</CODE>.
+ *         A letter or digit is any character for which the method
+ *         <CODE>Character.isJavaLetterOrDigit</CODE> returns true.
+ *     <LI>Identifiers cannot be the names <CODE>NULL</CODE>,
+ *         <CODE>TRUE</CODE>, and <CODE>FALSE</CODE>.
+ *     <LI>Identifiers cannot be <CODE>NOT</CODE>, <CODE>AND</CODE>,
+ *         <CODE>OR</CODE>, <CODE>BETWEEN</CODE>, <CODE>LIKE</CODE>,
+ *         <CODE>IN</CODE>, <CODE>IS</CODE>, or <CODE>ESCAPE</CODE>.
+ *     <LI>Identifiers are either header field references or property
+ *         references.  The type of a property value in a message selector
+ *         corresponds to the type used to set the property. If a property
+ *         that does not exist in a message is referenced, its value is
+ *         <CODE>NULL</CODE>.
+ *     <LI>The conversions that apply to the get methods for properties do not
+ *         apply when a property is used in a message selector expression.
+ *         For example, suppose you set a property as a string value, as in the
+ *         following:
+ *         <PRE>myMessage.setStringProperty("NumberOfOrders", "2");</PRE>
+ *         The following expression in a message selector would evaluate to
+ *         false, because a string cannot be used in an arithmetic expression:
+ *         <PRE>"NumberOfOrders > 1"</PRE>
+ *     <LI>Identifiers are case-sensitive.
+ *     <LI>Message header field references are restricted to
+ *         <CODE>JMSDeliveryMode</CODE>, <CODE>JMSPriority</CODE>,
+ *         <CODE>JMSMessageID</CODE>, <CODE>JMSTimestamp</CODE>,
+ *         <CODE>JMSCorrelationID</CODE>, and <CODE>JMSType</CODE>.
+ *         <CODE>JMSMessageID</CODE>, <CODE>JMSCorrelationID</CODE>, and
+ *         <CODE>JMSType</CODE> values may be null and if so are treated as a
+ *         <CODE>NULL</CODE> value.
+ *     <LI>Any name beginning with <CODE>'JMSX'</CODE> is a JMS defined
+ *         property name.
+ *     <LI>Any name beginning with <CODE>'JMS_'</CODE> is a provider-specific
+ *         property name.
+ *     <LI>Any name that does not begin with <CODE>'JMS'</CODE> is an
+ *         application-specific property name.
+ *   </UL>
+ *   <LI>White space is the same as that defined for the Java programming
+ *       language: space, horizontal tab, form feed, and line terminator.
+ *   <LI>Expressions:
+ *   <UL>
+ *     <LI>A selector is a conditional expression; a selector that evaluates
+ *         to <CODE>true</CODE> matches; a selector that evaluates to
+ *         <CODE>false</CODE> or unknown does not match.
+ *     <LI>Arithmetic expressions are composed of themselves, arithmetic
+ *         operations, identifiers (whose value is treated as a numeric
+ *         literal), and numeric literals.
+ *     <LI>Conditional expressions are composed of themselves, comparison
+ *         operations, and logical operations.
+ *   </UL>
+ *   <LI>Standard bracketing <CODE>()</CODE> for ordering expression evaluation
+ *      is supported.
+ *   <LI>Logical operators in precedence order: <CODE>NOT</CODE>,
+ *       <CODE>AND</CODE>, <CODE>OR</CODE>
+ *   <LI>Comparison operators: <CODE>=</CODE>, <CODE>></CODE>, <CODE>>=</CODE>,
+ *       <CODE><</CODE>, <CODE><=</CODE>, <CODE><></CODE> (not equal)
+ *   <UL>
+ *     <LI>Only like type values can be compared. One exception is that it
+ *         is valid to compare exact numeric values and approximate numeric
+ *         values; the type conversion required is defined by the rules of
+ *         numeric promotion in the Java programming language. If the
+ *         comparison of non-like type values is attempted, the value of the
+ *         operation is false. If either of the type values evaluates to
+ *         <CODE>NULL</CODE>, the value of the expression is unknown.
+ *     <LI>String and boolean comparison is restricted to <CODE>=</CODE> and
+ *         <CODE><></CODE>. Two strings are equal
+ *         if and only if they contain the same sequence of characters.
+ *   </UL>
+ *   <LI>Arithmetic operators in precedence order:
+ *   <UL>
+ *     <LI><CODE>+</CODE>, <CODE>-</CODE> (unary)
+ *     <LI><CODE>*</CODE>, <CODE>/</CODE> (multiplication and division)
+ *     <LI><CODE>+</CODE>, <CODE>-</CODE> (addition and subtraction)
+ *     <LI>Arithmetic operations must use numeric promotion in the Java
+ *         programming language.
+ *   </UL>
+ *   <LI><CODE><I>arithmetic-expr1</I> [NOT] BETWEEN <I>arithmetic-expr2</I>
+ *       AND <I>arithmetic-expr3</I></CODE> (comparison operator)
+ *   <UL>
+ *     <LI><CODE>"age&nbsp;BETWEEN&nbsp;15&nbsp;AND&nbsp;19"</CODE> is
+ *         equivalent to
+ *         <CODE>"age&nbsp;>=&nbsp;15&nbsp;AND&nbsp;age&nbsp;<=&nbsp;19"</CODE>
+ *     <LI><CODE>"age&nbsp;NOT&nbsp;BETWEEN&nbsp;15&nbsp;AND&nbsp;19"</CODE>
+ *         is equivalent to
+ *         <CODE>"age&nbsp;<&nbsp;15&nbsp;OR&nbsp;age&nbsp;>&nbsp;19"</CODE>
+ *   </UL>
+ *   <LI><CODE><I>identifier</I> [NOT] IN (<I>string-literal1</I>,
+ *       <I>string-literal2</I>,...)</CODE> (comparison operator where
+ *       <CODE><I>identifier</I></CODE> has a <CODE>String</CODE> or
+ *       <CODE>NULL</CODE> value)
+ *   <UL>
+ *     <LI><CODE>"Country&nbsp;IN&nbsp;('&nbsp;UK',&nbsp;'US',&nbsp;'France')"</CODE>
+ *         is true for
+ *         <CODE>'UK'</CODE> and false for <CODE>'Peru'</CODE>; it is
+ *         equivalent to the expression
+ *         <CODE>"(Country&nbsp;=&nbsp;'&nbsp;UK')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;US')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;France')"</CODE>
+ *     <LI><CODE>"Country&nbsp;NOT&nbsp;IN&nbsp;('&nbsp;UK',&nbsp;'US',&nbsp;'France')"</CODE>
+ *         is false for <CODE>'UK'</CODE> and true for <CODE>'Peru'</CODE>; it
+ *         is equivalent to the expression
+ *         <CODE>"NOT&nbsp;((Country&nbsp;=&nbsp;'&nbsp;UK')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;US')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;France'))"</CODE>
+ *     <LI>If identifier of an <CODE>IN</CODE> or <CODE>NOT IN</CODE>
+ *         operation is <CODE>NULL</CODE>, the value of the operation is
+ *         unknown.
+ *   </UL>
+ *   <LI><CODE><I>identifier</I> [NOT] LIKE <I>pattern-value</I> [ESCAPE
+ *       <I>escape-character</I>]</CODE> (comparison operator, where
+ *       <CODE><I>identifier</I></CODE> has a <CODE>String</CODE> value;
+ *       <CODE><I>pattern-value</I></CODE> is a string literal where
+ *       <CODE>'_'</CODE> stands for any single character; <CODE>'%'</CODE>
+ *       stands for any sequence of characters, including the empty sequence;
+ *       and all other characters stand for themselves. The optional
+ *       <CODE><I>escape-character</I></CODE> is a single-character string
+ *       literal whose character is used to escape the special meaning of the
+ *       <CODE>'_'</CODE> and <CODE>'%'</CODE> in
+ *       <CODE><I>pattern-value</I></CODE>.)
+ *   <UL>
+ *     <LI><CODE>"phone&nbsp;LIKE&nbsp;'12%3'"</CODE> is true for
+ *         <CODE>'123'</CODE> or <CODE>'12993'</CODE> and false for
+ *         <CODE>'1234'</CODE>
+ *     <LI><CODE>"word&nbsp;LIKE&nbsp;'l_se'"</CODE> is true for
+ *         <CODE>'lose'</CODE> and false for <CODE>'loose'</CODE>
+ *     <LI><CODE>"underscored&nbsp;LIKE&nbsp;'\_%'&nbsp;ESCAPE&nbsp;'\'"</CODE>
+ *          is true for <CODE>'_foo'</CODE> and false for <CODE>'bar'</CODE>
+ *     <LI><CODE>"phone&nbsp;NOT&nbsp;LIKE&nbsp;'12%3'"</CODE> is false for
+ *         <CODE>'123'</CODE> or <CODE>'12993'</CODE> and true for
+ *         <CODE>'1234'</CODE>
+ *     <LI>If <CODE><I>identifier</I></CODE> of a <CODE>LIKE</CODE> or
+ *         <CODE>NOT LIKE</CODE> operation is <CODE>NULL</CODE>, the value
+ *         of the operation is unknown.
+ *   </UL>
+ *   <LI><CODE><I>identifier</I> IS NULL</CODE> (comparison operator that tests
+ *       for a null header field value or a missing property value)
+ *   <UL>
+ *     <LI><CODE>"prop_name&nbsp;IS&nbsp;NULL"</CODE>
+ *   </UL>
+ *   <LI><CODE><I>identifier</I> IS NOT NULL</CODE> (comparison operator that
+ *       tests for the existence of a non-null header field value or a property
+ *       value)
+ *   <UL>
+ *     <LI><CODE>"prop_name&nbsp;IS&nbsp;NOT&nbsp;NULL"</CODE>
+ *   </UL>
+ *
+ * <P>JMS providers are required to verify the syntactic correctness of a
+ *    message selector at the time it is presented. A method that provides a
+ *  syntactically incorrect selector must result in a <CODE>JMSException</CODE>.
+ * JMS providers may also optionally provide some semantic checking at the time
+ * the selector is presented. Not all semantic checking can be performed at
+ * the time a message selector is presented, because property types are not known.
+ *
+ * <P>The following message selector selects messages with a message type
+ * of car and color of blue and weight greater than 2500 pounds:
+ *
+ * <PRE>"JMSType&nbsp;=&nbsp;'car'&nbsp;AND&nbsp;color&nbsp;=&nbsp;'blue'&nbsp;AND&nbsp;weight&nbsp;>&nbsp;2500"</PRE>
+ *
+ * <H4>Null Values</H4>
+ *
+ * <P>As noted above, property values may be <CODE>NULL</CODE>. The evaluation
+ * of selector expressions containing <CODE>NULL</CODE> values is defined by
+ * SQL92 <CODE>NULL</CODE> semantics. A brief description of these semantics
+ * is provided here.
+ *
+ * <P>SQL treats a <CODE>NULL</CODE> value as unknown. Comparison or arithmetic
+ * with an unknown value always yields an unknown value.
+ *
+ * <P>The <CODE>IS NULL</CODE> and <CODE>IS NOT NULL</CODE> operators convert
+ * an unknown value into the respective <CODE>TRUE</CODE> and
+ * <CODE>FALSE</CODE> values.
+ *
+ * <P>The boolean operators use three-valued logic as defined by the
+ * following tables:
+ *
+ * <P><B>The definition of the <CODE>AND</CODE> operator</B>
+ *
+ * <PRE>
+ * | AND  |   T   |   F   |   U
+ * +------+-------+-------+-------
+ * |  T   |   T   |   F   |   U
+ * |  F   |   F   |   F   |   F
+ * |  U   |   U   |   F   |   U
+ * +------+-------+-------+-------
+ * </PRE>
+ *
+ * <P><B>The definition of the <CODE>OR</CODE> operator</B>
+ *
+ * <PRE>
+ * | OR   |   T   |   F   |   U
+ * +------+-------+-------+--------
+ * |  T   |   T   |   T   |   T
+ * |  F   |   T   |   F   |   U
+ * |  U   |   T   |   U   |   U
+ * +------+-------+-------+-------
+ * </PRE>
+ *
+ * <P><B>The definition of the <CODE>NOT</CODE> operator</B>
+ *
+ * <PRE>
+ * | NOT
+ * +------+------
+ * |  T   |   F
+ * |  F   |   T
+ * |  U   |   U
+ * +------+-------
+ * </PRE>
+ *
+ * <H4>Special Notes</H4>
+ *
+ * <P>When used in a message selector, the <CODE>JMSDeliveryMode</CODE> header
+ *    field is treated as having the values <CODE>'PERSISTENT'</CODE> and
+ *    <CODE>'NON_PERSISTENT'</CODE>.
+ *
+ * <P>Date and time values should use the standard <CODE>long</CODE>
+ *    millisecond value. When a date or time literal is included in a message
+ *    selector, it should be an integer literal for a millisecond value. The
+ *    standard way to produce millisecond values is to use
+ *    <CODE>java.util.Calendar</CODE>.
+ *
+ * <P>Although SQL supports fixed decimal comparison and arithmetic, JMS
+ *    message selectors do not. This is the reason for restricting exact
+ *    numeric literals to those without a decimal (and the addition of
+ *    numerics with a decimal as an alternate representation for
+ *    approximate numeric values).
+ *
+ * <P>SQL comments are not supported.
+ *
+ * @version     1.1 April 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.MessageConsumer#receive()
+ * @see         javax.jms.MessageConsumer#receive(long)
+ * @see         javax.jms.MessageConsumer#receiveNoWait()
+ * @see         javax.jms.MessageListener#onMessage(Message)
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.StreamMessage
+ * @see         javax.jms.TextMessage
+ */
+
+public interface Message
+{
+
+  /** The message producer's default delivery mode is <CODE>PERSISTENT</CODE>.
+   *
+   *  @see DeliveryMode#PERSISTENT
+   */
+  static final int DEFAULT_DELIVERY_MODE = DeliveryMode.PERSISTENT;
+
+  /** The message producer's default priority is 4. 
+   */
+  static final int DEFAULT_PRIORITY = 4;
+
+  /** The message producer's default time to live is unlimited; the message 
+   *  never expires. 
+   */
+  static final long DEFAULT_TIME_TO_LIVE = 0;
+
+  /** Gets the message ID.
+    *
+    * <P>The <CODE>JMSMessageID</CODE> header field contains a value that 
+    * uniquely identifies each message sent by a provider.
+    *  
+    * <P>When a message is sent, <CODE>JMSMessageID</CODE> can be ignored. 
+    * When the <CODE>send</CODE> or <CODE>publish</CODE> method returns, it 
+    * contains a provider-assigned value.
+    *
+    * <P>A <CODE>JMSMessageID</CODE> is a <CODE>String</CODE> value that 
+    * should function as a 
+    * unique key for identifying messages in a historical repository. 
+    * The exact scope of uniqueness is provider-defined. It should at 
+    * least cover all messages for a specific installation of a 
+    * provider, where an installation is some connected set of message 
+    * routers.
+    *
+    * <P>All <CODE>JMSMessageID</CODE> values must start with the prefix 
+    * <CODE>'ID:'</CODE>. 
+    * Uniqueness of message ID values across different providers is 
+    * not required.
+    *
+    * <P>Since message IDs take some effort to create and increase a
+    * message's size, some JMS providers may be able to optimize message
+    * overhead if they are given a hint that the message ID is not used by
+    * an application. By calling the 
+    * <CODE>MessageProducer.setDisableMessageID</CODE> method, a JMS client 
+    * enables this potential optimization for all messages sent by that 
+    * message producer. If the JMS provider accepts this
+    * hint, these messages must have the message ID set to null; if the 
+    * provider ignores the hint, the message ID must be set to its normal 
+    * unique value.
+    *
+    * @return the message ID
+    *
+    * @exception JMSException if the JMS provider fails to get the message ID 
+    *                         due to some internal error.
+    * @see javax.jms.Message#setJMSMessageID(String)
+    * @see javax.jms.MessageProducer#setDisableMessageID(boolean)
+    */
+
+  String getJMSMessageID() throws JMSException;
+
+  /** Sets the message ID.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method
+    * can be used to change the value for a message that has been received.
+    *
+    * @param id the ID of the message
+    *
+    * @exception JMSException if the JMS provider fails to set the message ID 
+    *                         due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSMessageID()
+    */
+
+  void setJMSMessageID(String id) throws JMSException;
+
+  /** Gets the message timestamp.
+    *  
+    * <P>The <CODE>JMSTimestamp</CODE> header field contains the time a 
+    * message was 
+    * handed off to a provider to be sent. It is not the time the 
+    * message was actually transmitted, because the actual send may occur 
+    * later due to transactions or other client-side queueing of messages.
+    *
+    * <P>When a message is sent, <CODE>JMSTimestamp</CODE> is ignored. When 
+    * the <CODE>send</CODE> or <CODE>publish</CODE>
+    * method returns, it contains a time value somewhere in the interval 
+    * between the call and the return. The value is in the format of a normal 
+    * millis time value in the Java programming language.
+    *
+    * <P>Since timestamps take some effort to create and increase a 
+    * message's size, some JMS providers may be able to optimize message 
+    * overhead if they are given a hint that the timestamp is not used by an 
+    * application. By calling the
+    * <CODE>MessageProducer.setDisableMessageTimestamp</CODE> method, a JMS 
+    * client enables this potential optimization for all messages sent by 
+    * that message producer. If the JMS provider accepts this
+    * hint, these messages must have the timestamp set to zero; if the 
+    * provider ignores the hint, the timestamp must be set to its normal 
+    * value.
+    *
+    * @return the message timestamp
+    *
+    * @exception JMSException if the JMS provider fails to get the timestamp
+    *                         due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSTimestamp(long)
+    * @see javax.jms.MessageProducer#setDisableMessageTimestamp(boolean)
+    */
+
+  long getJMSTimestamp() throws JMSException;
+
+  /** Sets the message timestamp.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method
+    * can be used to change the value for a message that has been received.
+    *
+    * @param timestamp the timestamp for this message
+    *  
+    * @exception JMSException if the JMS provider fails to set the timestamp
+    *                         due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSTimestamp()
+    */
+
+  void setJMSTimestamp(long timestamp) throws JMSException;
+
+  /** Gets the correlation ID as an array of bytes for the message.
+    *  
+    * <P>The use of a <CODE>byte[]</CODE> value for 
+    * <CODE>JMSCorrelationID</CODE> is non-portable.
+    *
+    * @return the correlation ID of a message as an array of bytes
+    *
+    * @exception JMSException if the JMS provider fails to get the correlation
+    *                         ID due to some internal error.
+    *  
+    * @see javax.jms.Message#setJMSCorrelationID(String)
+    * @see javax.jms.Message#getJMSCorrelationID()
+    * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
+    */
+
+  byte[] getJMSCorrelationIDAsBytes() throws JMSException;
+
+  /** Sets the correlation ID as an array of bytes for the message.
+    * 
+    * <P>The array is copied before the method returns, so
+    * future modifications to the array will not alter this message header.
+    *  
+    * <P>If a provider supports the native concept of correlation ID, a 
+    * JMS client may need to assign specific <CODE>JMSCorrelationID</CODE> 
+    * values to match those expected by native messaging clients. 
+    * JMS providers without native correlation ID values are not required to 
+    * support this method and its corresponding get method; their 
+    * implementation may throw a
+    * <CODE>java.lang.UnsupportedOperationException</CODE>. 
+    *
+    * <P>The use of a <CODE>byte[]</CODE> value for 
+    * <CODE>JMSCorrelationID</CODE> is non-portable.
+    *
+    * @param correlationID the correlation ID value as an array of bytes
+    *  
+    * @exception JMSException if the JMS provider fails to set the correlation
+    *                         ID due to some internal error.
+    *  
+    * @see javax.jms.Message#setJMSCorrelationID(String)
+    * @see javax.jms.Message#getJMSCorrelationID()
+    * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
+    */
+
+  void setJMSCorrelationIDAsBytes(byte[] correlationID) throws JMSException;
+
+  /** Sets the correlation ID for the message.
+    *  
+    * <P>A client can use the <CODE>JMSCorrelationID</CODE> header field to 
+    * link one message with another. A typical use is to link a response 
+    * message with its request message.
+    *  
+    * <P><CODE>JMSCorrelationID</CODE> can hold one of the following:
+    *    <UL>
+    *      <LI>A provider-specific message ID
+    *      <LI>An application-specific <CODE>String</CODE>
+    *      <LI>A provider-native <CODE>byte[]</CODE> value
+    *    </UL>
+    *  
+    * <P>Since each message sent by a JMS provider is assigned a message ID
+    * value, it is convenient to link messages via message ID. All message ID
+    * values must start with the <CODE>'ID:'</CODE> prefix.
+    *  
+    * <P>In some cases, an application (made up of several clients) needs to
+    * use an application-specific value for linking messages. For instance,
+    * an application may use <CODE>JMSCorrelationID</CODE> to hold a value 
+    * referencing some external information. Application-specified values 
+    * must not start with the <CODE>'ID:'</CODE> prefix; this is reserved for 
+    * provider-generated message ID values.
+    *  
+    * <P>If a provider supports the native concept of correlation ID, a JMS
+    * client may need to assign specific <CODE>JMSCorrelationID</CODE> values 
+    * to match those expected by clients that do not use the JMS API. A 
+    * <CODE>byte[]</CODE> value is used for this
+    * purpose. JMS providers without native correlation ID values are not
+    * required to support <CODE>byte[]</CODE> values. The use of a 
+    * <CODE>byte[]</CODE> value for <CODE>JMSCorrelationID</CODE> is 
+    * non-portable.
+    *  
+    * @param correlationID the message ID of a message being referred to
+    *  
+    * @exception JMSException if the JMS provider fails to set the correlation
+    *                         ID due to some internal error.
+    *  
+    * @see javax.jms.Message#getJMSCorrelationID()
+    * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
+    * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
+    */
+
+  void setJMSCorrelationID(String correlationID) throws JMSException;
+
+  /** Gets the correlation ID for the message.
+    *  
+    * <P>This method is used to return correlation ID values that are 
+    * either provider-specific message IDs or application-specific 
+    * <CODE>String</CODE> values.
+    *
+    * @return the correlation ID of a message as a <CODE>String</CODE>
+    *
+    * @exception JMSException if the JMS provider fails to get the correlation
+    *                         ID due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSCorrelationID(String)
+    * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
+    * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
+    */
+
+  String getJMSCorrelationID() throws JMSException;
+
+  /** Gets the <CODE>Destination</CODE> object to which a reply to this 
+    * message should be sent.
+    *  
+    * @return <CODE>Destination</CODE> to which to send a response to this 
+    *         message
+    *
+    * @exception JMSException if the JMS provider fails to get the  
+    *                         <CODE>JMSReplyTo</CODE> destination due to some 
+    *                         internal error.
+    *
+    * @see javax.jms.Message#setJMSReplyTo(Destination)
+    */
+
+  Destination getJMSReplyTo() throws JMSException;
+
+  /** Sets the <CODE>Destination</CODE> object to which a reply to this 
+    * message should be sent.
+    *  
+    * <P>The <CODE>JMSReplyTo</CODE> header field contains the destination 
+    * where a reply 
+    * to the current message should be sent. If it is null, no reply is 
+    * expected. The destination may be either a <CODE>Queue</CODE> object or
+    * a <CODE>Topic</CODE> object.
+    *
+    * <P>Messages sent with a null <CODE>JMSReplyTo</CODE> value may be a 
+    * notification of some event, or they may just be some data the sender 
+    * thinks is of interest.
+    *
+    * <P>Messages with a <CODE>JMSReplyTo</CODE> value typically expect a 
+    * response. A response is optional; it is up to the client to decide.  
+    * These messages are called requests. A message sent in response to a 
+    * request is called a reply.
+    *
+    * <P>In some cases a client may wish to match a request it sent earlier 
+    * with a reply it has just received. The client can use the 
+    * <CODE>JMSCorrelationID</CODE> header field for this purpose.
+    *
+    * @param replyTo <CODE>Destination</CODE> to which to send a response to 
+    *                this message
+    *
+    * @exception JMSException if the JMS provider fails to set the  
+    *                         <CODE>JMSReplyTo</CODE> destination due to some 
+    *                         internal error.
+    *
+    * @see javax.jms.Message#getJMSReplyTo()
+    */
+
+  void setJMSReplyTo(Destination replyTo) throws JMSException;
+
+  /** Gets the <CODE>Destination</CODE> object for this message.
+    *  
+    * <P>The <CODE>JMSDestination</CODE> header field contains the 
+    * destination to which the message is being sent.
+    *  
+    * <P>When a message is sent, this field is ignored. After completion
+    * of the <CODE>send</CODE> or <CODE>publish</CODE> method, the field 
+    * holds the destination specified by the method.
+    *  
+    * <P>When a message is received, its <CODE>JMSDestination</CODE> value 
+    * must be equivalent to the value assigned when it was sent.
+    *
+    * @return the destination of this message
+    *  
+    * @exception JMSException if the JMS provider fails to get the destination
+    *                         due to some internal error.
+    *  
+    * @see javax.jms.Message#setJMSDestination(Destination)
+    */
+
+  Destination getJMSDestination() throws JMSException;
+
+  /** Sets the <CODE>Destination</CODE> object for this message.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method 
+    * can be used to change the value for a message that has been received.
+    *
+    * @param destination the destination for this message
+    *  
+    * @exception JMSException if the JMS provider fails to set the destination
+    *                         due to some internal error.
+    *  
+    * @see javax.jms.Message#getJMSDestination()
+    */
+
+  void setJMSDestination(Destination destination) throws JMSException;
+
+  /** Gets the <CODE>DeliveryMode</CODE> value specified for this message.
+    *  
+    * @return the delivery mode for this message
+    *  
+    * @exception JMSException if the JMS provider fails to get the 
+    *                         delivery mode due to some internal error.
+    *  
+    * @see javax.jms.Message#setJMSDeliveryMode(int)
+    * @see javax.jms.DeliveryMode
+    */
+
+  int getJMSDeliveryMode() throws JMSException;
+
+  /** Sets the <CODE>DeliveryMode</CODE> value for this message.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method 
+    * can be used to change the value for a message that has been received.
+    *
+    * @param deliveryMode the delivery mode for this message
+    *  
+    * @exception JMSException if the JMS provider fails to set the 
+    *                         delivery mode due to some internal error.
+    *  
+    * @see javax.jms.Message#getJMSDeliveryMode()
+    * @see javax.jms.DeliveryMode
+    */
+
+  void setJMSDeliveryMode(int deliveryMode) throws JMSException;
+
+  /** Gets an indication of whether this message is being redelivered.
+    *
+    * <P>If a client receives a message with the <CODE>JMSRedelivered</CODE> 
+    * field set,
+    * it is likely, but not guaranteed, that this message was delivered
+    * earlier but that its receipt was not acknowledged
+    * at that time.
+    *
+    * @return true if this message is being redelivered
+    *  
+    * @exception JMSException if the JMS provider fails to get the redelivered
+    *                         state due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSRedelivered(boolean)
+    */
+
+  boolean getJMSRedelivered() throws JMSException;
+
+  /** Specifies whether this message is being redelivered.
+    *  
+    * <P>This field is set at the time the message is delivered. This
+    * method can be used to change the value for a message that has
+    * been received.
+    *
+    * @param redelivered an indication of whether this message is being
+    * redelivered
+    *  
+    * @exception JMSException if the JMS provider fails to set the redelivered
+    *                         state due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSRedelivered()
+    */
+
+  void setJMSRedelivered(boolean redelivered) throws JMSException;
+
+  /** Gets the message type identifier supplied by the client when the
+    * message was sent.
+    *
+    * @return the message type
+    *  
+    * @exception JMSException if the JMS provider fails to get the message 
+    *                         type due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSType(String)
+    */
+
+  String getJMSType() throws JMSException;
+
+  /** Sets the message type.
+    *
+    * <P>Some JMS providers use a message repository that contains the 
+    * definitions of messages sent by applications. The <CODE>JMSType</CODE> 
+    * header field may reference a message's definition in the provider's
+    * repository.
+    *
+    * <P>The JMS API does not define a standard message definition repository,
+    * nor does it define a naming policy for the definitions it contains. 
+    *
+    * <P>Some messaging systems require that a message type definition for 
+    * each application message be created and that each message specify its 
+    * type. In order to work with such JMS providers, JMS clients should 
+    * assign a value to <CODE>JMSType</CODE>, whether the application makes 
+    * use of it or not. This ensures that the field is properly set for those 
+    * providers that require it.
+    *
+    * <P>To ensure portability, JMS clients should use symbolic values for 
+    * <CODE>JMSType</CODE> that can be configured at installation time to the 
+    * values defined in the current provider's message repository. If string 
+    * literals are used, they may not be valid type names for some JMS 
+    * providers.
+    *
+    * @param type the message type
+    *  
+    * @exception JMSException if the JMS provider fails to set the message 
+    *                         type due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSType()
+    */
+
+  void setJMSType(String type) throws JMSException;
+
+  /** Gets the message's expiration value.
+    *  
+    * <P>When a message is sent, the <CODE>JMSExpiration</CODE> header field 
+    * is left unassigned. After completion of the <CODE>send</CODE> or 
+    * <CODE>publish</CODE> method, it holds the expiration time of the
+    * message. This is the sum of the time-to-live value specified by the
+    * client and the GMT at the time of the <CODE>send</CODE> or 
+    * <CODE>publish</CODE>.
+    *
+    * <P>If the time-to-live is specified as zero, <CODE>JMSExpiration</CODE> 
+    * is set to zero to indicate that the message does not expire.
+    *
+    * <P>When a message's expiration time is reached, a provider should
+    * discard it. The JMS API does not define any form of notification of 
+    * message expiration.
+    *
+    * <P>Clients should not receive messages that have expired; however,
+    * the JMS API does not guarantee that this will not happen.
+    *
+    * @return the time the message expires, which is the sum of the
+    * time-to-live value specified by the client and the GMT at the
+    * time of the send
+    *  
+    * @exception JMSException if the JMS provider fails to get the message 
+    *                         expiration due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSExpiration(long)
+    */
+
+  long getJMSExpiration() throws JMSException;
+
+  /** Sets the message's expiration value.
+    *
+    * <P>JMS providers set this field when a message is sent. This method 
+    * can be used to change the value for a message that has been received.
+    *  
+    * @param expiration the message's expiration time
+    *  
+    * @exception JMSException if the JMS provider fails to set the message 
+    *                         expiration due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSExpiration() 
+    */
+
+  void setJMSExpiration(long expiration) throws JMSException;
+
+  /** Gets the message priority level.
+    *  
+    * <P>The JMS API defines ten levels of priority value, with 0 as the 
+    * lowest
+    * priority and 9 as the highest. In addition, clients should consider
+    * priorities 0-4 as gradations of normal priority and priorities 5-9
+    * as gradations of expedited priority.
+    *  
+    * <P>The JMS API does not require that a provider strictly implement 
+    * priority 
+    * ordering of messages; however, it should do its best to deliver 
+    * expedited messages ahead of normal messages.
+    *  
+    * @return the default message priority
+    *  
+    * @exception JMSException if the JMS provider fails to get the message 
+    *                         priority due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSPriority(int) 
+    */
+
+  int getJMSPriority() throws JMSException;
+
+  /** Sets the priority level for this message.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method 
+    * can be used to change the value for a message that has been received.
+    *
+    * @param priority the priority of this message
+    *  
+    * @exception JMSException if the JMS provider fails to set the message 
+    *                         priority due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSPriority() 
+    */
+
+  void setJMSPriority(int priority) throws JMSException;
+
+  /** Clears a message's properties.
+    *
+    * <P>The message's header fields and body are not cleared.
+    *
+    * @exception JMSException if the JMS provider fails to clear the message 
+    *                         properties due to some internal error.
+    */
+
+  void clearProperties() throws JMSException;
+
+  /** Indicates whether a property value exists.
+    *
+    * @param name the name of the property to test
+    *
+    * @return true if the property exists
+    *  
+    * @exception JMSException if the JMS provider fails to determine if the 
+    *                         property exists due to some internal error.
+    */
+
+  boolean propertyExists(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>boolean</CODE> property with the  
+    * specified name.
+    *  
+    * @param name the name of the <CODE>boolean</CODE> property
+    *  
+    * @return the <CODE>boolean</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid. 
+    */
+
+  boolean getBooleanProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>byte</CODE> property with the specified 
+    * name.
+    *  
+    * @param name the name of the <CODE>byte</CODE> property
+    *  
+    * @return the <CODE>byte</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid. 
+    */
+
+  byte getByteProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>short</CODE> property with the specified 
+    * name.
+    *
+    * @param name the name of the <CODE>short</CODE> property
+    *
+    * @return the <CODE>short</CODE> property value for the specified name
+    *
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  short getShortProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>int</CODE> property with the specified 
+    * name.
+    *  
+    * @param name the name of the <CODE>int</CODE> property
+    *  
+    * @return the <CODE>int</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  int getIntProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>long</CODE> property with the specified 
+    * name.
+    *  
+    * @param name the name of the <CODE>long</CODE> property
+    *  
+    * @return the <CODE>long</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  long getLongProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>float</CODE> property with the specified 
+    * name.
+    *  
+    * @param name the name of the <CODE>float</CODE> property
+    *  
+    * @return the <CODE>float</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  float getFloatProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>double</CODE> property with the specified
+    * name.
+    *  
+    * @param name the name of the <CODE>double</CODE> property
+    *  
+    * @return the <CODE>double</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  double getDoubleProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>String</CODE> property with the specified
+    * name.
+    *  
+    * @param name the name of the <CODE>String</CODE> property
+    *  
+    * @return the <CODE>String</CODE> property value for the specified name;
+    * if there is no property by this name, a null value is returned
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  String getStringProperty(String name) throws JMSException;
+
+  /** Returns the value of the Java object property with the specified name.
+    *  
+    * <P>This method can be used to return, in objectified format,
+    * an object that has been stored as a property in the message with the 
+    * equivalent <CODE>setObjectProperty</CODE> method call, or its equivalent
+    * primitive <CODE>set<I>type</I>Property</CODE> method.
+    *  
+    * @param name the name of the Java object property
+    *  
+    * @return the Java object property value with the specified name, in 
+    * objectified format (for example, if the property was set as an 
+    * <CODE>int</CODE>, an <CODE>Integer</CODE> is 
+    * returned); if there is no property by this name, a null value 
+    * is returned
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    */
+
+  Object getObjectProperty(String name) throws JMSException;
+
+  /** Returns an <CODE>Enumeration</CODE> of all the property names.
+    *
+    * <P>Note that JMS standard header fields are not considered
+    * properties and are not returned in this enumeration.
+    *  
+    * @return an enumeration of all the names of property values
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                          names due to some internal error.
+    */
+
+  Enumeration getPropertyNames() throws JMSException;
+
+  /** Sets a <CODE>boolean</CODE> property value with the specified name into 
+    * the message.
+    *
+    * @param name the name of the <CODE>boolean</CODE> property
+    * @param value the <CODE>boolean</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setBooleanProperty(String name, boolean value) throws JMSException;
+
+  /** Sets a <CODE>byte</CODE> property value with the specified name into 
+    * the message.
+    *  
+    * @param name the name of the <CODE>byte</CODE> property
+    * @param value the <CODE>byte</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setByteProperty(String name, byte value) throws JMSException;
+
+  /** Sets a <CODE>short</CODE> property value with the specified name into
+    * the message.
+    *  
+    * @param name the name of the <CODE>short</CODE> property
+    * @param value the <CODE>short</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setShortProperty(String name, short value) throws JMSException;
+
+  /** Sets an <CODE>int</CODE> property value with the specified name into
+    * the message.
+    *  
+    * @param name the name of the <CODE>int</CODE> property
+    * @param value the <CODE>int</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setIntProperty(String name, int value) throws JMSException;
+
+  /** Sets a <CODE>long</CODE> property value with the specified name into 
+    * the message.
+    *  
+    * @param name the name of the <CODE>long</CODE> property
+    * @param value the <CODE>long</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setLongProperty(String name, long value) throws JMSException;
+
+  /** Sets a <CODE>float</CODE> property value with the specified name into 
+    * the message.
+    *  
+    * @param name the name of the <CODE>float</CODE> property
+    * @param value the <CODE>float</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setFloatProperty(String name, float value) throws JMSException;
+
+  /** Sets a <CODE>double</CODE> property value with the specified name into 
+    * the message.
+    *  
+    * @param name the name of the <CODE>double</CODE> property
+    * @param value the <CODE>double</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setDoubleProperty(String name, double value) throws JMSException;
+
+  /** Sets a <CODE>String</CODE> property value with the specified name into 
+    * the message.
+    *
+    * @param name the name of the <CODE>String</CODE> property
+    * @param value the <CODE>String</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setStringProperty(String name, String value) throws JMSException;
+
+  /** Sets a Java object property value with the specified name into the 
+    * message.
+    *  
+    * <P>Note that this method works only for the objectified primitive
+    * object types (<CODE>Integer</CODE>, <CODE>Double</CODE>, 
+    * <CODE>Long</CODE> ...) and <CODE>String</CODE> objects.
+    *  
+    * @param name the name of the Java object property
+    * @param value the Java object property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageFormatException if the object is invalid
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setObjectProperty(String name, Object value) throws JMSException;
+
+  /** Acknowledges all consumed messages of the session of this consumed 
+    * message.
+    *  
+    * <P>All consumed JMS messages support the <CODE>acknowledge</CODE> 
+    * method for use when a client has specified that its JMS session's 
+    * consumed messages are to be explicitly acknowledged.  By invoking 
+    * <CODE>acknowledge</CODE> on a consumed message, a client acknowledges 
+    * all messages consumed by the session that the message was delivered to.
+    * 
+    * <P>Calls to <CODE>acknowledge</CODE> are ignored for both transacted 
+    * sessions and sessions specified to use implicit acknowledgement modes.
+    *
+    * <P>A client may individually acknowledge each message as it is consumed,
+    * or it may choose to acknowledge messages as an application-defined group 
+    * (which is done by calling acknowledge on the last received message of the group,
+    *  thereby acknowledging all messages consumed by the session.)
+    *
+    * <P>Messages that have been received but not acknowledged may be 
+    * redelivered.
+    *
+    * @exception JMSException if the JMS provider fails to acknowledge the
+    *                         messages due to some internal error.
+    * @exception IllegalStateException if this method is called on a closed
+    *                         session.
+    *
+    * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
+    */
+
+  void acknowledge() throws JMSException;
+
+  /** Clears out the message body. Clearing a message's body does not clear 
+    * its header values or property entries.
+    *
+    * <P>If this message body was read-only, calling this method leaves
+    * the message body in the same state as an empty body in a newly
+    * created message.
+    *
+    * @exception JMSException if the JMS provider fails to clear the message
+    *                         body due to some internal error.
+    */
+
+  void clearBody() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java
index f6e7664b6e..9dec6829b4 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java
@@ -1,191 +1,179 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A client uses a <CODE>MessageConsumer</CODE> object to receive messages 
-  * from a destination.  A <CODE>MessageConsumer</CODE> object is created by 
-  * passing a <CODE>Destination</CODE> object to a message-consumer creation
-  * method supplied by a session.
-  *
-  * <P><CODE>MessageConsumer</CODE> is the parent interface for all message 
-  * consumers.
-  *
-  * <P>A message consumer can be created with a message selector. A message
-  * selector allows 
-  * the client to restrict the messages delivered to the message consumer to 
-  * those that match the selector.
-  *
-  * <P>A client may either synchronously receive a message consumer's messages 
-  * or have the consumer asynchronously deliver them as they arrive.
-  *
-  * <P>For synchronous receipt, a client can request the next message from a 
-  * message consumer using one of its <CODE>receive</CODE> methods. There are 
-  * several variations of <CODE>receive</CODE> that allow a 
-  * client to poll or wait for the next message.
-  *
-  * <P>For asynchronous delivery, a client can register a 
-  * <CODE>MessageListener</CODE> object with a message consumer. 
-  * As messages arrive at the message consumer, it delivers them by calling the 
-  * <CODE>MessageListener</CODE>'s <CODE>onMessage</CODE> method.
-  *
-  * <P>It is a client programming error for a <CODE>MessageListener</CODE> to 
-  * throw an exception.
-  *
-  * @version     1.0 - 13 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.QueueReceiver
-  * @see         javax.jms.TopicSubscriber
-  * @see         javax.jms.Session
-  */
-
-public interface MessageConsumer {
-
-    /** Gets this message consumer's message selector expression.
-      *  
-      * @return this message consumer's message selector, or null if no
-      *         message selector exists for the message consumer (that is, if 
-      *         the message selector was not set or was set to null or the 
-      *         empty string)
-      *  
-      * @exception JMSException if the JMS provider fails to get the message
-      *                         selector due to some internal error.
-      */ 
-
-    String
-    getMessageSelector() throws JMSException;
-
-
-    /** Gets the message consumer's <CODE>MessageListener</CODE>.
-      *  
-      * @return the listener for the message consumer, or null if no listener
-      * is set
-      *  
-      * @exception JMSException if the JMS provider fails to get the message
-      *                         listener due to some internal error.
-      * @see javax.jms.MessageConsumer#setMessageListener
-      */ 
-
-    MessageListener
-    getMessageListener() throws JMSException;
-
-
-    /** Sets the message consumer's <CODE>MessageListener</CODE>.
-      * 
-      * <P>Setting the message listener to null is the equivalent of 
-      * unsetting the message listener for the message consumer.
-      *
-      * <P>The effect of calling <CODE>MessageConsumer.setMessageListener</CODE>
-      * while messages are being consumed by an existing listener
-      * or the consumer is being used to consume messages synchronously
-      * is undefined.
-      *  
-      * @param listener the listener to which the messages are to be 
-      *                 delivered
-      *  
-      * @exception JMSException if the JMS provider fails to set the message
-      *                         listener due to some internal error.
-      * @see javax.jms.MessageConsumer#getMessageListener
-      */ 
-
-    void
-    setMessageListener(MessageListener listener) throws JMSException;
-
-
-    /** Receives the next message produced for this message consumer.
-      *  
-      * <P>This call blocks indefinitely until a message is produced
-      * or until this message consumer is closed.
-      *
-      * <P>If this <CODE>receive</CODE> is done within a transaction, the 
-      * consumer retains the message until the transaction commits.
-      *  
-      * @return the next message produced for this message consumer, or 
-      * null if this message consumer is concurrently closed
-      *  
-      * @exception JMSException if the JMS provider fails to receive the next
-      *                         message due to some internal error.
-      * 
-      */ 
- 
-    Message
-    receive() throws JMSException;
-
-
-    /** Receives the next message that arrives within the specified
-      * timeout interval.
-      *  
-      * <P>This call blocks until a message arrives, the
-      * timeout expires, or this message consumer is closed.
-      * A <CODE>timeout</CODE> of zero never expires, and the call blocks 
-      * indefinitely.
-      *
-      * @param timeout the timeout value (in milliseconds)
-      *
-      * @return the next message produced for this message consumer, or 
-      * null if the timeout expires or this message consumer is concurrently 
-      * closed
-      *
-      * @exception JMSException if the JMS provider fails to receive the next
-      *                         message due to some internal error.
-      */ 
-
-    Message
-    receive(long timeout) throws JMSException;
-
-
-    /** Receives the next message if one is immediately available.
-      *
-      * @return the next message produced for this message consumer, or 
-      * null if one is not available
-      *  
-      * @exception JMSException if the JMS provider fails to receive the next
-      *                         message due to some internal error.
-      */ 
-
-    Message
-    receiveNoWait() throws JMSException;
-
-
-    /** Closes the message consumer.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a
-      * <CODE>MessageConsumer</CODE> outside the Java virtual machine, clients 
-      * should close them when they
-      * are not needed. Relying on garbage collection to eventually reclaim
-      * these resources may not be timely enough.
-      *
-      * <P>This call blocks until a <CODE>receive</CODE> or message listener in 
-      * progress has completed. A blocked message consumer <CODE>receive</CODE> 
-      * call 
-      * returns null when this message consumer is closed.
-      *  
-      * @exception JMSException if the JMS provider fails to close the consumer
-      *                         due to some internal error.
-      */ 
-
-    void
-    close() throws JMSException;
+/** A client uses a <CODE>MessageConsumer</CODE> object to receive messages
+ * from a destination.  A <CODE>MessageConsumer</CODE> object is created by
+ * passing a <CODE>Destination</CODE> object to a message-consumer creation
+ * method supplied by a session.
+ *
+ * <P><CODE>MessageConsumer</CODE> is the parent interface for all message
+ * consumers.
+ *
+ * <P>A message consumer can be created with a message selector. A message
+ * selector allows
+ * the client to restrict the messages delivered to the message consumer to
+ * those that match the selector.
+ *
+ * <P>A client may either synchronously receive a message consumer's messages
+ * or have the consumer asynchronously deliver them as they arrive.
+ *
+ * <P>For synchronous receipt, a client can request the next message from a
+ * message consumer using one of its <CODE>receive</CODE> methods. There are
+ * several variations of <CODE>receive</CODE> that allow a
+ * client to poll or wait for the next message.
+ *
+ * <P>For asynchronous delivery, a client can register a
+ * <CODE>MessageListener</CODE> object with a message consumer.
+ * As messages arrive at the message consumer, it delivers them by calling the
+ * <CODE>MessageListener</CODE>'s <CODE>onMessage</CODE> method.
+ *
+ * <P>It is a client programming error for a <CODE>MessageListener</CODE> to
+ * throw an exception.
+ *
+ * @version     1.0 - 13 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.QueueReceiver
+ * @see         javax.jms.TopicSubscriber
+ * @see         javax.jms.Session
+ */
+
+public interface MessageConsumer
+{
+
+  /** Gets this message consumer's message selector expression.
+    *  
+    * @return this message consumer's message selector, or null if no
+    *         message selector exists for the message consumer (that is, if 
+    *         the message selector was not set or was set to null or the 
+    *         empty string)
+    *  
+    * @exception JMSException if the JMS provider fails to get the message
+    *                         selector due to some internal error.
+    */
+
+  String getMessageSelector() throws JMSException;
+
+  /** Gets the message consumer's <CODE>MessageListener</CODE>.
+    *  
+    * @return the listener for the message consumer, or null if no listener
+    * is set
+    *  
+    * @exception JMSException if the JMS provider fails to get the message
+    *                         listener due to some internal error.
+    * @see javax.jms.MessageConsumer#setMessageListener
+    */
+
+  MessageListener getMessageListener() throws JMSException;
+
+  /** Sets the message consumer's <CODE>MessageListener</CODE>.
+    * 
+    * <P>Setting the message listener to null is the equivalent of 
+    * unsetting the message listener for the message consumer.
+    *
+    * <P>The effect of calling <CODE>MessageConsumer.setMessageListener</CODE>
+    * while messages are being consumed by an existing listener
+    * or the consumer is being used to consume messages synchronously
+    * is undefined.
+    *  
+    * @param listener the listener to which the messages are to be 
+    *                 delivered
+    *  
+    * @exception JMSException if the JMS provider fails to set the message
+    *                         listener due to some internal error.
+    * @see javax.jms.MessageConsumer#getMessageListener
+    */
+
+  void setMessageListener(MessageListener listener) throws JMSException;
+
+  /** Receives the next message produced for this message consumer.
+    *  
+    * <P>This call blocks indefinitely until a message is produced
+    * or until this message consumer is closed.
+    *
+    * <P>If this <CODE>receive</CODE> is done within a transaction, the 
+    * consumer retains the message until the transaction commits.
+    *  
+    * @return the next message produced for this message consumer, or 
+    * null if this message consumer is concurrently closed
+    *  
+    * @exception JMSException if the JMS provider fails to receive the next
+    *                         message due to some internal error.
+    * 
+    */
+
+  Message receive() throws JMSException;
+
+  /** Receives the next message that arrives within the specified
+    * timeout interval.
+    *  
+    * <P>This call blocks until a message arrives, the
+    * timeout expires, or this message consumer is closed.
+    * A <CODE>timeout</CODE> of zero never expires, and the call blocks 
+    * indefinitely.
+    *
+    * @param timeout the timeout value (in milliseconds)
+    *
+    * @return the next message produced for this message consumer, or 
+    * null if the timeout expires or this message consumer is concurrently 
+    * closed
+    *
+    * @exception JMSException if the JMS provider fails to receive the next
+    *                         message due to some internal error.
+    */
+
+  Message receive(long timeout) throws JMSException;
+
+  /** Receives the next message if one is immediately available.
+    *
+    * @return the next message produced for this message consumer, or 
+    * null if one is not available
+    *  
+    * @exception JMSException if the JMS provider fails to receive the next
+    *                         message due to some internal error.
+    */
+
+  Message receiveNoWait() throws JMSException;
+
+  /** Closes the message consumer.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a
+    * <CODE>MessageConsumer</CODE> outside the Java virtual machine, clients 
+    * should close them when they
+    * are not needed. Relying on garbage collection to eventually reclaim
+    * these resources may not be timely enough.
+    *
+    * <P>This call blocks until a <CODE>receive</CODE> or message listener in 
+    * progress has completed. A blocked message consumer <CODE>receive</CODE> 
+    * call 
+    * returns null when this message consumer is closed.
+    *  
+    * @exception JMSException if the JMS provider fails to close the consumer
+    *                         due to some internal error.
+    */
+
+  void close() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageEOFException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageEOFException.java
index 1006ebd816..6f078d7f50 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageEOFException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageEOFException.java
@@ -1,60 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when an unexpected 
- *     end of stream has been reached when a <CODE>StreamMessage</CODE> or 
+ * <P> This exception must be thrown when an unexpected
+ *     end of stream has been reached when a <CODE>StreamMessage</CODE> or
  *     <CODE>BytesMessage</CODE> is being read.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class MessageEOFException extends JMSException {
+public class MessageEOFException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>MessageEOFException</CODE> with the specified 
+  /** Constructs a <CODE>MessageEOFException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  MessageEOFException(String reason, String errorCode) {
+  public MessageEOFException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>MessageEOFException</CODE> with the specified 
+  /** Constructs a <CODE>MessageEOFException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  MessageEOFException(String reason) {
+  public MessageEOFException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageFormatException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageFormatException.java
index 50b685cf03..29ea4275e7 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageFormatException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageFormatException.java
@@ -1,68 +1,70 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a JMS client 
- *     attempts to use a data type not supported by a message or attempts to 
- *     read data in a message as the wrong type. It must also be thrown when 
- *     equivalent type errors are made with message property values. For 
- *     example, this exception must be thrown if 
- *     <CODE>StreamMessage.writeObject</CODE> is given an unsupported class or 
- *     if <CODE>StreamMessage.readShort</CODE> is used to read a 
- *     <CODE>boolean</CODE> value. Note that the special case of a failure 
- *     caused by an attempt to read improperly formatted <CODE>String</CODE> 
- *     data as numeric values must throw the 
+ * <P> This exception must be thrown when a JMS client
+ *     attempts to use a data type not supported by a message or attempts to
+ *     read data in a message as the wrong type. It must also be thrown when
+ *     equivalent type errors are made with message property values. For
+ *     example, this exception must be thrown if
+ *     <CODE>StreamMessage.writeObject</CODE> is given an unsupported class or
+ *     if <CODE>StreamMessage.readShort</CODE> is used to read a
+ *     <CODE>boolean</CODE> value. Note that the special case of a failure
+ *     caused by an attempt to read improperly formatted <CODE>String</CODE>
+ *     data as numeric values must throw the
  *     <CODE>java.lang.NumberFormatException</CODE>.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class MessageFormatException extends JMSException {
+public class MessageFormatException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>MessageFormatException</CODE> with the specified 
+  /** Constructs a <CODE>MessageFormatException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  MessageFormatException(String reason, String errorCode) {
+  public MessageFormatException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>MessageFormatException</CODE> with the specified 
+  /** Constructs a <CODE>MessageFormatException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  MessageFormatException(String reason) {
+  public MessageFormatException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageListener.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageListener.java
index a35fa42b4f..45de33ddb2 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageListener.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageListener.java
@@ -1,51 +1,49 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
+/** A <CODE>MessageListener</CODE> object is used to receive asynchronously
+ * delivered messages.
+ *
+ * <P>Each session must insure that it passes messages serially to the
+ * listener. This means that a listener assigned to one or more consumers
+ * of the same session can assume that the <CODE>onMessage</CODE> method
+ * is not called with the next message until the session has completed the
+ * last call.
+ *
+ * @version     1.0 - 13 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ */
 
-/** A <CODE>MessageListener</CODE> object is used to receive asynchronously 
-  * delivered messages.
-  *
-  * <P>Each session must insure that it passes messages serially to the
-  * listener. This means that a listener assigned to one or more consumers
-  * of the same session can assume that the <CODE>onMessage</CODE> method 
-  * is not called with the next message until the session has completed the 
-  * last call.
-  *
-  * @version     1.0 - 13 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  */
-
-public interface MessageListener {
+public interface MessageListener
+{
 
-    /** Passes a message to the listener.
-      *
-      * @param message the message passed to the listener
-      */
+  /** Passes a message to the listener.
+    *
+    * @param message the message passed to the listener
+    */
 
-    void 
-    onMessage(Message message);
+  void onMessage(Message message);
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotReadableException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotReadableException.java
index 95c90b5352..f59631aea3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotReadableException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotReadableException.java
@@ -1,59 +1,61 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a JMS client attempts to read a 
+ * <P> This exception must be thrown when a JMS client attempts to read a
  *     write-only message.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class MessageNotReadableException extends JMSException {
+public class MessageNotReadableException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>MessageNotReadableException</CODE> with the specified 
+  /** Constructs a <CODE>MessageNotReadableException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  MessageNotReadableException(String reason, String errorCode) {
+  public MessageNotReadableException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>MessageNotReadableException</CODE> with the specified 
+  /** Constructs a <CODE>MessageNotReadableException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  MessageNotReadableException(String reason) {
+  public MessageNotReadableException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotWriteableException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotWriteableException.java
index b8852c9905..f9fbac67c2 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotWriteableException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotWriteableException.java
@@ -1,59 +1,61 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a JMS client attempts to write to a 
+ * <P> This exception must be thrown when a JMS client attempts to write to a
  *     read-only message.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class MessageNotWriteableException extends JMSException {
+public class MessageNotWriteableException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>MessageNotWriteableException</CODE> with the specified 
+  /** Constructs a <CODE>MessageNotWriteableException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  MessageNotWriteableException(String reason, String errorCode) {
+  public MessageNotWriteableException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>MessageNotWriteableException</CODE> with the specified 
+  /** Constructs a <CODE>MessageNotWriteableException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  MessageNotWriteableException(String reason) {
+  public MessageNotWriteableException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
index a9658bb771..0e1f68dcd8 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
@@ -1,389 +1,353 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A client uses a <CODE>MessageProducer</CODE> object to send messages to a 
-  * destination. A <CODE>MessageProducer</CODE> object is created by passing a 
-  * <CODE>Destination</CODE> object to a message-producer creation method 
-  * supplied by a session.
-  *
-  * <P><CODE>MessageProducer</CODE> is the parent interface for all message 
-  * producers.
-  *
-  * <P>A client also has the option of creating a message producer without 
-  * supplying a destination. In this case, a destination must be provided with 
-  * every send operation. A typical use for this kind of message producer is
-  * to send replies to requests using the request's <CODE>JMSReplyTo</CODE> 
-  * destination.
-  *
-  * <P>A client can specify a default delivery mode, priority, and time to live 
-  * for messages sent by a message producer. It can also specify the delivery 
-  * mode, priority, and time to live for an individual message.
-  *
-  * <P>A client can specify a time-to-live value in milliseconds for each
-  * message it sends. This value defines a message expiration time that
-  * is the sum of the message's time-to-live and the GMT when it is sent (for
-  * transacted sends, this is the time the client sends the message, not
-  * the time the transaction is committed).
-  *
-  * <P>A JMS provider should do its best to expire messages accurately;
-  * however, the JMS API does not define the accuracy provided.
+/** A client uses a <CODE>MessageProducer</CODE> object to send messages to a
+ * destination. A <CODE>MessageProducer</CODE> object is created by passing a
+ * <CODE>Destination</CODE> object to a message-producer creation method
+ * supplied by a session.
+ *
+ * <P><CODE>MessageProducer</CODE> is the parent interface for all message
+ * producers.
+ *
+ * <P>A client also has the option of creating a message producer without
+ * supplying a destination. In this case, a destination must be provided with
+ * every send operation. A typical use for this kind of message producer is
+ * to send replies to requests using the request's <CODE>JMSReplyTo</CODE>
+ * destination.
+ *
+ * <P>A client can specify a default delivery mode, priority, and time to live
+ * for messages sent by a message producer. It can also specify the delivery
+ * mode, priority, and time to live for an individual message.
+ *
+ * <P>A client can specify a time-to-live value in milliseconds for each
+ * message it sends. This value defines a message expiration time that
+ * is the sum of the message's time-to-live and the GMT when it is sent (for
+ * transacted sends, this is the time the client sends the message, not
+ * the time the transaction is committed).
+ *
+ * <P>A JMS provider should do its best to expire messages accurately;
+ * however, the JMS API does not define the accuracy provided.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.TopicPublisher
+ * @see         javax.jms.QueueSender
+ * @see         javax.jms.Session#createProducer
+ */
+
+public interface MessageProducer
+{
+
+  /** Sets whether message IDs are disabled.
+    *  
+    * <P>Since message IDs take some effort to create and increase a
+    * message's size, some JMS providers may be able to optimize message
+    * overhead if they are given a hint that the message ID is not used by
+    * an application. By calling the <CODE>setDisableMessageID</CODE>  
+    * method on this message producer, a JMS client enables this potential 
+    * optimization for all messages sent by this message producer. If the JMS 
+    * provider accepts this hint, 
+    * these messages must have the message ID set to null; if the provider 
+    * ignores the hint, the message ID must be set to its normal unique value.
+    *
+    * <P>Message IDs are enabled by default.
+    *
+    * @param value indicates if message IDs are disabled
+    *  
+    * @exception JMSException if the JMS provider fails to set message ID to
+    *                         disabled due to some internal error.
+    */
+
+  void setDisableMessageID(boolean value) throws JMSException;
+
+  /** Gets an indication of whether message IDs are disabled.
+    *  
+    * @return an indication of whether message IDs are disabled
+    *  
+    * @exception JMSException if the JMS provider fails to determine if 
+    *                         message IDs are disabled due to some internal 
+    *                         error.
+    */
+
+  boolean getDisableMessageID() throws JMSException;
+
+  /** Sets whether message timestamps are disabled.
+    *  
+    * <P>Since timestamps take some effort to create and increase a 
+    * message's size, some JMS providers may be able to optimize message 
+    * overhead if they are given a hint that the timestamp is not used by an 
+    * application. By calling the <CODE>setDisableMessageTimestamp</CODE> 
+    * method on this message producer, a JMS client enables this potential 
+    * optimization for all messages sent by this message producer.  If the 
+    * JMS provider accepts this hint, 
+    * these messages must have the timestamp set to zero; if the provider 
+    * ignores the hint, the timestamp must be set to its normal value.
+    *  
+    * <P>Message timestamps are enabled by default.
+    *
+    * @param value indicates if message timestamps are disabled
+    *  
+    * @exception JMSException if the JMS provider fails to set timestamps to
+    *                         disabled due to some internal error.
+    */
+
+  void setDisableMessageTimestamp(boolean value) throws JMSException;
+
+  /** Gets an indication of whether message timestamps are disabled.
+    *  
+    * @return an indication of whether message timestamps are disabled
+    *  
+    * @exception JMSException if the JMS provider fails to determine if 
+    *                         timestamps are disabled due to some internal 
+    *                         error.
+    */
+
+  boolean getDisableMessageTimestamp() throws JMSException;
+
+  /** Sets the producer's default delivery mode.
+    *  
+    * <P>Delivery mode is set to <CODE>PERSISTENT</CODE> by default.
+    *
+    * @param deliveryMode the message delivery mode for this message
+    * producer; legal values are <code>DeliveryMode.NON_PERSISTENT</code>
+    * and <code>DeliveryMode.PERSISTENT</code>
+    *  
+    * @exception JMSException if the JMS provider fails to set the delivery 
+    *                         mode due to some internal error.          
+    *
+    * @see javax.jms.MessageProducer#getDeliveryMode
+    * @see javax.jms.DeliveryMode#NON_PERSISTENT
+    * @see javax.jms.DeliveryMode#PERSISTENT
+    * @see javax.jms.Message#DEFAULT_DELIVERY_MODE
+    */
+
+  void setDeliveryMode(int deliveryMode) throws JMSException;
+
+  /** Gets the producer's default delivery mode.
+    *  
+    * @return the message delivery mode for this message producer
+    *  
+    * @exception JMSException if the JMS provider fails to get the delivery 
+    *                         mode due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#setDeliveryMode
+    */
+
+  int getDeliveryMode() throws JMSException;
+
+  /** Sets the producer's default priority.
+    *  
+    * <P>The JMS API defines ten levels of priority value, with 0 as the 
+    * lowest priority and 9 as the highest. Clients should consider priorities
+    * 0-4 as gradations of normal priority and priorities 5-9 as gradations 
+    * of expedited priority. Priority is set to 4 by default.
+    *
+    * @param defaultPriority the message priority for this message producer;
+    *                        must be a value between 0 and 9
+    * 
+    *  
+    * @exception JMSException if the JMS provider fails to set the priority
+    *                         due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#getPriority
+    * @see javax.jms.Message#DEFAULT_PRIORITY
+    */
+
+  void setPriority(int defaultPriority) throws JMSException;
+
+  /** Gets the producer's default priority.
+    *  
+    * @return the message priority for this message producer
+    *  
+    * @exception JMSException if the JMS provider fails to get the priority
+    *                         due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#setPriority
+    */
+
+  int getPriority() throws JMSException;
+
+  /** Sets the default length of time in milliseconds from its dispatch time
+    * that a produced message should be retained by the message system.
+    *
+    * <P>Time to live is set to zero by default.
+    *
+    * @param timeToLive the message time to live in milliseconds; zero is
+    * unlimited
+    *
+    * @exception JMSException if the JMS provider fails to set the time to 
+    *                         live due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#getTimeToLive
+    * @see javax.jms.Message#DEFAULT_TIME_TO_LIVE
+    */
+
+  void setTimeToLive(long timeToLive) throws JMSException;
+
+  /** Gets the default length of time in milliseconds from its dispatch time
+    * that a produced message should be retained by the message system.
+    *
+    * @return the message time to live in milliseconds; zero is unlimited
+    *
+    * @exception JMSException if the JMS provider fails to get the time to 
+    *                         live due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#setTimeToLive
+    */
+
+  long getTimeToLive() throws JMSException;
+
+  /** Gets the destination associated with this <CODE>MessageProducer</CODE>.
+    *  
+    * @return this producer's <CODE>Destination/<CODE>
+    *  
+    * @exception JMSException if the JMS provider fails to get the destination for
+    *                         this <CODE>MessageProducer</CODE>
+    *                         due to some internal error.
+    *@since 1.1 
+    */
+
+  Destination getDestination() throws JMSException;
+
+  /** Closes the message producer.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a
+    * <CODE>MessageProducer</CODE> outside the Java virtual machine, clients 
+    * should close them when they
+    * are not needed. Relying on garbage collection to eventually reclaim
+    * these resources may not be timely enough.
+    *  
+    * @exception JMSException if the JMS provider fails to close the producer
+    *                         due to some internal error.
+    */
+
+  void close() throws JMSException;
+
+  /** Sends a message using the <CODE>MessageProducer</CODE>'s 
+  * default delivery mode, priority, and time to live.
   *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
+  * @param message the message to send 
+  *  
+  * @exception JMSException if the JMS provider fails to send the message 
+  *                         due to some internal error.
+  * @exception MessageFormatException if an invalid message is specified.
+  * @exception InvalidDestinationException if a client uses
+  *                         this method with a <CODE>MessageProducer</CODE> with
+  *                         an invalid destination.
+  * @exception java.lang.UnsupportedOperationException if a client uses this
+  *                         method with a <CODE>MessageProducer</CODE> that did
+  *                         not specify a destination at creation time.
+  * 
+  * @see javax.jms.Session#createProducer 
+  * @see javax.jms.MessageProducer 
   *
-  * @see         javax.jms.TopicPublisher
-  * @see         javax.jms.QueueSender
-  * @see         javax.jms.Session#createProducer
+  * @since 1.1 
   */
 
-public interface MessageProducer {
-
-    /** Sets whether message IDs are disabled.
-      *  
-      * <P>Since message IDs take some effort to create and increase a
-      * message's size, some JMS providers may be able to optimize message
-      * overhead if they are given a hint that the message ID is not used by
-      * an application. By calling the <CODE>setDisableMessageID</CODE>  
-      * method on this message producer, a JMS client enables this potential 
-      * optimization for all messages sent by this message producer. If the JMS 
-      * provider accepts this hint, 
-      * these messages must have the message ID set to null; if the provider 
-      * ignores the hint, the message ID must be set to its normal unique value.
-      *
-      * <P>Message IDs are enabled by default.
-      *
-      * @param value indicates if message IDs are disabled
-      *  
-      * @exception JMSException if the JMS provider fails to set message ID to
-      *                         disabled due to some internal error.
-      */ 
-
-    void
-    setDisableMessageID(boolean value) throws JMSException;
-
-
-    /** Gets an indication of whether message IDs are disabled.
-      *  
-      * @return an indication of whether message IDs are disabled
-      *  
-      * @exception JMSException if the JMS provider fails to determine if 
-      *                         message IDs are disabled due to some internal 
-      *                         error.
-      */ 
-
-    boolean 
-    getDisableMessageID() throws JMSException;
-
-
-    /** Sets whether message timestamps are disabled.
-      *  
-      * <P>Since timestamps take some effort to create and increase a 
-      * message's size, some JMS providers may be able to optimize message 
-      * overhead if they are given a hint that the timestamp is not used by an 
-      * application. By calling the <CODE>setDisableMessageTimestamp</CODE> 
-      * method on this message producer, a JMS client enables this potential 
-      * optimization for all messages sent by this message producer.  If the 
-      * JMS provider accepts this hint, 
-      * these messages must have the timestamp set to zero; if the provider 
-      * ignores the hint, the timestamp must be set to its normal value.
-      *  
-      * <P>Message timestamps are enabled by default.
-      *
-      * @param value indicates if message timestamps are disabled
-      *  
-      * @exception JMSException if the JMS provider fails to set timestamps to
-      *                         disabled due to some internal error.
-      */ 
-
-    void
-    setDisableMessageTimestamp(boolean value) throws JMSException;
-
-
-    /** Gets an indication of whether message timestamps are disabled.
-      *  
-      * @return an indication of whether message timestamps are disabled
-      *  
-      * @exception JMSException if the JMS provider fails to determine if 
-      *                         timestamps are disabled due to some internal 
-      *                         error.
-      */ 
-
-    boolean
-    getDisableMessageTimestamp() throws JMSException;
-
-
-    /** Sets the producer's default delivery mode.
-      *  
-      * <P>Delivery mode is set to <CODE>PERSISTENT</CODE> by default.
-      *
-      * @param deliveryMode the message delivery mode for this message
-      * producer; legal values are <code>DeliveryMode.NON_PERSISTENT</code>
-      * and <code>DeliveryMode.PERSISTENT</code>
-      *  
-      * @exception JMSException if the JMS provider fails to set the delivery 
-      *                         mode due to some internal error.          
-      *
-      * @see javax.jms.MessageProducer#getDeliveryMode
-      * @see javax.jms.DeliveryMode#NON_PERSISTENT
-      * @see javax.jms.DeliveryMode#PERSISTENT
-      * @see javax.jms.Message#DEFAULT_DELIVERY_MODE
-      */ 
-
-    void
-    setDeliveryMode(int deliveryMode) throws JMSException;
-
-
-    /** Gets the producer's default delivery mode.
-      *  
-      * @return the message delivery mode for this message producer
-      *  
-      * @exception JMSException if the JMS provider fails to get the delivery 
-      *                         mode due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#setDeliveryMode
-      */ 
-
-    int 
-    getDeliveryMode() throws JMSException;
-
-
-    /** Sets the producer's default priority.
-      *  
-      * <P>The JMS API defines ten levels of priority value, with 0 as the 
-      * lowest priority and 9 as the highest. Clients should consider priorities
-      * 0-4 as gradations of normal priority and priorities 5-9 as gradations 
-      * of expedited priority. Priority is set to 4 by default.
-      *
-      * @param defaultPriority the message priority for this message producer;
-      *                        must be a value between 0 and 9
-      * 
-      *  
-      * @exception JMSException if the JMS provider fails to set the priority
-      *                         due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#getPriority
-      * @see javax.jms.Message#DEFAULT_PRIORITY
-      */ 
-
-    void
-    setPriority(int defaultPriority) throws JMSException;
-
-
-    /** Gets the producer's default priority.
-      *  
-      * @return the message priority for this message producer
-      *  
-      * @exception JMSException if the JMS provider fails to get the priority
-      *                         due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#setPriority
-      */ 
-
-    int 
-    getPriority() throws JMSException;
-
-
-    /** Sets the default length of time in milliseconds from its dispatch time
-      * that a produced message should be retained by the message system.
-      *
-      * <P>Time to live is set to zero by default.
-      *
-      * @param timeToLive the message time to live in milliseconds; zero is
-      * unlimited
-      *
-      * @exception JMSException if the JMS provider fails to set the time to 
-      *                         live due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#getTimeToLive
-      * @see javax.jms.Message#DEFAULT_TIME_TO_LIVE
-      */
-   
-    void
-    setTimeToLive(long timeToLive) throws JMSException;
-   
-   
-    /** Gets the default length of time in milliseconds from its dispatch time
-      * that a produced message should be retained by the message system.
-      *
-      * @return the message time to live in milliseconds; zero is unlimited
-      *
-      * @exception JMSException if the JMS provider fails to get the time to 
-      *                         live due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#setTimeToLive
-      */ 
- 
-    long
-    getTimeToLive() throws JMSException;
-
-    /** Gets the destination associated with this <CODE>MessageProducer</CODE>.
-      *  
-      * @return this producer's <CODE>Destination/<CODE>
-      *  
-      * @exception JMSException if the JMS provider fails to get the destination for
-      *                         this <CODE>MessageProducer</CODE>
-      *                         due to some internal error.
-      *@since 1.1 
-      */ 
-    
-    Destination 
-    getDestination() throws JMSException;
-    
-    /** Closes the message producer.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a
-      * <CODE>MessageProducer</CODE> outside the Java virtual machine, clients 
-      * should close them when they
-      * are not needed. Relying on garbage collection to eventually reclaim
-      * these resources may not be timely enough.
-      *  
-      * @exception JMSException if the JMS provider fails to close the producer
-      *                         due to some internal error.
-      */ 
-
-    void
-    close() throws JMSException;
-    
-     
-      /** Sends a message using the <CODE>MessageProducer</CODE>'s 
-      * default delivery mode, priority, and time to live.
-      *
-      * @param message the message to send 
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with a <CODE>MessageProducer</CODE> with
-      *                         an invalid destination.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>MessageProducer</CODE> that did
-      *                         not specify a destination at creation time.
-      * 
-      * @see javax.jms.Session#createProducer 
-      * @see javax.jms.MessageProducer 
-      *
-      * @since 1.1 
-      */
-
-    void 
-    send(Message message) throws JMSException;
-    
-      /** Sends a message to the destination, specifying delivery mode, priority, and 
-      * time to live.
-      *
-      * @param message the message to send
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with a <CODE>MessageProducer</CODE> with
-      *                         an invalid destination.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>MessageProducer</CODE> that did
-      *                         not specify a destination at creation time.
-      *
-      * @see javax.jms.Session#createProducer
-      * @since 1.1 
-      */
-
-    void 
-    send(Message message, 
-	 int deliveryMode, 
-	 int priority,
-	 long timeToLive) throws JMSException;
-    
-    
-     /**Sends a message to a destination for an unidentified message producer.
-      * Uses the <CODE>MessageProducer</CODE>'s default delivery mode, priority,
-      * and time to live.
-      *
-      * <P>Typically, a message producer is assigned a destination at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the destination be supplied every time a message is
-      * sent. 
-      *  
-      * @param destination the destination to send this message to
-      * @param message the message to send
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid destination.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>MessageProducer</CODE> that 
-      *                         specified a destination at creation time.
-      * 
-      * @see javax.jms.Session#createProducer
-      * @see javax.jms.MessageProducer
-      * @since 1.1 
-      */ 
- 
-    void
-    send(Destination destination, Message message) throws JMSException;
- 
- 
-    /** Sends a message to a destination for an unidentified message producer, 
-      * specifying delivery mode, priority and time to live.
-      *  
-      * <P>Typically, a message producer is assigned a destination at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the destination be supplied every time a message is
-      * sent. 
-      *  
-      * @param destination the destination to send this message to
-      * @param message the message to send
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid destination.
-      *
-      * @see javax.jms.Session#createProducer
-      * @since 1.1 
-      */ 
-
-    void
-    send(Destination destination, 
-	 Message message, 
-	 int deliveryMode, 
-	 int priority,
-	 long timeToLive) throws JMSException;
+  void send(Message message) throws JMSException;
 
+  /** Sends a message to the destination, specifying delivery mode, priority, and 
+  * time to live.
+  *
+  * @param message the message to send
+  * @param deliveryMode the delivery mode to use
+  * @param priority the priority for this message
+  * @param timeToLive the message's lifetime (in milliseconds)
+  *  
+  * @exception JMSException if the JMS provider fails to send the message 
+  *                         due to some internal error.
+  * @exception MessageFormatException if an invalid message is specified.
+  * @exception InvalidDestinationException if a client uses
+  *                         this method with a <CODE>MessageProducer</CODE> with
+  *                         an invalid destination.
+  * @exception java.lang.UnsupportedOperationException if a client uses this
+  *                         method with a <CODE>MessageProducer</CODE> that did
+  *                         not specify a destination at creation time.
+  *
+  * @see javax.jms.Session#createProducer
+  * @since 1.1 
+  */
 
+  void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
+
+  /**Sends a message to a destination for an unidentified message producer.
+   * Uses the <CODE>MessageProducer</CODE>'s default delivery mode, priority,
+   * and time to live.
+   *
+   * <P>Typically, a message producer is assigned a destination at creation 
+   * time; however, the JMS API also supports unidentified message producers,
+   * which require that the destination be supplied every time a message is
+   * sent. 
+   *  
+   * @param destination the destination to send this message to
+   * @param message the message to send
+   *  
+   * @exception JMSException if the JMS provider fails to send the message 
+   *                         due to some internal error.
+   * @exception MessageFormatException if an invalid message is specified.
+   * @exception InvalidDestinationException if a client uses
+   *                         this method with an invalid destination.
+   * @exception java.lang.UnsupportedOperationException if a client uses this
+   *                         method with a <CODE>MessageProducer</CODE> that 
+   *                         specified a destination at creation time.
+   * 
+   * @see javax.jms.Session#createProducer
+   * @see javax.jms.MessageProducer
+   * @since 1.1 
+   */
+
+  void send(Destination destination, Message message) throws JMSException;
+
+  /** Sends a message to a destination for an unidentified message producer, 
+    * specifying delivery mode, priority and time to live.
+    *  
+    * <P>Typically, a message producer is assigned a destination at creation 
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the destination be supplied every time a message is
+    * sent. 
+    *  
+    * @param destination the destination to send this message to
+    * @param message the message to send
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid destination.
+    *
+    * @see javax.jms.Session#createProducer
+    * @since 1.1 
+    */
+
+  void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
+      throws JMSException;
 
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java
index 8c0fff03de..acc91ca7dc 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java
@@ -1,90 +1,87 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.io.Serializable;
 
 /** An <CODE>ObjectMessage</CODE> object is used to send a message that contains
-  * a serializable object in the Java programming language ("Java object").
-  * It inherits from the <CODE>Message</CODE> interface and adds a body
-  * containing a single reference to an object. Only <CODE>Serializable</CODE> 
-  * Java objects can be used.
-  *
-  * <P>If a collection of Java objects must be sent, one of the 
-  * <CODE>Collection</CODE> classes provided since JDK 1.2 can be used.
-  *
-  * <P>When a client receives an <CODE>ObjectMessage</CODE>, it is in read-only 
-  * mode. If a client attempts to write to the message at this point, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown. If 
-  * <CODE>clearBody</CODE> is called, the message can now be both read from and 
-  * written to.
-  *
-  * @version     1.0 - 6 August 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.Session#createObjectMessage()
-  * @see         javax.jms.Session#createObjectMessage(Serializable)
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.StreamMessage
-  * @see         javax.jms.TextMessage
-  */
-
-public interface ObjectMessage extends Message {
+ * a serializable object in the Java programming language ("Java object").
+ * It inherits from the <CODE>Message</CODE> interface and adds a body
+ * containing a single reference to an object. Only <CODE>Serializable</CODE>
+ * Java objects can be used.
+ *
+ * <P>If a collection of Java objects must be sent, one of the
+ * <CODE>Collection</CODE> classes provided since JDK 1.2 can be used.
+ *
+ * <P>When a client receives an <CODE>ObjectMessage</CODE>, it is in read-only
+ * mode. If a client attempts to write to the message at this point, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown. If
+ * <CODE>clearBody</CODE> is called, the message can now be both read from and
+ * written to.
+ *
+ * @version     1.0 - 6 August 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.Session#createObjectMessage()
+ * @see         javax.jms.Session#createObjectMessage(Serializable)
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.StreamMessage
+ * @see         javax.jms.TextMessage
+ */
 
-    /** Sets the serializable object containing this message's data.
-      * It is important to note that an <CODE>ObjectMessage</CODE>
-      * contains a snapshot of the object at the time <CODE>setObject()</CODE>
-      * is called; subsequent modifications of the object will have no 
-      * effect on the <CODE>ObjectMessage</CODE> body.
-      *
-      * @param object the message's data
-      *  
-      * @exception JMSException if the JMS provider fails to set the object
-      *                         due to some internal error.
-      * @exception MessageFormatException if object serialization fails.
-      * @exception MessageNotWriteableException if the message is in read-only
-      *                                         mode.
-      */
+public interface ObjectMessage extends Message
+{
 
-    void 
-    setObject(Serializable object) throws JMSException;
+  /** Sets the serializable object containing this message's data.
+    * It is important to note that an <CODE>ObjectMessage</CODE>
+    * contains a snapshot of the object at the time <CODE>setObject()</CODE>
+    * is called; subsequent modifications of the object will have no 
+    * effect on the <CODE>ObjectMessage</CODE> body.
+    *
+    * @param object the message's data
+    *  
+    * @exception JMSException if the JMS provider fails to set the object
+    *                         due to some internal error.
+    * @exception MessageFormatException if object serialization fails.
+    * @exception MessageNotWriteableException if the message is in read-only
+    *                                         mode.
+    */
 
+  void setObject(Serializable object) throws JMSException;
 
-    /** Gets the serializable object containing this message's data. The 
-      * default value is null.
-      *
-      * @return the serializable object containing this message's data
-      *  
-      * @exception JMSException if the JMS provider fails to get the object
-      *                         due to some internal error.
-      * @exception MessageFormatException if object deserialization fails.
-      */
+  /** Gets the serializable object containing this message's data. The 
+    * default value is null.
+    *
+    * @return the serializable object containing this message's data
+    *  
+    * @exception JMSException if the JMS provider fails to get the object
+    *                         due to some internal error.
+    * @exception MessageFormatException if object deserialization fails.
+    */
 
-    Serializable 
-    getObject() throws JMSException;
+  Serializable getObject() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java
index 0a9ec202cd..a2ad1b3c01 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java
@@ -1,81 +1,77 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
+/** A <CODE>Queue</CODE> object encapsulates a provider-specific queue name.
+ * It is the way a client specifies the identity of a queue to JMS API methods.
+ * For those methods that use a <CODE>Destination</CODE> as a parameter, a
+ * <CODE>Queue</CODE> object used as an argument. For example, a queue can
+ * be used  to create a <CODE>MessageConsumer</CODE> and a
+ * <CODE>MessageProducer</CODE>  by calling:
+ *<UL>
+ *<LI> <CODE>Session.CreateConsumer(Destination destination)</CODE>
+ *<LI> <CODE>Session.CreateProducer(Destination destination)</CODE>
+ *
+ *</UL>
+ *
+ * <P>The actual length of time messages are held by a queue and the
+ * consequences of resource overflow are not defined by the JMS API.
+ *
+ *
+ *
+ * @version     1.1 February 2 - 2000
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see Session#createConsumer(Destination)
+ * @see Session#createProducer(Destination)
+ * @see Session#createQueue(String)
+ * @see QueueSession#createQueue(String)
+ */
+
+public interface Queue extends Destination
+{
 
-/** A <CODE>Queue</CODE> object encapsulates a provider-specific queue name. 
-  * It is the way a client specifies the identity of a queue to JMS API methods.
-  * For those methods that use a <CODE>Destination</CODE> as a parameter, a 
-  * <CODE>Queue</CODE> object used as an argument. For example, a queue can
-  * be used  to create a <CODE>MessageConsumer</CODE> and a 
-  * <CODE>MessageProducer</CODE>  by calling:
-  *<UL>
-  *<LI> <CODE>Session.CreateConsumer(Destination destination)</CODE>
-  *<LI> <CODE>Session.CreateProducer(Destination destination)</CODE>
-  *
-  *</UL>
-  *
-  * <P>The actual length of time messages are held by a queue and the 
-  * consequences of resource overflow are not defined by the JMS API.
-  *
-  *
-  *
-  * @version     1.1 February 2 - 2000
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see Session#createConsumer(Destination)
-  * @see Session#createProducer(Destination)
-  * @see Session#createQueue(String)
-  * @see QueueSession#createQueue(String)
-  */
- 
-public interface Queue extends Destination { 
+  /** Gets the name of this queue.
+    *  
+    * <P>Clients that depend upon the name are not portable.
+    *  
+    * @return the queue name
+    *  
+    * @exception JMSException if the JMS provider implementation of 
+    *                         <CODE>Queue</CODE> fails to return the queue
+    *                         name due to some internal
+    *                         error.
+    */
 
-    /** Gets the name of this queue.
-      *  
-      * <P>Clients that depend upon the name are not portable.
-      *  
-      * @return the queue name
-      *  
-      * @exception JMSException if the JMS provider implementation of 
-      *                         <CODE>Queue</CODE> fails to return the queue
-      *                         name due to some internal
-      *                         error.
-      */ 
- 
-    String
-    getQueueName() throws JMSException;  
+  String getQueueName() throws JMSException;
 
+  /** Returns a string representation of this object.
+    *
+    * @return the provider-specific identity values for this queue
+    */
 
-    /** Returns a string representation of this object.
-      *
-      * @return the provider-specific identity values for this queue
-      */
- 
-    String
-    toString();
+  String toString();
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java
index 0bb06ffb55..bc4ae52065 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java
@@ -1,115 +1,108 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.util.Enumeration;
 
-/** A client uses a <CODE>QueueBrowser</CODE> object to look at messages on a 
-  * queue without removing them.
-  *
-  * <P>The <CODE>getEnumeration</CODE> method returns a 
-  * <CODE>java.util.Enumeration</CODE> that is used to scan 
-  * the queue's messages. It may be an enumeration of the entire content of a 
-  * queue, or it may contain only the messages matching a message selector.
-  *
-  * <P>Messages may be arriving and expiring while the scan is done. The JMS API
-  * does 
-  * not require the content of an enumeration to be a static snapshot of queue 
-  * content. Whether these changes are visible or not depends on the JMS 
-  * provider.
-  *
-  *<P>A <CODE>QueueBrowser</CODE> can be created from either a 
-  * <CODE>Session</CODE> or a <CODE> QueueSession</CODE>. 
-  *
-  * @version     1.1 April 9, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  *  @see         javax.jms.Session#createBrowser
-  * @see         javax.jms.QueueSession#createBrowser
-  * @see         javax.jms.QueueReceiver
-  */
-
-public interface QueueBrowser {
-
-    /** Gets the queue associated with this queue browser.
-      * 
-      * @return the queue
-      *  
-      * @exception JMSException if the JMS provider fails to get the
-      *                         queue associated with this browser
-      *                         due to some internal error.
-      */
-
-    Queue 
-    getQueue() throws JMSException;
-
-
-    /** Gets this queue browser's message selector expression.
-      *  
-      * @return this queue browser's message selector, or null if no
-      *         message selector exists for the message consumer (that is, if 
-      *         the message selector was not set or was set to null or the 
-      *         empty string)
-      *
-      * @exception JMSException if the JMS provider fails to get the
-      *                         message selector for this browser
-      *                         due to some internal error.
-      */
-
-    String
-    getMessageSelector() throws JMSException;
-
-
-    /** Gets an enumeration for browsing the current queue messages in the
-      * order they would be received.
-      *
-      * @return an enumeration for browsing the messages
-      *  
-      * @exception JMSException if the JMS provider fails to get the
-      *                         enumeration for this browser
-      *                         due to some internal error.
-      */
-
-    Enumeration 
-    getEnumeration() throws JMSException;
-
-
-    /** Closes the <CODE>QueueBrowser</CODE>.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a 
-      * QueueBrowser outside the Java virtual machine, clients should close them
-      * when they 
-      * are not needed. Relying on garbage collection to eventually reclaim 
-      * these resources may not be timely enough.
-      *
-      * @exception JMSException if the JMS provider fails to close this
-      *                         browser due to some internal error.
-      */
+/** A client uses a <CODE>QueueBrowser</CODE> object to look at messages on a
+ * queue without removing them.
+ *
+ * <P>The <CODE>getEnumeration</CODE> method returns a
+ * <CODE>java.util.Enumeration</CODE> that is used to scan
+ * the queue's messages. It may be an enumeration of the entire content of a
+ * queue, or it may contain only the messages matching a message selector.
+ *
+ * <P>Messages may be arriving and expiring while the scan is done. The JMS API
+ * does
+ * not require the content of an enumeration to be a static snapshot of queue
+ * content. Whether these changes are visible or not depends on the JMS
+ * provider.
+ *
+ *<P>A <CODE>QueueBrowser</CODE> can be created from either a
+ * <CODE>Session</CODE> or a <CODE> QueueSession</CODE>.
+ *
+ * @version     1.1 April 9, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ *  @see         javax.jms.Session#createBrowser
+ * @see         javax.jms.QueueSession#createBrowser
+ * @see         javax.jms.QueueReceiver
+ */
 
-    void 
-    close() throws JMSException;
+public interface QueueBrowser
+{
+
+  /** Gets the queue associated with this queue browser.
+    * 
+    * @return the queue
+    *  
+    * @exception JMSException if the JMS provider fails to get the
+    *                         queue associated with this browser
+    *                         due to some internal error.
+    */
+
+  Queue getQueue() throws JMSException;
+
+  /** Gets this queue browser's message selector expression.
+    *  
+    * @return this queue browser's message selector, or null if no
+    *         message selector exists for the message consumer (that is, if 
+    *         the message selector was not set or was set to null or the 
+    *         empty string)
+    *
+    * @exception JMSException if the JMS provider fails to get the
+    *                         message selector for this browser
+    *                         due to some internal error.
+    */
+
+  String getMessageSelector() throws JMSException;
+
+  /** Gets an enumeration for browsing the current queue messages in the
+    * order they would be received.
+    *
+    * @return an enumeration for browsing the messages
+    *  
+    * @exception JMSException if the JMS provider fails to get the
+    *                         enumeration for this browser
+    *                         due to some internal error.
+    */
+
+  Enumeration getEnumeration() throws JMSException;
+
+  /** Closes the <CODE>QueueBrowser</CODE>.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a 
+    * QueueBrowser outside the Java virtual machine, clients should close them
+    * when they 
+    * are not needed. Relying on garbage collection to eventually reclaim 
+    * these resources may not be timely enough.
+    *
+    * @exception JMSException if the JMS provider fails to close this
+    *                         browser due to some internal error.
+    */
+
+  void close() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
index ef21a6db56..56cc35040f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
@@ -1,118 +1,111 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>QueueConnection</CODE> object is an active connection to a 
-  * point-to-point JMS provider. A client uses a <CODE>QueueConnection</CODE> 
-  * object to create one or more <CODE>QueueSession</CODE> objects
-  * for producing and consuming messages.
-  *
-  *<P>A <CODE>QueueConnection</CODE> can be used to create a
-  * <CODE>QueueSession</CODE>, from which specialized  queue-related objects
-  * can be created.
-  * A more general, and recommended, approach is to use the 
-  * <CODE>Connection</CODE> object.
-  * 
-  *
-  * <P>The <CODE>QueueConnection</CODE> object
-  * should be used to support existing code that has already used it.
-  *
-  * <P>A <CODE>QueueConnection</CODE> cannot be used to create objects 
-  * specific to the   publish/subscribe domain. The
-  * <CODE>createDurableConnectionConsumer</CODE> method inherits
-  * from  <CODE>Connection</CODE>, but must throw an 
-  * <CODE>IllegalStateException</CODE>
-  * if used from <CODE>QueueConnection</CODE>.
-  *
-  * @version     1.1 - April 9, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Connection
-  * @see         javax.jms.ConnectionFactory
-  * @see	 javax.jms.QueueConnectionFactory
-  */
-
-public interface QueueConnection extends Connection {
+/** A <CODE>QueueConnection</CODE> object is an active connection to a
+ * point-to-point JMS provider. A client uses a <CODE>QueueConnection</CODE>
+ * object to create one or more <CODE>QueueSession</CODE> objects
+ * for producing and consuming messages.
+ *
+ *<P>A <CODE>QueueConnection</CODE> can be used to create a
+ * <CODE>QueueSession</CODE>, from which specialized  queue-related objects
+ * can be created.
+ * A more general, and recommended, approach is to use the
+ * <CODE>Connection</CODE> object.
+ *
+ *
+ * <P>The <CODE>QueueConnection</CODE> object
+ * should be used to support existing code that has already used it.
+ *
+ * <P>A <CODE>QueueConnection</CODE> cannot be used to create objects
+ * specific to the   publish/subscribe domain. The
+ * <CODE>createDurableConnectionConsumer</CODE> method inherits
+ * from  <CODE>Connection</CODE>, but must throw an
+ * <CODE>IllegalStateException</CODE>
+ * if used from <CODE>QueueConnection</CODE>.
+ *
+ * @version     1.1 - April 9, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Connection
+ * @see         javax.jms.ConnectionFactory
+ * @see	 javax.jms.QueueConnectionFactory
+ */
 
-    /** Creates a <CODE>QueueSession</CODE> object.
-      *  
-      * @param transacted indicates whether the session is transacted
-      * @param acknowledgeMode indicates whether the consumer or the
-      * client will acknowledge any messages it receives; ignored if the session
-      * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
-      * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
-      * <code>Session.DUPS_OK_ACKNOWLEDGE</code>.
-      *  
-      * @return a newly created queue session
-      *  
-      * @exception JMSException if the <CODE>QueueConnection</CODE> object fails
-      *                         to create a session due to some internal error or
-      *                         lack of support for the specific transaction
-      *                         and acknowledgement mode.
-      *
-      * @see Session#AUTO_ACKNOWLEDGE 
-      * @see Session#CLIENT_ACKNOWLEDGE 
-      * @see Session#DUPS_OK_ACKNOWLEDGE 
-      */ 
+public interface QueueConnection extends Connection
+{
 
-    QueueSession
-    createQueueSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+  /** Creates a <CODE>QueueSession</CODE> object.
+    *  
+    * @param transacted indicates whether the session is transacted
+    * @param acknowledgeMode indicates whether the consumer or the
+    * client will acknowledge any messages it receives; ignored if the session
+    * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
+    * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
+    * <code>Session.DUPS_OK_ACKNOWLEDGE</code>.
+    *  
+    * @return a newly created queue session
+    *  
+    * @exception JMSException if the <CODE>QueueConnection</CODE> object fails
+    *                         to create a session due to some internal error or
+    *                         lack of support for the specific transaction
+    *                         and acknowledgement mode.
+    *
+    * @see Session#AUTO_ACKNOWLEDGE 
+    * @see Session#CLIENT_ACKNOWLEDGE 
+    * @see Session#DUPS_OK_ACKNOWLEDGE 
+    */
 
+  QueueSession createQueueSession(boolean transacted, int acknowledgeMode) throws JMSException;
 
-    /** Creates a connection consumer for this connection (optional operation).
-      * This is an expert facility not used by regular JMS clients.
-      *
-      * @param queue the queue to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the connection consumer
-      *  
-      * @exception JMSException if the <CODE>QueueConnection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      * @see javax.jms.ConnectionConsumer
-      */ 
+  /** Creates a connection consumer for this connection (optional operation).
+    * This is an expert facility not used by regular JMS clients.
+    *
+    * @param queue the queue to access
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param sessionPool the server session pool to associate with this 
+    * connection consumer
+    * @param maxMessages the maximum number of messages that can be
+    * assigned to a server session at one time
+    *
+    * @return the connection consumer
+    *  
+    * @exception JMSException if the <CODE>QueueConnection</CODE> object fails
+    *                         to create a connection consumer due to some
+    *                         internal error or invalid arguments for 
+    *                         <CODE>sessionPool</CODE> and 
+    *                         <CODE>messageSelector</CODE>.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    * @see javax.jms.ConnectionConsumer
+    */
 
-    ConnectionConsumer
-    createConnectionConsumer(Queue queue,
-                             String messageSelector,
-                             ServerSessionPool sessionPool,
-			     int maxMessages)
-			   throws JMSException;
+  ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java
index dd1d570c82..b2ebdee017 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java
@@ -1,87 +1,82 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
-
 package javax.jms;
 
-/** A client uses a <CODE>QueueConnectionFactory</CODE> object to create 
-  * <CODE>QueueConnection</CODE> objects with a point-to-point JMS provider.
-  *
-  * <P><CODE>QueueConnectionFactory</CODE> can be used to create a 
-  * <CODE>QueueConnection</CODE>, from which specialized queue-related objects
-  * can be  created. A more general, and recommended,  approach 
-  * is to use the <CODE>ConnectionFactory</CODE> object.
-  *
-  *<P> The <CODE>QueueConnectionFactory</CODE> object
-  * can be used to support existing code that already uses it.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.ConnectionFactory
-  */
-
-public interface QueueConnectionFactory extends ConnectionFactory {
+/** A client uses a <CODE>QueueConnectionFactory</CODE> object to create
+ * <CODE>QueueConnection</CODE> objects with a point-to-point JMS provider.
+ *
+ * <P><CODE>QueueConnectionFactory</CODE> can be used to create a
+ * <CODE>QueueConnection</CODE>, from which specialized queue-related objects
+ * can be  created. A more general, and recommended,  approach
+ * is to use the <CODE>ConnectionFactory</CODE> object.
+ *
+ *<P> The <CODE>QueueConnectionFactory</CODE> object
+ * can be used to support existing code that already uses it.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.ConnectionFactory
+ */
 
-    /** Creates a queue connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      .
-      *
-      * @return a newly created queue connection
-      *
-      * @exception JMSException if the JMS provider fails to create the queue 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+public interface QueueConnectionFactory extends ConnectionFactory
+{
 
-    QueueConnection
-    createQueueConnection() throws JMSException;
+  /** Creates a queue connection with the default user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *
+    .
+    *
+    * @return a newly created queue connection
+    *
+    * @exception JMSException if the JMS provider fails to create the queue 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
+  QueueConnection createQueueConnection() throws JMSException;
 
-    /** Creates a queue connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created queue connection
-      *
-      * @exception JMSException if the JMS provider fails to create the queue 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+  /** Creates a queue connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created queue connection
+    *
+    * @exception JMSException if the JMS provider fails to create the queue 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
-    QueueConnection
-    createQueueConnection(String userName, String password) 
-					     throws JMSException;
+  QueueConnection createQueueConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java
index 20d3300b82..2ced18ba87 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java
@@ -1,73 +1,71 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
+/** A client uses a <CODE>QueueReceiver</CODE> object to receive messages that
+ * have been delivered to a queue.
+ *
+ * <P>Although it is possible to have multiple <CODE>QueueReceiver</CODE>s
+ * for the same queue, the JMS API does not define how messages are
+ * distributed between the <CODE>QueueReceiver</CODE>s.
+ *
+ * <P>If a <CODE>QueueReceiver</CODE> specifies a message selector, the
+ * messages that are not selected remain on the queue. By definition, a message
+ * selector allows a <CODE>QueueReceiver</CODE> to skip messages. This
+ * means that when the skipped messages are eventually read, the total ordering
+ * of the reads does not retain the partial order defined by each message
+ * producer. Only <CODE>QueueReceiver</CODE>s without a message selector
+ * will read messages in message producer order.
+ *
+ * <P>Creating a <CODE>MessageConsumer</CODE> provides the same features as
+ * creating a <CODE>QueueReceiver</CODE>. A <CODE>MessageConsumer</CODE> object is
+ * recommended for creating new code. The  <CODE>QueueReceiver</CODE> is
+ * provided to support existing code.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session#createConsumer(Destination, String)
+ * @see         javax.jms.Session#createConsumer(Destination)
+ * @see         javax.jms.QueueSession#createReceiver(Queue, String)
+ * @see         javax.jms.QueueSession#createReceiver(Queue)
+ * @see         javax.jms.MessageConsumer
+ */
 
-/** A client uses a <CODE>QueueReceiver</CODE> object to receive messages that 
-  * have been delivered to a queue.
-  *
-  * <P>Although it is possible to have multiple <CODE>QueueReceiver</CODE>s 
-  * for the same queue, the JMS API does not define how messages are 
-  * distributed between the <CODE>QueueReceiver</CODE>s.
-  *
-  * <P>If a <CODE>QueueReceiver</CODE> specifies a message selector, the 
-  * messages that are not selected remain on the queue. By definition, a message
-  * selector allows a <CODE>QueueReceiver</CODE> to skip messages. This 
-  * means that when the skipped messages are eventually read, the total ordering
-  * of the reads does not retain the partial order defined by each message 
-  * producer. Only <CODE>QueueReceiver</CODE>s without a message selector
-  * will read messages in message producer order.
-  *
-  * <P>Creating a <CODE>MessageConsumer</CODE> provides the same features as
-  * creating a <CODE>QueueReceiver</CODE>. A <CODE>MessageConsumer</CODE> object is 
-  * recommended for creating new code. The  <CODE>QueueReceiver</CODE> is
-  * provided to support existing code.
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session#createConsumer(Destination, String)
-  * @see         javax.jms.Session#createConsumer(Destination)
-  * @see         javax.jms.QueueSession#createReceiver(Queue, String)
-  * @see         javax.jms.QueueSession#createReceiver(Queue)
-  * @see         javax.jms.MessageConsumer
-  */
+public interface QueueReceiver extends MessageConsumer
+{
 
-public interface QueueReceiver extends MessageConsumer {
+  /** Gets the <CODE>Queue</CODE> associated with this queue receiver.
+    *  
+    * @return this receiver's <CODE>Queue</CODE> 
+    *  
+    * @exception JMSException if the JMS provider fails to get the queue for
+    *                         this queue receiver
+    *                         due to some internal error.
+    */
 
-    /** Gets the <CODE>Queue</CODE> associated with this queue receiver.
-      *  
-      * @return this receiver's <CODE>Queue</CODE> 
-      *  
-      * @exception JMSException if the JMS provider fails to get the queue for
-      *                         this queue receiver
-      *                         due to some internal error.
-      */ 
- 
-    Queue
-    getQueue() throws JMSException;
+  Queue getQueue() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java
index 68860de448..e0b13ff396 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java
@@ -1,124 +1,125 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** The <CODE>QueueRequestor</CODE> helper class simplifies
-  * making service requests.
-  *
-  * <P>The <CODE>QueueRequestor</CODE> constructor is given a non-transacted 
-  * <CODE>QueueSession</CODE> and a destination <CODE>Queue</CODE>. It creates a
-  * <CODE>TemporaryQueue</CODE> for the responses and provides a 
-  * <CODE>request</CODE> method that sends the request message and waits 
-  * for its reply.
-  *
-  * <P>This is a basic request/reply abstraction that should be sufficient 
-  * for most uses. JMS providers and clients are free to create more 
-  * sophisticated versions.
-  *
-  * @version     1.0 - 8 July 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.TopicRequestor
-  */
+ * making service requests.
+ *
+ * <P>The <CODE>QueueRequestor</CODE> constructor is given a non-transacted
+ * <CODE>QueueSession</CODE> and a destination <CODE>Queue</CODE>. It creates a
+ * <CODE>TemporaryQueue</CODE> for the responses and provides a
+ * <CODE>request</CODE> method that sends the request message and waits
+ * for its reply.
+ *
+ * <P>This is a basic request/reply abstraction that should be sufficient
+ * for most uses. JMS providers and clients are free to create more
+ * sophisticated versions.
+ *
+ * @version     1.0 - 8 July 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.TopicRequestor
+ */
+
+public class QueueRequestor
+{
 
-public class QueueRequestor {
+  QueueSession session; // The queue session the queue belongs to.
 
-    QueueSession   session;     // The queue session the queue belongs to.
-    Queue          queue;       // The queue to perform the request/reply on.
-    TemporaryQueue tempQueue;
-    QueueSender    sender;
-    QueueReceiver  receiver;
+  Queue queue; // The queue to perform the request/reply on.
 
+  TemporaryQueue tempQueue;
 
-    /** Constructor for the <CODE>QueueRequestor</CODE> class.
-      *  
-      * <P>This implementation assumes the session parameter to be non-transacted,
-      * with a delivery mode of either <CODE>AUTO_ACKNOWLEDGE</CODE> or 
-      * <CODE>DUPS_OK_ACKNOWLEDGE</CODE>.
-      *
-      * @param session the <CODE>QueueSession</CODE> the queue belongs to
-      * @param queue the queue to perform the request/reply call on
-      *  
-      * @exception JMSException if the JMS provider fails to create the
-      *                         <CODE>QueueRequestor</CODE> due to some internal
-      *                         error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      */ 
+  QueueSender sender;
 
-    public
-    QueueRequestor(QueueSession session, Queue queue) throws JMSException {
-        this.session = session;
-        this.queue   = queue;
-        tempQueue    = session.createTemporaryQueue();
-        sender       = session.createSender(queue);
-        receiver     = session.createReceiver(tempQueue);
-    }
+  QueueReceiver receiver;
 
+  /** Constructor for the <CODE>QueueRequestor</CODE> class.
+    *  
+    * <P>This implementation assumes the session parameter to be non-transacted,
+    * with a delivery mode of either <CODE>AUTO_ACKNOWLEDGE</CODE> or 
+    * <CODE>DUPS_OK_ACKNOWLEDGE</CODE>.
+    *
+    * @param session the <CODE>QueueSession</CODE> the queue belongs to
+    * @param queue the queue to perform the request/reply call on
+    *  
+    * @exception JMSException if the JMS provider fails to create the
+    *                         <CODE>QueueRequestor</CODE> due to some internal
+    *                         error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    */
 
-    /** Sends a request and waits for a reply. The temporary queue is used for
-      * the <CODE>JMSReplyTo</CODE> destination, and only one reply per request 
-      * is expected.
-      *  
-      * @param message the message to send
-      *  
-      * @return the reply message
-      *  
-      * @exception JMSException if the JMS provider fails to complete the
-      *                         request due to some internal error.
-      */
+  public QueueRequestor(QueueSession session, Queue queue) throws JMSException
+  {
+    this.session = session;
+    this.queue = queue;
+    tempQueue = session.createTemporaryQueue();
+    sender = session.createSender(queue);
+    receiver = session.createReceiver(tempQueue);
+  }
 
-    public Message
-    request(Message message) throws JMSException {
-	message.setJMSReplyTo(tempQueue);
-	sender.send(message);
-	return (receiver.receive());
-    }
+  /** Sends a request and waits for a reply. The temporary queue is used for
+    * the <CODE>JMSReplyTo</CODE> destination, and only one reply per request 
+    * is expected.
+    *  
+    * @param message the message to send
+    *  
+    * @return the reply message
+    *  
+    * @exception JMSException if the JMS provider fails to complete the
+    *                         request due to some internal error.
+    */
 
+  public Message request(Message message) throws JMSException
+  {
+    message.setJMSReplyTo(tempQueue);
+    sender.send(message);
+    return receiver.receive();
+  }
 
-    /** Closes the <CODE>QueueRequestor</CODE> and its session.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a 
-      * <CODE>QueueRequestor</CODE> outside the Java virtual machine, clients 
-      * should close them when they 
-      * are not needed. Relying on garbage collection to eventually reclaim 
-      * these resources may not be timely enough.
-      *  
-      * <P>Note that this method closes the <CODE>QueueSession</CODE> object 
-      * passed to the <CODE>QueueRequestor</CODE> constructor.
-      *
-      * @exception JMSException if the JMS provider fails to close the
-      *                         <CODE>QueueRequestor</CODE> due to some internal
-      *                         error.
-      */
+  /** Closes the <CODE>QueueRequestor</CODE> and its session.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a 
+    * <CODE>QueueRequestor</CODE> outside the Java virtual machine, clients 
+    * should close them when they 
+    * are not needed. Relying on garbage collection to eventually reclaim 
+    * these resources may not be timely enough.
+    *  
+    * <P>Note that this method closes the <CODE>QueueSession</CODE> object 
+    * passed to the <CODE>QueueRequestor</CODE> constructor.
+    *
+    * @exception JMSException if the JMS provider fails to close the
+    *                         <CODE>QueueRequestor</CODE> due to some internal
+    *                         error.
+    */
 
-    public void
-    close() throws JMSException {
+  public void close() throws JMSException
+  {
 
-	// publisher and consumer created by constructor are implicitly closed.
-	session.close();
-        tempQueue.delete();
-    }
+    // publisher and consumer created by constructor are implicitly closed.
+    session.close();
+    tempQueue.delete();
+  }
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java
index 57035f7a6e..267a4e4e63 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java
@@ -1,197 +1,181 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** A client uses a <CODE>QueueSender</CODE> object to send messages to a queue.
-  * 
-  * <P>Normally, the <CODE>Queue</CODE> is specified when a 
-  * <CODE>QueueSender</CODE> is created.  In this case, an attempt to use
-  * the <CODE>send</CODE> methods for an unidentified 
-  * <CODE>QueueSender</CODE> will throw a 
-  * <CODE>java.lang.UnsupportedOperationException</CODE>.
-  * 
-  * <P>If the <CODE>QueueSender</CODE> is created with an unidentified 
-  * <CODE>Queue</CODE>, an attempt to use the <CODE>send</CODE> methods that 
-  * assume that the <CODE>Queue</CODE> has been identified will throw a
-  * <CODE>java.lang.UnsupportedOperationException</CODE>.
-  *
-  * <P>During the execution of its <CODE>send</CODE> method, a message 
-  * must not be changed by other threads within the client. 
-  * If the message is modified, the result of the <CODE>send</CODE> is 
-  * undefined.
-  * 
-  * <P>After sending a message, a client may retain and modify it
-  * without affecting the message that has been sent. The same message
-  * object may be sent multiple times.
-  * 
-  * <P>The following message headers are set as part of sending a 
-  * message: <code>JMSDestination</code>, <code>JMSDeliveryMode</code>, 
-  * <code>JMSExpiration</code>, <code>JMSPriority</code>, 
-  * <code>JMSMessageID</code> and <code>JMSTimeStamp</code>.
-  * When the message is sent, the values of these headers are ignored. 
-  * After the completion of the <CODE>send</CODE>, the headers hold the values 
-  * specified by the method sending the message. It is possible for the 
-  * <code>send</code> method not to set <code>JMSMessageID</code> and 
-  * <code>JMSTimeStamp</code> if the 
-  * setting of these headers is explicitly disabled by the 
-  * <code>MessageProducer.setDisableMessageID</code> or
-  * <code>MessageProducer.setDisableMessageTimestamp</code> method.
-  *
-  * <P>Creating a <CODE>MessageProducer</CODE> provides the same features as
-  * creating a <CODE>QueueSender</CODE>. A <CODE>MessageProducer</CODE> object is 
-  * recommended when creating new code. The  <CODE>QueueSender</CODE> is
-  * provided to support existing code.
-  *
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.MessageProducer
-  * @see         javax.jms.Session#createProducer(Destination)
-  * @see         javax.jms.QueueSession#createSender(Queue)
-  */
+ *
+ * <P>Normally, the <CODE>Queue</CODE> is specified when a
+ * <CODE>QueueSender</CODE> is created.  In this case, an attempt to use
+ * the <CODE>send</CODE> methods for an unidentified
+ * <CODE>QueueSender</CODE> will throw a
+ * <CODE>java.lang.UnsupportedOperationException</CODE>.
+ *
+ * <P>If the <CODE>QueueSender</CODE> is created with an unidentified
+ * <CODE>Queue</CODE>, an attempt to use the <CODE>send</CODE> methods that
+ * assume that the <CODE>Queue</CODE> has been identified will throw a
+ * <CODE>java.lang.UnsupportedOperationException</CODE>.
+ *
+ * <P>During the execution of its <CODE>send</CODE> method, a message
+ * must not be changed by other threads within the client.
+ * If the message is modified, the result of the <CODE>send</CODE> is
+ * undefined.
+ *
+ * <P>After sending a message, a client may retain and modify it
+ * without affecting the message that has been sent. The same message
+ * object may be sent multiple times.
+ *
+ * <P>The following message headers are set as part of sending a
+ * message: <code>JMSDestination</code>, <code>JMSDeliveryMode</code>,
+ * <code>JMSExpiration</code>, <code>JMSPriority</code>,
+ * <code>JMSMessageID</code> and <code>JMSTimeStamp</code>.
+ * When the message is sent, the values of these headers are ignored.
+ * After the completion of the <CODE>send</CODE>, the headers hold the values
+ * specified by the method sending the message. It is possible for the
+ * <code>send</code> method not to set <code>JMSMessageID</code> and
+ * <code>JMSTimeStamp</code> if the
+ * setting of these headers is explicitly disabled by the
+ * <code>MessageProducer.setDisableMessageID</code> or
+ * <code>MessageProducer.setDisableMessageTimestamp</code> method.
+ *
+ * <P>Creating a <CODE>MessageProducer</CODE> provides the same features as
+ * creating a <CODE>QueueSender</CODE>. A <CODE>MessageProducer</CODE> object is
+ * recommended when creating new code. The  <CODE>QueueSender</CODE> is
+ * provided to support existing code.
+ *
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.MessageProducer
+ * @see         javax.jms.Session#createProducer(Destination)
+ * @see         javax.jms.QueueSession#createSender(Queue)
+ */
 
-public interface QueueSender extends MessageProducer {
+public interface QueueSender extends MessageProducer
+{
 
-    /** Gets the queue associated with this <CODE>QueueSender</CODE>.
-      *  
-      * @return this sender's queue 
-      *  
-      * @exception JMSException if the JMS provider fails to get the queue for
-      *                         this <CODE>QueueSender</CODE>
-      *                         due to some internal error.
-      */ 
- 
-    Queue
-    getQueue() throws JMSException;
+  /** Gets the queue associated with this <CODE>QueueSender</CODE>.
+    *  
+    * @return this sender's queue 
+    *  
+    * @exception JMSException if the JMS provider fails to get the queue for
+    *                         this <CODE>QueueSender</CODE>
+    *                         due to some internal error.
+    */
 
+  Queue getQueue() throws JMSException;
 
-    /** Sends a message to the queue. Uses the <CODE>QueueSender</CODE>'s 
-      * default delivery mode, priority, and time to live.
-      *
-      * @param message the message to send 
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with a <CODE>QueueSender</CODE> with
-      *                         an invalid queue.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>QueueSender</CODE> that did
-      *                         not specify a queue at creation time.
-      * 
-      * @see javax.jms.MessageProducer#getDeliveryMode()
-      * @see javax.jms.MessageProducer#getTimeToLive()
-      * @see javax.jms.MessageProducer#getPriority()
-      */
+  /** Sends a message to the queue. Uses the <CODE>QueueSender</CODE>'s 
+    * default delivery mode, priority, and time to live.
+    *
+    * @param message the message to send 
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with a <CODE>QueueSender</CODE> with
+    *                         an invalid queue.
+    * @exception java.lang.UnsupportedOperationException if a client uses this
+    *                         method with a <CODE>QueueSender</CODE> that did
+    *                         not specify a queue at creation time.
+    * 
+    * @see javax.jms.MessageProducer#getDeliveryMode()
+    * @see javax.jms.MessageProducer#getTimeToLive()
+    * @see javax.jms.MessageProducer#getPriority()
+    */
 
-    void 
-    send(Message message) throws JMSException;
+  void send(Message message) throws JMSException;
 
+  /** Sends a message to the queue, specifying delivery mode, priority, and 
+    * time to live.
+    *
+    * @param message the message to send
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with a <CODE>QueueSender</CODE> with
+    *                         an invalid queue.
+    * @exception java.lang.UnsupportedOperationException if a client uses this
+    *                         method with a <CODE>QueueSender</CODE> that did
+    *                         not specify a queue at creation time.
+    */
 
-    /** Sends a message to the queue, specifying delivery mode, priority, and 
-      * time to live.
-      *
-      * @param message the message to send
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with a <CODE>QueueSender</CODE> with
-      *                         an invalid queue.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>QueueSender</CODE> that did
-      *                         not specify a queue at creation time.
-      */
+  void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
 
-    void 
-    send(Message message, 
-	 int deliveryMode, 
-	 int priority,
-	 long timeToLive) throws JMSException;
+  /** Sends a message to a queue for an unidentified message producer.
+    * Uses the <CODE>QueueSender</CODE>'s default delivery mode, priority,
+    * and time to live.
+    *
+    * <P>Typically, a message producer is assigned a queue at creation 
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the queue be supplied every time a message is
+    * sent.
+    *  
+    * @param queue the queue to send this message to
+    * @param message the message to send
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid queue.
+    * 
+    * @see javax.jms.MessageProducer#getDeliveryMode()
+    * @see javax.jms.MessageProducer#getTimeToLive()
+    * @see javax.jms.MessageProducer#getPriority()
+    */
 
+  void send(Queue queue, Message message) throws JMSException;
 
-    /** Sends a message to a queue for an unidentified message producer.
-      * Uses the <CODE>QueueSender</CODE>'s default delivery mode, priority,
-      * and time to live.
-      *
-      * <P>Typically, a message producer is assigned a queue at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the queue be supplied every time a message is
-      * sent.
-      *  
-      * @param queue the queue to send this message to
-      * @param message the message to send
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid queue.
-      * 
-      * @see javax.jms.MessageProducer#getDeliveryMode()
-      * @see javax.jms.MessageProducer#getTimeToLive()
-      * @see javax.jms.MessageProducer#getPriority()
-      */ 
- 
-    void
-    send(Queue queue, Message message) throws JMSException;
- 
- 
-    /** Sends a message to a queue for an unidentified message producer, 
-      * specifying delivery mode, priority and time to live.
-      *  
-      * <P>Typically, a message producer is assigned a queue at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the queue be supplied every time a message is
-      * sent.
-      *  
-      * @param queue the queue to send this message to
-      * @param message the message to send
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid queue.
-      */ 
+  /** Sends a message to a queue for an unidentified message producer, 
+    * specifying delivery mode, priority and time to live.
+    *  
+    * <P>Typically, a message producer is assigned a queue at creation 
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the queue be supplied every time a message is
+    * sent.
+    *  
+    * @param queue the queue to send this message to
+    * @param message the message to send
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid queue.
+    */
 
-    void
-    send(Queue queue, 
-	 Message message, 
-	 int deliveryMode, 
-	 int priority,
-	 long timeToLive) throws JMSException;
+  void send(Queue queue, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java
index 1c9399205e..d722bc3402 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java
@@ -1,187 +1,171 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
-
 package javax.jms;
 
-/** A <CODE>QueueSession</CODE> object provides methods for creating 
-  * <CODE>QueueReceiver</CODE>, <CODE>QueueSender</CODE>, 
-  * <CODE>QueueBrowser</CODE>, and <CODE>TemporaryQueue</CODE> objects.
-  *
-  * <P>If there are messages that have been received but not acknowledged 
-  * when a <CODE>QueueSession</CODE> terminates, these messages will be retained 
-  * and redelivered when a consumer next accesses the queue.
-  *
-  *<P>A <CODE>QueueSession</CODE> is used for creating Point-to-Point specific
-  * objects. In general, use the <CODE>Session</CODE> object. 
-  * The <CODE>QueueSession</CODE> is used to support
-  * existing code. Using the <CODE>Session</CODE> object simplifies the 
-  * programming model, and allows transactions to be used across the two 
-  * messaging domains.
-  * 
-  * <P>A <CODE>QueueSession</CODE> cannot be used to create objects specific to the 
-  * publish/subscribe domain. The following methods inherit from 
-  * <CODE>Session</CODE>, but must throw an
-  * <CODE>IllegalStateException</CODE> 
-  * if they are used from <CODE>QueueSession</CODE>:
-  *<UL>
-  *   <LI><CODE>createDurableSubscriber</CODE>
-  *   <LI><CODE>createTemporaryTopic</CODE>
-  *   <LI><CODE>createTopic</CODE>
-  *   <LI><CODE>unsubscribe</CODE>
-  * </UL>
-  *
-  * @version     1.1 - April 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session
-  * @see         javax.jms.QueueConnection#createQueueSession(boolean, int)
-  * @see         javax.jms.XAQueueSession#getQueueSession()
-  */
-
-public interface QueueSession extends Session {
-
-    /** Creates a queue identity given a <CODE>Queue</CODE> name.
-      *
-      * <P>This facility is provided for the rare cases where clients need to
-      * dynamically manipulate queue identity. It allows the creation of a
-      * queue identity with a provider-specific name. Clients that depend 
-      * on this ability are not portable.
-      *
-      * <P>Note that this method is not for creating the physical queue. 
-      * The physical creation of queues is an administrative task and is not
-      * to be initiated by the JMS API. The one exception is the
-      * creation of temporary queues, which is accomplished with the 
-      * <CODE>createTemporaryQueue</CODE> method.
-      *
-      * @param queueName the name of this <CODE>Queue</CODE>
-      *
-      * @return a <CODE>Queue</CODE> with the given name
-      *
-      * @exception JMSException if the session fails to create a queue
-      *                         due to some internal error.
-      */ 
- 
-    Queue
-    createQueue(String queueName) throws JMSException;
-
-
-    /** Creates a <CODE>QueueReceiver</CODE> object to receive messages from the
-      * specified queue.
-      *
-      * @param queue the <CODE>Queue</CODE> to access
-      *
-      * @exception JMSException if the session fails to create a receiver
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      */
-
-    QueueReceiver
-    createReceiver(Queue queue) throws JMSException;
-
-
-    /** Creates a <CODE>QueueReceiver</CODE> object to receive messages from the 
-      * specified queue using a message selector.
-      *  
-      * @param queue the <CODE>Queue</CODE> to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      *  
-      * @exception JMSException if the session fails to create a receiver
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      */ 
-
-    QueueReceiver
-    createReceiver(Queue queue, 
-		   String messageSelector) throws JMSException;
-
-
-    /** Creates a <CODE>QueueSender</CODE> object to send messages to the 
-      * specified queue.
-      *
-      * @param queue the <CODE>Queue</CODE> to access, or null if this is an 
-      * unidentified producer
-      *
-      * @exception JMSException if the session fails to create a sender
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      */
- 
-    QueueSender
-    createSender(Queue queue) throws JMSException;
-
-
-    /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue.
-      *
-      * @param queue the <CODE>Queue</CODE> to access
-      *
-      * @exception JMSException if the session fails to create a browser
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      */
-
-    QueueBrowser 
-    createBrowser(Queue queue) throws JMSException;
-
-
-    /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue using a message selector.
-      *  
-      * @param queue the <CODE>Queue</CODE> to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      *  
-      * @exception JMSException if the session fails to create a browser
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      */ 
-
-    QueueBrowser
-    createBrowser(Queue queue,
-		  String messageSelector) throws JMSException;
-
-
-    /** Creates a <CODE>TemporaryQueue</CODE> object. Its lifetime will be that 
-      * of the <CODE>QueueConnection</CODE> unless it is deleted earlier.
-      *
-      * @return a temporary queue identity
-      *
-      * @exception JMSException if the session fails to create a temporary queue
-      *                         due to some internal error.
-      */
-
-    TemporaryQueue
-    createTemporaryQueue() throws JMSException;
+/** A <CODE>QueueSession</CODE> object provides methods for creating
+ * <CODE>QueueReceiver</CODE>, <CODE>QueueSender</CODE>,
+ * <CODE>QueueBrowser</CODE>, and <CODE>TemporaryQueue</CODE> objects.
+ *
+ * <P>If there are messages that have been received but not acknowledged
+ * when a <CODE>QueueSession</CODE> terminates, these messages will be retained
+ * and redelivered when a consumer next accesses the queue.
+ *
+ *<P>A <CODE>QueueSession</CODE> is used for creating Point-to-Point specific
+ * objects. In general, use the <CODE>Session</CODE> object.
+ * The <CODE>QueueSession</CODE> is used to support
+ * existing code. Using the <CODE>Session</CODE> object simplifies the
+ * programming model, and allows transactions to be used across the two
+ * messaging domains.
+ *
+ * <P>A <CODE>QueueSession</CODE> cannot be used to create objects specific to the
+ * publish/subscribe domain. The following methods inherit from
+ * <CODE>Session</CODE>, but must throw an
+ * <CODE>IllegalStateException</CODE>
+ * if they are used from <CODE>QueueSession</CODE>:
+ *<UL>
+ *   <LI><CODE>createDurableSubscriber</CODE>
+ *   <LI><CODE>createTemporaryTopic</CODE>
+ *   <LI><CODE>createTopic</CODE>
+ *   <LI><CODE>unsubscribe</CODE>
+ * </UL>
+ *
+ * @version     1.1 - April 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session
+ * @see         javax.jms.QueueConnection#createQueueSession(boolean, int)
+ * @see         javax.jms.XAQueueSession#getQueueSession()
+ */
+
+public interface QueueSession extends Session
+{
+
+  /** Creates a queue identity given a <CODE>Queue</CODE> name.
+    *
+    * <P>This facility is provided for the rare cases where clients need to
+    * dynamically manipulate queue identity. It allows the creation of a
+    * queue identity with a provider-specific name. Clients that depend 
+    * on this ability are not portable.
+    *
+    * <P>Note that this method is not for creating the physical queue. 
+    * The physical creation of queues is an administrative task and is not
+    * to be initiated by the JMS API. The one exception is the
+    * creation of temporary queues, which is accomplished with the 
+    * <CODE>createTemporaryQueue</CODE> method.
+    *
+    * @param queueName the name of this <CODE>Queue</CODE>
+    *
+    * @return a <CODE>Queue</CODE> with the given name
+    *
+    * @exception JMSException if the session fails to create a queue
+    *                         due to some internal error.
+    */
+
+  Queue createQueue(String queueName) throws JMSException;
+
+  /** Creates a <CODE>QueueReceiver</CODE> object to receive messages from the
+    * specified queue.
+    *
+    * @param queue the <CODE>Queue</CODE> to access
+    *
+    * @exception JMSException if the session fails to create a receiver
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    */
+
+  QueueReceiver createReceiver(Queue queue) throws JMSException;
+
+  /** Creates a <CODE>QueueReceiver</CODE> object to receive messages from the 
+    * specified queue using a message selector.
+    *  
+    * @param queue the <CODE>Queue</CODE> to access
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    *  
+    * @exception JMSException if the session fails to create a receiver
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    *
+    */
+
+  QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException;
+
+  /** Creates a <CODE>QueueSender</CODE> object to send messages to the 
+    * specified queue.
+    *
+    * @param queue the <CODE>Queue</CODE> to access, or null if this is an 
+    * unidentified producer
+    *
+    * @exception JMSException if the session fails to create a sender
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    */
+
+  QueueSender createSender(Queue queue) throws JMSException;
+
+  /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
+    * the specified queue.
+    *
+    * @param queue the <CODE>Queue</CODE> to access
+    *
+    * @exception JMSException if the session fails to create a browser
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    */
+
+  QueueBrowser createBrowser(Queue queue) throws JMSException;
+
+  /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
+    * the specified queue using a message selector.
+    *  
+    * @param queue the <CODE>Queue</CODE> to access
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    *  
+    * @exception JMSException if the session fails to create a browser
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    */
+
+  QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException;
+
+  /** Creates a <CODE>TemporaryQueue</CODE> object. Its lifetime will be that 
+    * of the <CODE>QueueConnection</CODE> unless it is deleted earlier.
+    *
+    * @return a temporary queue identity
+    *
+    * @exception JMSException if the session fails to create a temporary queue
+    *                         due to some internal error.
+    */
+
+  TemporaryQueue createTemporaryQueue() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ResourceAllocationException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ResourceAllocationException.java
index 9a865d2752..19e297996f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ResourceAllocationException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ResourceAllocationException.java
@@ -1,33 +1,32 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P>This exception is thrown when a provider is unable to allocate the 
- *    resources required by a method. For example, this exception should be 
- *    thrown when a call to 
+ * <P>This exception is thrown when a provider is unable to allocate the
+ *    resources required by a method. For example, this exception should be
+ *    thrown when a call to
  *    <CODE>TopicConnectionFactory.createTopicConnection</CODE> fails due to a
  *    lack of JMS provider resources.
  *
@@ -35,28 +34,31 @@ package javax.jms;
  * @author      Rahul Sharma
  **/
 
-public class ResourceAllocationException extends JMSException {
+public class ResourceAllocationException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>ResourceAllocationException</CODE> with the specified 
+  /** Constructs a <CODE>ResourceAllocationException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  ResourceAllocationException(String reason, String errorCode) {
+  public ResourceAllocationException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>ResourceAllocationException</CODE> with the specified 
+  /** Constructs a <CODE>ResourceAllocationException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  ResourceAllocationException(String reason) {
+  public ResourceAllocationException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java
index 85a224e1fd..d666104dc2 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java
@@ -1,102 +1,99 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>ServerSession</CODE> object is an application server object that 
-  * is used by a server to associate a thread with a JMS session (optional).
-  *
-  * <P>A <CODE>ServerSession</CODE> implements two methods:
-  *
-  * <UL>
-  *   <LI><CODE>getSession</CODE> - returns the <CODE>ServerSession</CODE>'s 
-  *       JMS session.
-  *   <LI><CODE>start</CODE> - starts the execution of the 
-  *       <CODE>ServerSession</CODE> 
-  *       thread and results in the execution of the JMS session's 
-  *       <CODE>run</CODE> method.
-  * </UL>
-  *
-  * <P>A <CODE>ConnectionConsumer</CODE> implemented by a JMS provider uses a 
-  * <CODE>ServerSession</CODE> to process one or more messages that have 
-  * arrived. It does this by getting a <CODE>ServerSession</CODE> from the 
-  * <CODE>ConnectionConsumer</CODE>'s <CODE>ServerSessionPool</CODE>; getting 
-  * the <CODE>ServerSession</CODE>'s JMS session; loading it with the messages; 
-  * and then starting the <CODE>ServerSession</CODE>.
-  *
-  * <P>In most cases the <CODE>ServerSession</CODE> will register some object 
-  * it provides as the <CODE>ServerSession</CODE>'s thread run object. The 
-  * <CODE>ServerSession</CODE>'s <CODE>start</CODE> method will call the 
-  * thread's <CODE>start</CODE> method, which will start the new thread, and 
-  * from it, call the <CODE>run</CODE> method of the 
-  * <CODE>ServerSession</CODE>'s run object. This object will do some 
-  * housekeeping and then call the <CODE>Session</CODE>'s <CODE>run</CODE> 
-  * method. When <CODE>run</CODE> returns, the <CODE>ServerSession</CODE>'s run 
-  * object can return the <CODE>ServerSession</CODE> to the 
-  * <CODE>ServerSessionPool</CODE>, and the cycle starts again.
-  *
-  * <P>Note that the JMS API does not architect how the 
-  * <CODE>ConnectionConsumer</CODE> loads the <CODE>Session</CODE> with 
-  * messages. Since both the <CODE>ConnectionConsumer</CODE> and 
-  * <CODE>Session</CODE> are implemented by the same JMS provider, they can 
-  * accomplish the load using a private mechanism.
-  *
-  * @version     1.0 - 9 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.ServerSessionPool
-  * @see         javax.jms.ConnectionConsumer
-  */
-
-public interface ServerSession {
+/** A <CODE>ServerSession</CODE> object is an application server object that
+ * is used by a server to associate a thread with a JMS session (optional).
+ *
+ * <P>A <CODE>ServerSession</CODE> implements two methods:
+ *
+ * <UL>
+ *   <LI><CODE>getSession</CODE> - returns the <CODE>ServerSession</CODE>'s
+ *       JMS session.
+ *   <LI><CODE>start</CODE> - starts the execution of the
+ *       <CODE>ServerSession</CODE>
+ *       thread and results in the execution of the JMS session's
+ *       <CODE>run</CODE> method.
+ * </UL>
+ *
+ * <P>A <CODE>ConnectionConsumer</CODE> implemented by a JMS provider uses a
+ * <CODE>ServerSession</CODE> to process one or more messages that have
+ * arrived. It does this by getting a <CODE>ServerSession</CODE> from the
+ * <CODE>ConnectionConsumer</CODE>'s <CODE>ServerSessionPool</CODE>; getting
+ * the <CODE>ServerSession</CODE>'s JMS session; loading it with the messages;
+ * and then starting the <CODE>ServerSession</CODE>.
+ *
+ * <P>In most cases the <CODE>ServerSession</CODE> will register some object
+ * it provides as the <CODE>ServerSession</CODE>'s thread run object. The
+ * <CODE>ServerSession</CODE>'s <CODE>start</CODE> method will call the
+ * thread's <CODE>start</CODE> method, which will start the new thread, and
+ * from it, call the <CODE>run</CODE> method of the
+ * <CODE>ServerSession</CODE>'s run object. This object will do some
+ * housekeeping and then call the <CODE>Session</CODE>'s <CODE>run</CODE>
+ * method. When <CODE>run</CODE> returns, the <CODE>ServerSession</CODE>'s run
+ * object can return the <CODE>ServerSession</CODE> to the
+ * <CODE>ServerSessionPool</CODE>, and the cycle starts again.
+ *
+ * <P>Note that the JMS API does not architect how the
+ * <CODE>ConnectionConsumer</CODE> loads the <CODE>Session</CODE> with
+ * messages. Since both the <CODE>ConnectionConsumer</CODE> and
+ * <CODE>Session</CODE> are implemented by the same JMS provider, they can
+ * accomplish the load using a private mechanism.
+ *
+ * @version     1.0 - 9 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.ServerSessionPool
+ * @see         javax.jms.ConnectionConsumer
+ */
 
-    /** Return the <CODE>ServerSession</CODE>'s <CODE>Session</CODE>. This must 
-      * be a <CODE>Session</CODE> created by the same <CODE>Connection</CODE> 
-      * that will be dispatching messages to it. The provider will assign one or
-      * more messages to the <CODE>Session</CODE> 
-      * and then call <CODE>start</CODE> on the <CODE>ServerSession</CODE>.
-      *
-      * @return the server session's session
-      *  
-      * @exception JMSException if the JMS provider fails to get the associated
-      *                         session for this <CODE>ServerSession</CODE> due
-      *                         to some internal error.
-      **/
+public interface ServerSession
+{
 
-    Session
-    getSession() throws JMSException;
+  /** Return the <CODE>ServerSession</CODE>'s <CODE>Session</CODE>. This must 
+    * be a <CODE>Session</CODE> created by the same <CODE>Connection</CODE> 
+    * that will be dispatching messages to it. The provider will assign one or
+    * more messages to the <CODE>Session</CODE> 
+    * and then call <CODE>start</CODE> on the <CODE>ServerSession</CODE>.
+    *
+    * @return the server session's session
+    *  
+    * @exception JMSException if the JMS provider fails to get the associated
+    *                         session for this <CODE>ServerSession</CODE> due
+    *                         to some internal error.
+    **/
 
+  Session getSession() throws JMSException;
 
-    /** Cause the <CODE>Session</CODE>'s <CODE>run</CODE> method to be called 
-      * to process messages that were just assigned to it.
-      *  
-      * @exception JMSException if the JMS provider fails to start the server
-      *                         session to process messages due to some internal
-      *                         error.
-      */
+  /** Cause the <CODE>Session</CODE>'s <CODE>run</CODE> method to be called 
+    * to process messages that were just assigned to it.
+    *  
+    * @exception JMSException if the JMS provider fails to start the server
+    *                         session to process messages due to some internal
+    *                         error.
+    */
 
-    void 
-    start() throws JMSException; 
+  void start() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java
index 858b937a2a..b0f826dc6c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java
@@ -1,63 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>ServerSessionPool</CODE> object is an object implemented by an 
-  * application server to provide a pool of <CODE>ServerSession</CODE> objects 
-  * for processing the messages of a <CODE>ConnectionConsumer</CODE> (optional).
-  *
-  * <P>Its only method is <CODE>getServerSession</CODE>. The JMS API does not 
-  * architect how the pool is implemented. It could be a static pool of 
-  * <CODE>ServerSession</CODE> objects, or it could use a sophisticated 
-  * algorithm to dynamically create <CODE>ServerSession</CODE> objects as 
-  * needed.
-  *
-  * <P>If the <CODE>ServerSessionPool</CODE> is out of 
-  * <CODE>ServerSession</CODE> objects, the <CODE>getServerSession</CODE> call 
-  * may block. If a <CODE>ConnectionConsumer</CODE> is blocked, it cannot 
-  * deliver new messages until a <CODE>ServerSession</CODE> is 
-  * eventually returned.
-  *
-  * @version     1.0 - 9 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see javax.jms.ServerSession
-  */
+/** A <CODE>ServerSessionPool</CODE> object is an object implemented by an
+ * application server to provide a pool of <CODE>ServerSession</CODE> objects
+ * for processing the messages of a <CODE>ConnectionConsumer</CODE> (optional).
+ *
+ * <P>Its only method is <CODE>getServerSession</CODE>. The JMS API does not
+ * architect how the pool is implemented. It could be a static pool of
+ * <CODE>ServerSession</CODE> objects, or it could use a sophisticated
+ * algorithm to dynamically create <CODE>ServerSession</CODE> objects as
+ * needed.
+ *
+ * <P>If the <CODE>ServerSessionPool</CODE> is out of
+ * <CODE>ServerSession</CODE> objects, the <CODE>getServerSession</CODE> call
+ * may block. If a <CODE>ConnectionConsumer</CODE> is blocked, it cannot
+ * deliver new messages until a <CODE>ServerSession</CODE> is
+ * eventually returned.
+ *
+ * @version     1.0 - 9 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see javax.jms.ServerSession
+ */
 
-public interface ServerSessionPool {
+public interface ServerSessionPool
+{
 
-    /** Return a server session from the pool.
-      *
-      * @return a server session from the pool
-      *  
-      * @exception JMSException if an application server fails to
-      *                         return a <CODE>ServerSession</CODE> out of its
-      *                         server session pool.
-      */ 
+  /** Return a server session from the pool.
+    *
+    * @return a server session from the pool
+    *  
+    * @exception JMSException if an application server fails to
+    *                         return a <CODE>ServerSession</CODE> out of its
+    *                         server session pool.
+    */
 
-    ServerSession
-    getServerSession() throws JMSException;
+  ServerSession getServerSession() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Session.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
index c71cddfd48..443c05dcc9 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
@@ -1,807 +1,748 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
-
 package javax.jms;
 
 import java.io.Serializable;
 
-/** <P>A <CODE>Session</CODE> object is a single-threaded context for producing and consuming 
-  * messages. Although it may allocate provider resources outside the Java 
-  * virtual machine (JVM), it is considered a lightweight JMS object.
+/** <P>A <CODE>Session</CODE> object is a single-threaded context for producing and consuming
+ * messages. Although it may allocate provider resources outside the Java
+ * virtual machine (JVM), it is considered a lightweight JMS object.
+ *
+ * <P>A session serves several purposes:
+ *
+ * <UL>
+ *   <LI>It is a factory for its message producers and consumers.
+ *   <LI>It supplies provider-optimized message factories.
+ *   <LI>It is a factory for <CODE>TemporaryTopics</CODE> and
+ *        <CODE>TemporaryQueues</CODE>.
+ *   <LI> It provides a way to create <CODE>Queue</CODE> or <CODE>Topic</CODE>
+ *      objects for those clients that need to dynamically manipulate
+ *      provider-specific destination names.
+ *   <LI>It supports a single series of transactions that combine work
+ *       spanning its producers and consumers into atomic units.
+ *   <LI>It defines a serial order for the messages it consumes and
+ *       the messages it produces.
+ *   <LI>It retains messages it consumes until they have been
+ *       acknowledged.
+ *   <LI>It serializes execution of message listeners registered with
+ *       its message consumers.
+ *   <LI> It is a factory for <CODE>QueueBrowsers</CODE>.
+ * </UL>
+ *
+ * <P>A session can create and service multiple message producers and
+ * consumers.
+ *
+ * <P>One typical use is to have a thread block on a synchronous
+ * <CODE>MessageConsumer</CODE> until a message arrives. The thread may then
+ * use one or more of the <CODE>Session</CODE>'s <CODE>MessageProducer</CODE>s.
+ *
+ * <P>If a client desires to have one thread produce messages while others
+ * consume them, the client should use a separate session for its producing
+ * thread.
+ *
+ * <P>Once a connection has been started, any session with one or more
+ * registered message listeners is dedicated to the thread of control that
+ * delivers messages to it. It is erroneous for client code to use this session
+ * or any of its constituent objects from another thread of control. The
+ * only exception to this rule is the use of the session or connection
+ * <CODE>close</CODE> method.
+ *
+ * <P>It should be easy for most clients to partition their work naturally
+ * into sessions. This model allows clients to start simply and incrementally
+ * add message processing complexity as their need for concurrency grows.
+ *
+ * <P>The <CODE>close</CODE> method is the only session method that can be
+ * called while some other session method is being executed in another thread.
+ *
+ * <P>A session may be specified as transacted. Each transacted
+ * session supports a single series of transactions. Each transaction groups
+ * a set of message sends and a set of message receives into an atomic unit
+ * of work. In effect, transactions organize a session's input message
+ * stream and output message stream into series of atomic units. When a
+ * transaction commits, its atomic unit of input is acknowledged and its
+ * associated atomic unit of output is sent. If a transaction rollback is
+ * done, the transaction's sent messages are destroyed and the session's input
+ * is automatically recovered.
+ *
+ * <P>The content of a transaction's input and output units is simply those
+ * messages that have been produced and consumed within the session's current
+ * transaction.
+ *
+ * <P>A transaction is completed using either its session's <CODE>commit</CODE>
+ * method or its session's <CODE>rollback</CODE> method. The completion of a
+ * session's current transaction automatically begins the next. The result is
+ * that a transacted session always has a current transaction within which its
+ * work is done.
+ *
+ * <P>The Java Transaction Service (JTS) or some other transaction monitor may
+ * be used to combine a session's transaction with transactions on other
+ * resources (databases, other JMS sessions, etc.). Since Java distributed
+ * transactions are controlled via the Java Transaction API (JTA), use of the
+ * session's <CODE>commit</CODE> and <CODE>rollback</CODE> methods in
+ * this context is prohibited.
+ *
+ * <P>The JMS API does not require support for JTA; however, it does define
+ * how a provider supplies this support.
+ *
+ * <P>Although it is also possible for a JMS client to handle distributed
+ * transactions directly, it is unlikely that many JMS clients will do this.
+ * Support for JTA in the JMS API is targeted at systems vendors who will be
+ * integrating the JMS API into their application server products.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.QueueSession
+ * @see         javax.jms.TopicSession
+ * @see         javax.jms.XASession
+ */
+
+public interface Session extends Runnable
+{
+
+  /** With this acknowledgment mode, the session automatically acknowledges
+    * a client's receipt of a message either when the session has successfully 
+    * returned from a call to <CODE>receive</CODE> or when the message 
+    * listener the session has called to process the message successfully 
+    * returns.
+    */
+
+  static final int AUTO_ACKNOWLEDGE = 1;
+
+  /** With this acknowledgment mode, the client acknowledges a consumed 
+    * message by calling the message's <CODE>acknowledge</CODE> method. 
+    * Acknowledging a consumed message acknowledges all messages that the 
+    * session has consumed.
+    *
+    * <P>When client acknowledgment mode is used, a client may build up a 
+    * large number of unacknowledged messages while attempting to process 
+    * them. A JMS provider should provide administrators with a way to 
+    * limit client overrun so that clients are not driven to resource 
+    * exhaustion and ensuing failure when some resource they are using 
+    * is temporarily blocked.
+    *
+    * @see javax.jms.Message#acknowledge()
+    */
+
+  static final int CLIENT_ACKNOWLEDGE = 2;
+
+  /** This acknowledgment mode instructs the session to lazily acknowledge 
+    * the delivery of messages. This is likely to result in the delivery of 
+    * some duplicate messages if the JMS provider fails, so it should only be 
+    * used by consumers that can tolerate duplicate messages. Use of this  
+    * mode can reduce session overhead by minimizing the work the 
+    * session does to prevent duplicates.
+    */
+
+  static final int DUPS_OK_ACKNOWLEDGE = 3;
+
+  /** This value is returned from the method 
+   * <CODE>getAcknowledgeMode</CODE> if the session is transacted.
+   * If a <CODE>Session</CODE> is transacted, the acknowledgement mode
+   * is ignored.
+   */
+  static final int SESSION_TRANSACTED = 0;
+
+  /** Creates a <CODE>BytesMessage</CODE> object. A <CODE>BytesMessage</CODE> 
+    * object is used to send a message containing a stream of uninterpreted 
+    * bytes.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  BytesMessage createBytesMessage() throws JMSException;
+
+  /** Creates a <CODE>MapMessage</CODE> object. A <CODE>MapMessage</CODE> 
+    * object is used to send a self-defining set of name-value pairs, where 
+    * names are <CODE>String</CODE> objects and values are primitive values 
+    * in the Java programming language.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  MapMessage createMapMessage() throws JMSException;
+
+  /** Creates a <CODE>Message</CODE> object. The <CODE>Message</CODE> 
+    * interface is the root interface of all JMS messages. A 
+    * <CODE>Message</CODE> object holds all the 
+    * standard message header information. It can be sent when a message 
+    * containing only header information is sufficient.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  Message createMessage() throws JMSException;
+
+  /** Creates an <CODE>ObjectMessage</CODE> object. An 
+    * <CODE>ObjectMessage</CODE> object is used to send a message 
+    * that contains a serializable Java object.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  ObjectMessage createObjectMessage() throws JMSException;
+
+  /** Creates an initialized <CODE>ObjectMessage</CODE> object. An 
+    * <CODE>ObjectMessage</CODE> object is used 
+    * to send a message that contains a serializable Java object.
+    *  
+    * @param object the object to use to initialize this message
+    *
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  ObjectMessage createObjectMessage(Serializable object) throws JMSException;
+
+  /** Creates a <CODE>StreamMessage</CODE> object. A 
+    * <CODE>StreamMessage</CODE> object is used to send a 
+    * self-defining stream of primitive values in the Java programming 
+    * language.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  StreamMessage createStreamMessage() throws JMSException;
+
+  /** Creates a <CODE>TextMessage</CODE> object. A <CODE>TextMessage</CODE> 
+    * object is used to send a message containing a <CODE>String</CODE>
+    * object.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  TextMessage createTextMessage() throws JMSException;
+
+  /** Creates an initialized <CODE>TextMessage</CODE> object. A 
+    * <CODE>TextMessage</CODE> object is used to send 
+    * a message containing a <CODE>String</CODE>.
+    *
+    * @param text the string used to initialize this message
+    *
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  TextMessage createTextMessage(String text) throws JMSException;
+
+  /** Indicates whether the session is in transacted mode.
+    *  
+    * @return true if the session is in transacted mode
+    *  
+    * @exception JMSException if the JMS provider fails to return the 
+    *                         transaction mode due to some internal error.
+    */
+
+  boolean getTransacted() throws JMSException;
+
+  /** Returns the acknowledgement mode of the session. The acknowledgement
+   * mode is set at the time that the session is created. If the session is
+   * transacted, the acknowledgement mode is ignored.
+   *
+   *@return            If the session is not transacted, returns the 
+   *                  current acknowledgement mode for the session.
+   *                  If the session
+   *                  is transacted, returns SESSION_TRANSACTED.
+   *
+   *@exception JMSException   if the JMS provider fails to return the 
+   *                         acknowledgment mode due to some internal error.
+   *
+   *@see Connection#createSession
+   *@since 1.1
+   */
+  int getAcknowledgeMode() throws JMSException;
+
+  /** Commits all messages done in this transaction and releases any locks
+    * currently held.
+    *
+    * @exception JMSException if the JMS provider fails to commit the
+    *                         transaction due to some internal error.
+    * @exception TransactionRolledBackException if the transaction
+    *                         is rolled back due to some internal error
+    *                         during commit.
+    * @exception IllegalStateException if the method is not called by a 
+    *                         transacted session.
+    */
+
+  void commit() throws JMSException;
+
+  /** Rolls back any messages done in this transaction and releases any locks 
+    * currently held.
+    *
+    * @exception JMSException if the JMS provider fails to roll back the
+    *                         transaction due to some internal error.
+    * @exception IllegalStateException if the method is not called by a 
+    *                         transacted session.
+    *                                     
+    */
+
+  void rollback() throws JMSException;
+
+  /** Closes the session.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a session 
+    * outside the JVM, clients should close the resources when they are not 
+    * needed. 
+    * Relying on garbage collection to eventually reclaim these resources 
+    * may not be timely enough.
+    *
+    * <P>There is no need to close the producers and consumers
+    * of a closed session. 
+    *
+    * <P> This call will block until a <CODE>receive</CODE> call or message 
+    * listener in progress has completed. A blocked message consumer
+    * <CODE>receive</CODE> call returns <CODE>null</CODE> when this session 
+    * is closed.
+    *
+    * <P>Closing a transacted session must roll back the transaction
+    * in progress.
+    * 
+    * <P>This method is the only <CODE>Session</CODE> method that can 
+    * be called concurrently. 
+    *
+    * <P>Invoking any other <CODE>Session</CODE> method on a closed session 
+    * must throw a <CODE>JMSException.IllegalStateException</CODE>. Closing a 
+    * closed session must <I>not</I> throw an exception.
+    * 
+    * @exception JMSException if the JMS provider fails to close the
+    *                         session due to some internal error.
+    */
+
+  void close() throws JMSException;
+
+  /** Stops message delivery in this session, and restarts message delivery
+    * with the oldest unacknowledged message.
+    *  
+    * <P>All consumers deliver messages in a serial order.
+    * Acknowledging a received message automatically acknowledges all 
+    * messages that have been delivered to the client.
+    *
+    * <P>Restarting a session causes it to take the following actions:
+    *
+    * <UL>
+    *   <LI>Stop message delivery
+    *   <LI>Mark all messages that might have been delivered but not 
+    *       acknowledged as "redelivered"
+    *   <LI>Restart the delivery sequence including all unacknowledged 
+    *       messages that had been previously delivered. Redelivered messages
+    *       do not have to be delivered in 
+    *       exactly their original delivery order.
+    * </UL>
+    *
+    * @exception JMSException if the JMS provider fails to stop and restart
+    *                         message delivery due to some internal error.
+    * @exception IllegalStateException if the method is called by a 
+    *                         transacted session.
+    */
+
+  void recover() throws JMSException;
+
+  /** Returns the session's distinguished message listener (optional).
+    *
+    * @return the message listener associated with this session
+    *
+    * @exception JMSException if the JMS provider fails to get the message 
+    *                         listener due to an internal error.
+    *
+    * @see javax.jms.Session#setMessageListener
+    * @see javax.jms.ServerSessionPool
+    * @see javax.jms.ServerSession
+    */
+
+  MessageListener getMessageListener() throws JMSException;
+
+  /** Sets the session's distinguished message listener (optional).
+    *
+    * <P>When the distinguished message listener is set, no other form of 
+    * message receipt in the session can 
+    * be used; however, all forms of sending messages are still supported.
+    * 
+    * <P>This is an expert facility not used by regular JMS clients.
+    *
+    * @param listener the message listener to associate with this session
+    *
+    * @exception JMSException if the JMS provider fails to set the message 
+    *                         listener due to an internal error.
+    *
+    * @see javax.jms.Session#getMessageListener
+    * @see javax.jms.ServerSessionPool
+    * @see javax.jms.ServerSession
+    */
+
+  void setMessageListener(MessageListener listener) throws JMSException;
+
+  /**
+   * Optional operation, intended to be used only by Application Servers,
+   * not by ordinary JMS clients.
+   *
+   * @see javax.jms.ServerSession
+   */
+  public void run();
+
+  /** Creates a <CODE>MessageProducer</CODE> to send messages to the specified 
+    * destination.
+    *
+    * <P>A client uses a <CODE>MessageProducer</CODE> object to send 
+    * messages to a destination. Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
+    * both inherit from <CODE>Destination</CODE>, they can be used in
+    * the destination parameter to create a <CODE>MessageProducer</CODE> object.
+    * 
+    * @param destination the <CODE>Destination</CODE> to send to, 
+    * or null if this is a producer which does not have a specified 
+    * destination.
+    *
+    * @exception JMSException if the session fails to create a MessageProducer
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid destination
+    * is specified.
+    *
+    * @since 1.1 
+    * 
+   */
+
+  MessageProducer createProducer(Destination destination) throws JMSException;
+
+  /** Creates a <CODE>MessageConsumer</CODE> for the specified destination.
+  * Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
+  * both inherit from <CODE>Destination</CODE>, they can be used in
+  * the destination parameter to create a <CODE>MessageConsumer</CODE>.
+  *
+  * @param destination the <CODE>Destination</CODE> to access. 
+  *
+  * @exception JMSException if the session fails to create a consumer
+  *                         due to some internal error.
+  * @exception InvalidDestinationException if an invalid destination 
+  *                         is specified.
+  *
+  * @since 1.1 
+  */
+
+  MessageConsumer createConsumer(Destination destination) throws JMSException;
+
+  /** Creates a <CODE>MessageConsumer</CODE> for the specified destination, 
+  * using a message selector. 
+  * Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
+  * both inherit from <CODE>Destination</CODE>, they can be used in
+  * the destination parameter to create a <CODE>MessageConsumer</CODE>.
   *
-  * <P>A session serves several purposes:
+  * <P>A client uses a <CODE>MessageConsumer</CODE> object to receive 
+  * messages that have been sent to a destination.
+  *  
+  *       
+  * @param destination the <CODE>Destination</CODE> to access
+  * @param messageSelector only messages with properties matching the
+  * message selector expression are delivered. A value of null or
+  * an empty string indicates that there is no message selector 
+  * for the message consumer. 
+  * 
+  *  
+  * @exception JMSException if the session fails to create a MessageConsumer
+  *                         due to some internal error.
+  * @exception InvalidDestinationException if an invalid destination
+  * is specified.
+  
+  * @exception InvalidSelectorException if the message selector is invalid.
   *
-  * <UL>
-  *   <LI>It is a factory for its message producers and consumers.
-  *   <LI>It supplies provider-optimized message factories.
-  *   <LI>It is a factory for <CODE>TemporaryTopics</CODE> and 
-  *        <CODE>TemporaryQueues</CODE>. 
-  *   <LI> It provides a way to create <CODE>Queue</CODE> or <CODE>Topic</CODE>
-  *      objects for those clients that need to dynamically manipulate 
-  *      provider-specific destination names.
-  *   <LI>It supports a single series of transactions that combine work 
-  *       spanning its producers and consumers into atomic units.
-  *   <LI>It defines a serial order for the messages it consumes and 
-  *       the messages it produces.
-  *   <LI>It retains messages it consumes until they have been 
-  *       acknowledged.
-  *   <LI>It serializes execution of message listeners registered with 
-  *       its message consumers.
-  *   <LI> It is a factory for <CODE>QueueBrowsers</CODE>.
-  * </UL>
+  * @since 1.1 
+  */
+  MessageConsumer createConsumer(Destination destination, java.lang.String messageSelector) throws JMSException;
+
+  /** Creates <CODE>MessageConsumer</CODE> for the specified destination, using a
+   * message selector. This method can specify whether messages published by 
+   * its own connection should be delivered to it, if the destination is a 
+   * topic. 
+   *<P> Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
+   * both inherit from <CODE>Destination</CODE>, they can be used in
+   * the destination parameter to create a <CODE>MessageConsumer</CODE>.
+   * <P>A client uses a <CODE>MessageConsumer</CODE> object to receive 
+   * messages that have been published to a destination. 
+   *               
+   * <P>In some cases, a connection may both publish and subscribe to a 
+   * topic. The consumer <CODE>NoLocal</CODE> attribute allows a consumer
+   * to inhibit the delivery of messages published by its own connection.
+   * The default value for this attribute is False. The <CODE>noLocal</CODE> 
+   * value must be supported by destinations that are topics. 
+   *
+   * @param destination the <CODE>Destination</CODE> to access 
+   * @param messageSelector only messages with properties matching the
+   * message selector expression are delivered. A value of null or
+   * an empty string indicates that there is no message selector 
+   * for the message consumer.
+   * @param NoLocal  - if true, and the destination is a topic,
+   *                   inhibits the delivery of messages published
+   *                   by its own connection.  The behavior for
+   *                   <CODE>NoLocal</CODE> is 
+   *                   not specified if the destination is a queue.
+   * 
+   * @exception JMSException if the session fails to create a MessageConsumer
+   *                         due to some internal error.
+   * @exception InvalidDestinationException if an invalid destination
+    * is specified.
+  
+   * @exception InvalidSelectorException if the message selector is invalid.
+   *
+   * @since 1.1 
+   *
+   */
+  MessageConsumer createConsumer(Destination destination, java.lang.String messageSelector, boolean NoLocal)
+      throws JMSException;
+
+  /** Creates a queue identity given a <CODE>Queue</CODE> name.
   *
-  * <P>A session can create and service multiple message producers and 
-  * consumers.
+  * <P>This facility is provided for the rare cases where clients need to
+  * dynamically manipulate queue identity. It allows the creation of a
+  * queue identity with a provider-specific name. Clients that depend 
+  * on this ability are not portable.
   *
-  * <P>One typical use is to have a thread block on a synchronous 
-  * <CODE>MessageConsumer</CODE> until a message arrives. The thread may then
-  * use one or more of the <CODE>Session</CODE>'s <CODE>MessageProducer</CODE>s.
+  * <P>Note that this method is not for creating the physical queue. 
+  * The physical creation of queues is an administrative task and is not
+  * to be initiated by the JMS API. The one exception is the
+  * creation of temporary queues, which is accomplished with the 
+  * <CODE>createTemporaryQueue</CODE> method.
   *
-  * <P>If a client desires to have one thread produce messages while others 
-  * consume them, the client should use a separate session for its producing 
-  * thread.
+  * @param queueName the name of this <CODE>Queue</CODE>
   *
-  * <P>Once a connection has been started, any session with one or more 
-  * registered message listeners is dedicated to the thread of control that 
-  * delivers messages to it. It is erroneous for client code to use this session
-  * or any of its constituent objects from another thread of control. The
-  * only exception to this rule is the use of the session or connection 
-  * <CODE>close</CODE> method.
+  * @return a <CODE>Queue</CODE> with the given name
   *
-  * <P>It should be easy for most clients to partition their work naturally
-  * into sessions. This model allows clients to start simply and incrementally
-  * add message processing complexity as their need for concurrency grows.
+  * @exception JMSException if the session fails to create a queue
+  *                         due to some internal error.
+  * @since 1.1
+  */
+
+  Queue createQueue(String queueName) throws JMSException;
+
+  /** Creates a topic identity given a <CODE>Topic</CODE> name.
   *
-  * <P>The <CODE>close</CODE> method is the only session method that can be 
-  * called while some other session method is being executed in another thread.
+  * <P>This facility is provided for the rare cases where clients need to
+  * dynamically manipulate topic identity. This allows the creation of a
+  * topic identity with a provider-specific name. Clients that depend 
+  * on this ability are not portable.
   *
-  * <P>A session may be specified as transacted. Each transacted 
-  * session supports a single series of transactions. Each transaction groups 
-  * a set of message sends and a set of message receives into an atomic unit 
-  * of work. In effect, transactions organize a session's input message 
-  * stream and output message stream into series of atomic units. When a 
-  * transaction commits, its atomic unit of input is acknowledged and its 
-  * associated atomic unit of output is sent. If a transaction rollback is 
-  * done, the transaction's sent messages are destroyed and the session's input 
-  * is automatically recovered.
+  * <P>Note that this method is not for creating the physical topic. 
+  * The physical creation of topics is an administrative task and is not
+  * to be initiated by the JMS API. The one exception is the
+  * creation of temporary topics, which is accomplished with the 
+  * <CODE>createTemporaryTopic</CODE> method.
+  *  
+  * @param topicName the name of this <CODE>Topic</CODE>
   *
-  * <P>The content of a transaction's input and output units is simply those 
-  * messages that have been produced and consumed within the session's current 
-  * transaction.
+  * @return a <CODE>Topic</CODE> with the given name
   *
-  * <P>A transaction is completed using either its session's <CODE>commit</CODE>
-  * method or its session's <CODE>rollback</CODE> method. The completion of a
-  * session's current transaction automatically begins the next. The result is
-  * that a transacted session always has a current transaction within which its 
-  * work is done.  
+  * @exception JMSException if the session fails to create a topic
+  *                         due to some internal error.
+  * @since 1.1
+  */
+
+  Topic createTopic(String topicName) throws JMSException;
+
+  /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
+   * the specified queue.
+   *
+   * @param queue the <CODE>queue</CODE> to access
+   *
+   * @exception InvalidDestinationException if an invalid destination
+   *                         is specified 
+   *
+   * @since 1.1 
+   */
+
+  /** Creates a durable subscriber to the specified topic.
+  *  
+  * <P>If a client needs to receive all the messages published on a 
+  * topic, including the ones published while the subscriber is inactive,
+  * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
+  * retains a record of this 
+  * durable subscription and insures that all messages from the topic's 
+  * publishers are retained until they are acknowledged by this 
+  * durable subscriber or they have expired.
   *
-  * <P>The Java Transaction Service (JTS) or some other transaction monitor may 
-  * be used to combine a session's transaction with transactions on other 
-  * resources (databases, other JMS sessions, etc.). Since Java distributed 
-  * transactions are controlled via the Java Transaction API (JTA), use of the 
-  * session's <CODE>commit</CODE> and <CODE>rollback</CODE> methods in 
-  * this context is prohibited.
+  * <P>Sessions with durable subscribers must always provide the same 
+  * client identifier. In addition, each client must specify a name that 
+  * uniquely identifies (within client identifier) each durable 
+  * subscription it creates. Only one session at a time can have a 
+  * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
   *
-  * <P>The JMS API does not require support for JTA; however, it does define 
-  * how a provider supplies this support.
+  * <P>A client can change an existing durable subscription by creating 
+  * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
+  * topic and/or 
+  * message selector. Changing a durable subscriber is equivalent to 
+  * unsubscribing (deleting) the old one and creating a new one.
   *
-  * <P>Although it is also possible for a JMS client to handle distributed 
-  * transactions directly, it is unlikely that many JMS clients will do this.
-  * Support for JTA in the JMS API is targeted at systems vendors who will be 
-  * integrating the JMS API into their application server products.
+  * <P>In some cases, a connection may both publish and subscribe to a 
+  * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
+  * to inhibit the delivery of messages published by its own connection.
+  * The default value for this attribute is false.
   *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
+  * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
+  * @param name the name used to identify this subscription
+  *  
+  * @exception JMSException if the session fails to create a subscriber
+  *                         due to some internal error.
+  * @exception InvalidDestinationException if an invalid topic is specified.
   *
-  * @see         javax.jms.QueueSession
-  * @see         javax.jms.TopicSession
-  * @see         javax.jms.XASession
-  */ 
- 
-public interface Session extends Runnable {
-
-    /** With this acknowledgment mode, the session automatically acknowledges
-      * a client's receipt of a message either when the session has successfully 
-      * returned from a call to <CODE>receive</CODE> or when the message 
-      * listener the session has called to process the message successfully 
-      * returns.
-      */ 
-
-    static final int AUTO_ACKNOWLEDGE = 1;
-
-    /** With this acknowledgment mode, the client acknowledges a consumed 
-      * message by calling the message's <CODE>acknowledge</CODE> method. 
-      * Acknowledging a consumed message acknowledges all messages that the 
-      * session has consumed.
-      *
-      * <P>When client acknowledgment mode is used, a client may build up a 
-      * large number of unacknowledged messages while attempting to process 
-      * them. A JMS provider should provide administrators with a way to 
-      * limit client overrun so that clients are not driven to resource 
-      * exhaustion and ensuing failure when some resource they are using 
-      * is temporarily blocked.
-      *
-      * @see javax.jms.Message#acknowledge()
-      */ 
-
-    static final int CLIENT_ACKNOWLEDGE = 2;
-
-    /** This acknowledgment mode instructs the session to lazily acknowledge 
-      * the delivery of messages. This is likely to result in the delivery of 
-      * some duplicate messages if the JMS provider fails, so it should only be 
-      * used by consumers that can tolerate duplicate messages. Use of this  
-      * mode can reduce session overhead by minimizing the work the 
-      * session does to prevent duplicates.
-      */
-
-    static final int DUPS_OK_ACKNOWLEDGE = 3;
-    
-    /** This value is returned from the method 
-     * <CODE>getAcknowledgeMode</CODE> if the session is transacted.
-     * If a <CODE>Session</CODE> is transacted, the acknowledgement mode
-     * is ignored.
-     */
-    static final int SESSION_TRANSACTED = 0;
-
-    /** Creates a <CODE>BytesMessage</CODE> object. A <CODE>BytesMessage</CODE> 
-      * object is used to send a message containing a stream of uninterpreted 
-      * bytes.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-    
-
-    BytesMessage 
-    createBytesMessage() throws JMSException; 
-
- 
-    /** Creates a <CODE>MapMessage</CODE> object. A <CODE>MapMessage</CODE> 
-      * object is used to send a self-defining set of name-value pairs, where 
-      * names are <CODE>String</CODE> objects and values are primitive values 
-      * in the Java programming language.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    MapMessage 
-    createMapMessage() throws JMSException; 
-
- 
-    /** Creates a <CODE>Message</CODE> object. The <CODE>Message</CODE> 
-      * interface is the root interface of all JMS messages. A 
-      * <CODE>Message</CODE> object holds all the 
-      * standard message header information. It can be sent when a message 
-      * containing only header information is sufficient.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    Message
-    createMessage() throws JMSException;
-
-
-    /** Creates an <CODE>ObjectMessage</CODE> object. An 
-      * <CODE>ObjectMessage</CODE> object is used to send a message 
-      * that contains a serializable Java object.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    ObjectMessage
-    createObjectMessage() throws JMSException; 
-
-
-    /** Creates an initialized <CODE>ObjectMessage</CODE> object. An 
-      * <CODE>ObjectMessage</CODE> object is used 
-      * to send a message that contains a serializable Java object.
-      *  
-      * @param object the object to use to initialize this message
-      *
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    ObjectMessage
-    createObjectMessage(Serializable object) throws JMSException;
-
- 
-    /** Creates a <CODE>StreamMessage</CODE> object. A 
-      * <CODE>StreamMessage</CODE> object is used to send a 
-      * self-defining stream of primitive values in the Java programming 
-      * language.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */
-
-    StreamMessage 
-    createStreamMessage() throws JMSException;  
-
- 
-    /** Creates a <CODE>TextMessage</CODE> object. A <CODE>TextMessage</CODE> 
-      * object is used to send a message containing a <CODE>String</CODE>
-      * object.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    TextMessage 
-    createTextMessage() throws JMSException; 
-
-
-    /** Creates an initialized <CODE>TextMessage</CODE> object. A 
-      * <CODE>TextMessage</CODE> object is used to send 
-      * a message containing a <CODE>String</CODE>.
-      *
-      * @param text the string used to initialize this message
-      *
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    TextMessage
-    createTextMessage(String text) throws JMSException;
-
-
-    /** Indicates whether the session is in transacted mode.
-      *  
-      * @return true if the session is in transacted mode
-      *  
-      * @exception JMSException if the JMS provider fails to return the 
-      *                         transaction mode due to some internal error.
-      */ 
-
-    boolean
-    getTransacted() throws JMSException;
-    
-    /** Returns the acknowledgement mode of the session. The acknowledgement
-     * mode is set at the time that the session is created. If the session is
-     * transacted, the acknowledgement mode is ignored.
-     *
-     *@return            If the session is not transacted, returns the 
-     *                  current acknowledgement mode for the session.
-     *                  If the session
-     *                  is transacted, returns SESSION_TRANSACTED.
-     *
-     *@exception JMSException   if the JMS provider fails to return the 
-     *                         acknowledgment mode due to some internal error.
-     *
-     *@see Connection#createSession
-     *@since 1.1
-     */
-    int 
-    getAcknowledgeMode() throws JMSException;
-
-
-    /** Commits all messages done in this transaction and releases any locks
-      * currently held.
-      *
-      * @exception JMSException if the JMS provider fails to commit the
-      *                         transaction due to some internal error.
-      * @exception TransactionRolledBackException if the transaction
-      *                         is rolled back due to some internal error
-      *                         during commit.
-      * @exception IllegalStateException if the method is not called by a 
-      *                         transacted session.
-      */
-
-    void
-    commit() throws JMSException;
-
-
-    /** Rolls back any messages done in this transaction and releases any locks 
-      * currently held.
-      *
-      * @exception JMSException if the JMS provider fails to roll back the
-      *                         transaction due to some internal error.
-      * @exception IllegalStateException if the method is not called by a 
-      *                         transacted session.
-      *                                     
-      */
-
-    void
-    rollback() throws JMSException;
-
-
-    /** Closes the session.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a session 
-      * outside the JVM, clients should close the resources when they are not 
-      * needed. 
-      * Relying on garbage collection to eventually reclaim these resources 
-      * may not be timely enough.
-      *
-      * <P>There is no need to close the producers and consumers
-      * of a closed session. 
-      *
-      * <P> This call will block until a <CODE>receive</CODE> call or message 
-      * listener in progress has completed. A blocked message consumer
-      * <CODE>receive</CODE> call returns <CODE>null</CODE> when this session 
-      * is closed.
-      *
-      * <P>Closing a transacted session must roll back the transaction
-      * in progress.
-      * 
-      * <P>This method is the only <CODE>Session</CODE> method that can 
-      * be called concurrently. 
-      *
-      * <P>Invoking any other <CODE>Session</CODE> method on a closed session 
-      * must throw a <CODE>JMSException.IllegalStateException</CODE>. Closing a 
-      * closed session must <I>not</I> throw an exception.
-      * 
-      * @exception JMSException if the JMS provider fails to close the
-      *                         session due to some internal error.
-      */
-
-    void
-    close() throws JMSException;
-
-
-    /** Stops message delivery in this session, and restarts message delivery
-      * with the oldest unacknowledged message.
-      *  
-      * <P>All consumers deliver messages in a serial order.
-      * Acknowledging a received message automatically acknowledges all 
-      * messages that have been delivered to the client.
-      *
-      * <P>Restarting a session causes it to take the following actions:
-      *
-      * <UL>
-      *   <LI>Stop message delivery
-      *   <LI>Mark all messages that might have been delivered but not 
-      *       acknowledged as "redelivered"
-      *   <LI>Restart the delivery sequence including all unacknowledged 
-      *       messages that had been previously delivered. Redelivered messages
-      *       do not have to be delivered in 
-      *       exactly their original delivery order.
-      * </UL>
-      *
-      * @exception JMSException if the JMS provider fails to stop and restart
-      *                         message delivery due to some internal error.
-      * @exception IllegalStateException if the method is called by a 
-      *                         transacted session.
-      */ 
-
-    void
-    recover() throws JMSException;
-
-
-    /** Returns the session's distinguished message listener (optional).
-      *
-      * @return the message listener associated with this session
-      *
-      * @exception JMSException if the JMS provider fails to get the message 
-      *                         listener due to an internal error.
-      *
-      * @see javax.jms.Session#setMessageListener
-      * @see javax.jms.ServerSessionPool
-      * @see javax.jms.ServerSession
-      */
-
-    MessageListener
-    getMessageListener() throws JMSException;
-
-
-    /** Sets the session's distinguished message listener (optional).
-      *
-      * <P>When the distinguished message listener is set, no other form of 
-      * message receipt in the session can 
-      * be used; however, all forms of sending messages are still supported.
-      * 
-      * <P>This is an expert facility not used by regular JMS clients.
-      *
-      * @param listener the message listener to associate with this session
-      *
-      * @exception JMSException if the JMS provider fails to set the message 
-      *                         listener due to an internal error.
-      *
-      * @see javax.jms.Session#getMessageListener
-      * @see javax.jms.ServerSessionPool
-      * @see javax.jms.ServerSession
-      */
-
-    void
-    setMessageListener(MessageListener listener) throws JMSException;
-
-    /**
-     * Optional operation, intended to be used only by Application Servers,
-     * not by ordinary JMS clients.
-     *
-     * @see javax.jms.ServerSession
-     */
-    public void run();
-    
-    /** Creates a <CODE>MessageProducer</CODE> to send messages to the specified 
-      * destination.
-      *
-      * <P>A client uses a <CODE>MessageProducer</CODE> object to send 
-      * messages to a destination. Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
-      * both inherit from <CODE>Destination</CODE>, they can be used in
-      * the destination parameter to create a <CODE>MessageProducer</CODE> object.
-      * 
-      * @param destination the <CODE>Destination</CODE> to send to, 
-      * or null if this is a producer which does not have a specified 
-      * destination.
-      *
-      * @exception JMSException if the session fails to create a MessageProducer
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-      * is specified.
-      *
-      * @since 1.1 
-      * 
-     */
-
-    MessageProducer
-    createProducer(Destination destination) throws JMSException;
-    
-    
-       /** Creates a <CODE>MessageConsumer</CODE> for the specified destination.
-      * Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
-      * both inherit from <CODE>Destination</CODE>, they can be used in
-      * the destination parameter to create a <CODE>MessageConsumer</CODE>.
-      *
-      * @param destination the <CODE>Destination</CODE> to access. 
-      *
-      * @exception JMSException if the session fails to create a consumer
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination 
-      *                         is specified.
-      *
-      * @since 1.1 
-      */
-
-    MessageConsumer
-    createConsumer(Destination destination) throws JMSException;
-
-       /** Creates a <CODE>MessageConsumer</CODE> for the specified destination, 
-      * using a message selector. 
-      * Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
-      * both inherit from <CODE>Destination</CODE>, they can be used in
-      * the destination parameter to create a <CODE>MessageConsumer</CODE>.
-      *
-      * <P>A client uses a <CODE>MessageConsumer</CODE> object to receive 
-      * messages that have been sent to a destination.
-      *  
-      *       
-      * @param destination the <CODE>Destination</CODE> to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer. 
-      * 
-      *  
-      * @exception JMSException if the session fails to create a MessageConsumer
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-       * is specified.
-     
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1 
-      */
-    MessageConsumer     
-    createConsumer(Destination destination, java.lang.String messageSelector) 
-    throws JMSException;
-    
-    
-     /** Creates <CODE>MessageConsumer</CODE> for the specified destination, using a
-      * message selector. This method can specify whether messages published by 
-      * its own connection should be delivered to it, if the destination is a 
-      * topic. 
-      *<P> Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
-      * both inherit from <CODE>Destination</CODE>, they can be used in
-      * the destination parameter to create a <CODE>MessageConsumer</CODE>.
-      * <P>A client uses a <CODE>MessageConsumer</CODE> object to receive 
-      * messages that have been published to a destination. 
-      *               
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The consumer <CODE>NoLocal</CODE> attribute allows a consumer
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is False. The <CODE>noLocal</CODE> 
-      * value must be supported by destinations that are topics. 
-      *
-      * @param destination the <CODE>Destination</CODE> to access 
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param NoLocal  - if true, and the destination is a topic,
-      *                   inhibits the delivery of messages published
-      *                   by its own connection.  The behavior for
-      *                   <CODE>NoLocal</CODE> is 
-      *                   not specified if the destination is a queue.
-      * 
-      * @exception JMSException if the session fails to create a MessageConsumer
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-       * is specified.
-     
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1 
-      *
-      */
-    MessageConsumer     
-    createConsumer(Destination destination, java.lang.String messageSelector, 
-    boolean NoLocal)   throws JMSException;
-    
-    
-      /** Creates a queue identity given a <CODE>Queue</CODE> name.
-      *
-      * <P>This facility is provided for the rare cases where clients need to
-      * dynamically manipulate queue identity. It allows the creation of a
-      * queue identity with a provider-specific name. Clients that depend 
-      * on this ability are not portable.
-      *
-      * <P>Note that this method is not for creating the physical queue. 
-      * The physical creation of queues is an administrative task and is not
-      * to be initiated by the JMS API. The one exception is the
-      * creation of temporary queues, which is accomplished with the 
-      * <CODE>createTemporaryQueue</CODE> method.
-      *
-      * @param queueName the name of this <CODE>Queue</CODE>
-      *
-      * @return a <CODE>Queue</CODE> with the given name
-      *
-      * @exception JMSException if the session fails to create a queue
-      *                         due to some internal error.
-      * @since 1.1
-      */ 
- 
-    Queue
-    createQueue(String queueName) throws JMSException;
-    
-      /** Creates a topic identity given a <CODE>Topic</CODE> name.
-      *
-      * <P>This facility is provided for the rare cases where clients need to
-      * dynamically manipulate topic identity. This allows the creation of a
-      * topic identity with a provider-specific name. Clients that depend 
-      * on this ability are not portable.
-      *
-      * <P>Note that this method is not for creating the physical topic. 
-      * The physical creation of topics is an administrative task and is not
-      * to be initiated by the JMS API. The one exception is the
-      * creation of temporary topics, which is accomplished with the 
-      * <CODE>createTemporaryTopic</CODE> method.
-      *  
-      * @param topicName the name of this <CODE>Topic</CODE>
-      *
-      * @return a <CODE>Topic</CODE> with the given name
-      *
-      * @exception JMSException if the session fails to create a topic
-      *                         due to some internal error.
-      * @since 1.1
-      */
-
-    Topic
-    createTopic(String topicName) throws JMSException;
-
-     /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue.
-      *
-      * @param queue the <CODE>queue</CODE> to access
-      *
-      * @exception InvalidDestinationException if an invalid destination
-      *                         is specified 
-      *
-      * @since 1.1 
-      */
-    
-    
-      /** Creates a durable subscriber to the specified topic.
-      *  
-      * <P>If a client needs to receive all the messages published on a 
-      * topic, including the ones published while the subscriber is inactive,
-      * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
-      * retains a record of this 
-      * durable subscription and insures that all messages from the topic's 
-      * publishers are retained until they are acknowledged by this 
-      * durable subscriber or they have expired.
-      *
-      * <P>Sessions with durable subscribers must always provide the same 
-      * client identifier. In addition, each client must specify a name that 
-      * uniquely identifies (within client identifier) each durable 
-      * subscription it creates. Only one session at a time can have a 
-      * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
-      *
-      * <P>A client can change an existing durable subscription by creating 
-      * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
-      * topic and/or 
-      * message selector. Changing a durable subscriber is equivalent to 
-      * unsubscribing (deleting) the old one and creating a new one.
-      *
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is false.
-      *
-      * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
-      * @param name the name used to identify this subscription
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      *
-      * @since 1.1
-      */ 
-
-    TopicSubscriber
-    createDurableSubscriber(Topic topic, 
-			    String name) throws JMSException;
-
-
-    /** Creates a durable subscriber to the specified topic, using a
-      * message selector and specifying whether messages published by its
-      * own connection should be delivered to it.
-      *  
-      * <P>If a client needs to receive all the messages published on a 
-      * topic, including the ones published while the subscriber is inactive,
-      * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
-      * retains a record of this 
-      * durable subscription and insures that all messages from the topic's 
-      * publishers are retained until they are acknowledged by this 
-      * durable subscriber or they have expired.
-      *
-      * <P>Sessions with durable subscribers must always provide the same
-      * client identifier. In addition, each client must specify a name which
-      * uniquely identifies (within client identifier) each durable
-      * subscription it creates. Only one session at a time can have a
-      * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
-      * An inactive durable subscriber is one that exists but
-      * does not currently have a message consumer associated with it.
-      *
-      * <P>A client can change an existing durable subscription by creating 
-      * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
-      * topic and/or 
-      * message selector. Changing a durable subscriber is equivalent to 
-      * unsubscribing (deleting) the old one and creating a new one.
-      *
-      * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
-      * @param name the name used to identify this subscription
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param noLocal if set, inhibits the delivery of messages published
-      * by its own connection
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1
-      */ 
- 
-    TopicSubscriber
-    createDurableSubscriber(Topic topic,
-                            String name, 
-			    String messageSelector,
-			    boolean noLocal) throws JMSException;
-    
+  * @since 1.1
+  */
+
+  TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException;
+
+  /** Creates a durable subscriber to the specified topic, using a
+    * message selector and specifying whether messages published by its
+    * own connection should be delivered to it.
+    *  
+    * <P>If a client needs to receive all the messages published on a 
+    * topic, including the ones published while the subscriber is inactive,
+    * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
+    * retains a record of this 
+    * durable subscription and insures that all messages from the topic's 
+    * publishers are retained until they are acknowledged by this 
+    * durable subscriber or they have expired.
+    *
+    * <P>Sessions with durable subscribers must always provide the same
+    * client identifier. In addition, each client must specify a name which
+    * uniquely identifies (within client identifier) each durable
+    * subscription it creates. Only one session at a time can have a
+    * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
+    * An inactive durable subscriber is one that exists but
+    * does not currently have a message consumer associated with it.
+    *
+    * <P>A client can change an existing durable subscription by creating 
+    * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
+    * topic and/or 
+    * message selector. Changing a durable subscriber is equivalent to 
+    * unsubscribing (deleting) the old one and creating a new one.
+    *
+    * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
+    * @param name the name used to identify this subscription
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param noLocal if set, inhibits the delivery of messages published
+    * by its own connection
+    *  
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    *
+    * @since 1.1
+    */
+
+  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
+      throws JMSException;
+
+  /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on
+   * the specified queue.
+   *
+   * @param queue the <CODE>queue</CODE> to access
+   *
+   *
+   * @exception JMSException if the session fails to create a browser
+   *                         due to some internal error.
+   * @exception InvalidDestinationException if an invalid destination
+   *                         is specified
+   *
+   * @since 1.1
+   */
+  QueueBrowser createBrowser(Queue queue) throws JMSException;
+
   /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue.
-      *  
-      * @param queue the <CODE>queue</CODE> to access
-      *
-      *  
-      * @exception JMSException if the session fails to create a browser
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-      *                         is specified 
-      *
-      * @since 1.1 
-      */ 
-    QueueBrowser 
-    createBrowser(Queue queue) throws JMSException;
-
-
-    /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue using a message selector.
-      *  
-      * @param queue the <CODE>queue</CODE> to access
-      *
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      *  
-      * @exception JMSException if the session fails to create a browser
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-      *                         is specified 
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1 
-      */ 
-
-    QueueBrowser
-    createBrowser(Queue queue,
-		  String messageSelector) throws JMSException;
-
-    
-     /** Creates a <CODE>TemporaryQueue</CODE> object. Its lifetime will be that 
-      * of the <CODE>Connection</CODE> unless it is deleted earlier.
-      *
-      * @return a temporary queue identity
-      *
-      * @exception JMSException if the session fails to create a temporary queue
-      *                         due to some internal error.
-      *
-      *@since 1.1
-      */
-
-    TemporaryQueue
-    createTemporaryQueue() throws JMSException;
-   
-
-     /** Creates a <CODE>TemporaryTopic</CODE> object. Its lifetime will be that 
-      * of the <CODE>Connection</CODE> unless it is deleted earlier.
-      *
-      * @return a temporary topic identity
-      *
-      * @exception JMSException if the session fails to create a temporary
-      *                         topic due to some internal error.
-      *
-      * @since 1.1  
-      */
- 
-    TemporaryTopic
-    createTemporaryTopic() throws JMSException;
-
-
-    /** Unsubscribes a durable subscription that has been created by a client.
-      *  
-      * <P>This method deletes the state being maintained on behalf of the 
-      * subscriber by its provider.
-      *
-      * <P>It is erroneous for a client to delete a durable subscription
-      * while there is an active <CODE>MessageConsumer</CODE>
-      * or <CODE>TopicSubscriber</CODE> for the 
-      * subscription, or while a consumed message is part of a pending 
-      * transaction or has not been acknowledged in the session.
-      *
-      * @param name the name used to identify this subscription
-      *  
-      * @exception JMSException if the session fails to unsubscribe to the 
-      *                         durable subscription due to some internal error.
-      * @exception InvalidDestinationException if an invalid subscription name
-      *                                        is specified.
-      *
-      * @since 1.1
-      */
-
-    void
-    unsubscribe(String name) throws JMSException;
-   
+    * the specified queue using a message selector.
+    *  
+    * @param queue the <CODE>queue</CODE> to access
+    *
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    *  
+    * @exception JMSException if the session fails to create a browser
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid destination
+    *                         is specified 
+    * @exception InvalidSelectorException if the message selector is invalid.
+    *
+    * @since 1.1 
+    */
+
+  QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException;
+
+  /** Creates a <CODE>TemporaryQueue</CODE> object. Its lifetime will be that 
+   * of the <CODE>Connection</CODE> unless it is deleted earlier.
+   *
+   * @return a temporary queue identity
+   *
+   * @exception JMSException if the session fails to create a temporary queue
+   *                         due to some internal error.
+   *
+   *@since 1.1
+   */
+
+  TemporaryQueue createTemporaryQueue() throws JMSException;
+
+  /** Creates a <CODE>TemporaryTopic</CODE> object. Its lifetime will be that 
+   * of the <CODE>Connection</CODE> unless it is deleted earlier.
+   *
+   * @return a temporary topic identity
+   *
+   * @exception JMSException if the session fails to create a temporary
+   *                         topic due to some internal error.
+   *
+   * @since 1.1  
+   */
+
+  TemporaryTopic createTemporaryTopic() throws JMSException;
+
+  /** Unsubscribes a durable subscription that has been created by a client.
+    *  
+    * <P>This method deletes the state being maintained on behalf of the 
+    * subscriber by its provider.
+    *
+    * <P>It is erroneous for a client to delete a durable subscription
+    * while there is an active <CODE>MessageConsumer</CODE>
+    * or <CODE>TopicSubscriber</CODE> for the 
+    * subscription, or while a consumed message is part of a pending 
+    * transaction or has not been acknowledged in the session.
+    *
+    * @param name the name used to identify this subscription
+    *  
+    * @exception JMSException if the session fails to unsubscribe to the 
+    *                         durable subscription due to some internal error.
+    * @exception InvalidDestinationException if an invalid subscription name
+    *                                        is specified.
+    *
+    * @since 1.1
+    */
+
+  void unsubscribe(String name) throws JMSException;
+
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java
index d3de3eeb0d..b295f1137e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java
@@ -1,550 +1,499 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** A <CODE>StreamMessage</CODE> object is used to send a stream of primitive
-  * types in the Java programming language. It is filled and read sequentially.
-  * It inherits from the <CODE>Message</CODE> interface
-  * and adds a stream message body. Its methods are based largely on those
-  * found in <CODE>java.io.DataInputStream</CODE> and
-  * <CODE>java.io.DataOutputStream</CODE>.
-  *
-  * <P>The primitive types can be read or written explicitly using methods
-  * for each type. They may also be read or written generically as objects.
-  * For instance, a call to <CODE>StreamMessage.writeInt(6)</CODE> is
-  * equivalent to <CODE>StreamMessage.writeObject(new Integer(6))</CODE>.
-  * Both forms are provided, because the explicit form is convenient for
-  * static programming, and the object form is needed when types are not known
-  * at compile time.
-  *
-  * <P>When the message is first created, and when <CODE>clearBody</CODE>
-  * is called, the body of the message is in write-only mode. After the 
-  * first call to <CODE>reset</CODE> has been made, the message body is in 
-  * read-only mode. 
-  * After a message has been sent, the client that sent it can retain and 
-  * modify it without affecting the message that has been sent. The same message
-  * object can be sent multiple times.
-  * When a message has been received, the provider has called 
-  * <CODE>reset</CODE> so that the message body is in read-only mode for the client.
-  * 
-  * <P>If <CODE>clearBody</CODE> is called on a message in read-only mode, 
-  * the message body is cleared and the message body is in write-only mode.
-  * 
-  * <P>If a client attempts to read a message in write-only mode, a 
-  * <CODE>MessageNotReadableException</CODE> is thrown.
-  * 
-  * <P>If a client attempts to write a message in read-only mode, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown.
-  *
-  * <P><CODE>StreamMessage</CODE> objects support the following conversion 
-  * table. The marked cases must be supported. The unmarked cases must throw a 
-  * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions 
-  * may throw a runtime exception if the primitive's <CODE>valueOf()</CODE> 
-  * method does not accept it as a valid <CODE>String</CODE> representation of 
-  * the primitive.
-  *
-  * <P>A value written as the row type can be read as the column type.
-  *
-  * <PRE>
-  * |        | boolean byte short char int long float double String byte[]
-  * |----------------------------------------------------------------------
-  * |boolean |    X                                            X
-  * |byte    |          X     X         X   X                  X   
-  * |short   |                X         X   X                  X   
-  * |char    |                     X                           X
-  * |int     |                          X   X                  X   
-  * |long    |                              X                  X   
-  * |float   |                                    X     X      X   
-  * |double  |                                          X      X   
-  * |String  |    X     X     X         X   X     X     X      X   
-  * |byte[]  |                                                        X
-  * |----------------------------------------------------------------------
-  * </PRE>
-  *
-  * <P>Attempting to read a null value as a primitive type must be treated
-  * as calling the primitive's corresponding <code>valueOf(String)</code> 
-  * conversion method with a null value. Since <code>char</code> does not 
-  * support a <code>String</code> conversion, attempting to read a null value 
-  * as a <code>char</code> must throw a <code>NullPointerException</code>.
-  *
-  * @version     1.0 - 6 August 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.Session#createStreamMessage()
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.TextMessage
-  */
-
-public interface StreamMessage extends Message {
-
-
-    /** Reads a <code>boolean</code> from the stream message.
-      *
-      * @return the <code>boolean</code> value read
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */
-
-    boolean 
-    readBoolean() throws JMSException;
-
-
-    /** Reads a <code>byte</code> value from the stream message.
-      *
-      * @return the next byte from the stream message as a 8-bit
-      * <code>byte</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    byte 
-    readByte() throws JMSException;
-
-
-    /** Reads a 16-bit integer from the stream message.
-      *
-      * @return a 16-bit integer from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    short 
-    readShort() throws JMSException;
-
-
-    /** Reads a Unicode character value from the stream message.
-      *
-      * @return a Unicode character from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid      
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    char 
-    readChar() throws JMSException;
-
-
-    /** Reads a 32-bit integer from the stream message.
-      *
-      * @return a 32-bit integer value from the stream message, interpreted
-      * as an <code>int</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    int 
-    readInt() throws JMSException;
-
-
-    /** Reads a 64-bit integer from the stream message.
-      *
-      * @return a 64-bit integer value from the stream message, interpreted as
-      * a <code>long</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    long 
-    readLong() throws JMSException;
-
-
-    /** Reads a <code>float</code> from the stream message.
-      *
-      * @return a <code>float</code> value from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    float 
-    readFloat() throws JMSException;
-
-
-    /** Reads a <code>double</code> from the stream message.
-      *
-      * @return a <code>double</code> value from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    double 
-    readDouble() throws JMSException;
-
-
-    /** Reads a <CODE>String</CODE> from the stream message.
-      *
-      * @return a Unicode string from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    String 
-    readString() throws JMSException;
-
-
-    /** Reads a byte array field from the stream message into the 
-      * specified <CODE>byte[]</CODE> object (the read buffer). 
-      * 
-      * <P>To read the field value, <CODE>readBytes</CODE> should be 
-      * successively called 
-      * until it returns a value less than the length of the read buffer.
-      * The value of the bytes in the buffer following the last byte 
-      * read is undefined.
-      * 
-      * <P>If <CODE>readBytes</CODE> returns a value equal to the length of the 
-      * buffer, a subsequent <CODE>readBytes</CODE> call must be made. If there 
-      * are no more bytes to be read, this call returns -1.
-      * 
-      * <P>If the byte array field value is null, <CODE>readBytes</CODE> 
-      * returns -1.
-      *
-      * <P>If the byte array field value is empty, <CODE>readBytes</CODE> 
-      * returns 0.
-      * 
-      * <P>Once the first <CODE>readBytes</CODE> call on a <CODE>byte[]</CODE>
-      * field value has been made,
-      * the full value of the field must be read before it is valid to read 
-      * the next field. An attempt to read the next field before that has 
-      * been done will throw a <CODE>MessageFormatException</CODE>.
-      * 
-      * <P>To read the byte field value into a new <CODE>byte[]</CODE> object, 
-      * use the <CODE>readObject</CODE> method.
-      *
-      * @param value the buffer into which the data is read
-      *
-      * @return the total number of bytes read into the buffer, or -1 if 
-      * there is no more data because the end of the byte field has been 
-      * reached
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      * 
-      * @see #readObject()
-      */ 
-
-    int
-    readBytes(byte[] value) throws JMSException;
-
-
-    /** Reads an object from the stream message.
-      *
-      * <P>This method can be used to return, in objectified format,
-      * an object in the Java programming language ("Java object") that has 
-      * been written to the stream with the equivalent
-      * <CODE>writeObject</CODE> method call, or its equivalent primitive
-      * <CODE>write<I>type</I></CODE> method.
-      *  
-      * <P>Note that byte values are returned as <CODE>byte[]</CODE>, not 
-      * <CODE>Byte[]</CODE>.
-      *
-      * <P>An attempt to call <CODE>readObject</CODE> to read a byte field 
-      * value into a new <CODE>byte[]</CODE> object before the full value of the
-      * byte field has been read will throw a 
-      * <CODE>MessageFormatException</CODE>.
-      *
-      * @return a Java object from the stream message, in objectified
-      * format (for example, if the object was written as an <CODE>int</CODE>, 
-      * an <CODE>Integer</CODE> is returned)
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      * 
-      * @see #readBytes(byte[] value)
-      */ 
-
-    Object 
-    readObject() throws JMSException;
-
-
-
-    /** Writes a <code>boolean</code> to the stream message.
-      * The value <code>true</code> is written as the value 
-      * <code>(byte)1</code>; the value <code>false</code> is written as 
-      * the value <code>(byte)0</code>.
-      *
-      * @param value the <code>boolean</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */
-
-    void 
-    writeBoolean(boolean value) 
-			throws JMSException;
-
-
-    /** Writes a <code>byte</code> to the stream message.
-      *
-      * @param value the <code>byte</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeByte(byte value) throws JMSException;
-
-
-    /** Writes a <code>short</code> to the stream message.
-      *
-      * @param value the <code>short</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeShort(short value) throws JMSException;
-
-
-    /** Writes a <code>char</code> to the stream message.
-      *
-      * @param value the <code>char</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeChar(char value) throws JMSException;
-
-
-    /** Writes an <code>int</code> to the stream message.
-      *
-      * @param value the <code>int</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeInt(int value) throws JMSException;
-
-
-    /** Writes a <code>long</code> to the stream message.
-      *
-      * @param value the <code>long</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeLong(long value) throws JMSException;
-
-
-    /** Writes a <code>float</code> to the stream message.
-      *
-      * @param value the <code>float</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeFloat(float value) throws JMSException;
-
-
-    /** Writes a <code>double</code> to the stream message.
-      *
-      * @param value the <code>double</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeDouble(double value) throws JMSException;
-
-
-    /** Writes a <code>String</code> to the stream message.
-      *
-      * @param value the <code>String</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeString(String value) throws JMSException;
-
-
-    /** Writes a byte array field to the stream message.
-      *
-      * <P>The byte array <code>value</code> is written to the message
-      * as a byte array field. Consecutively written byte array fields are 
-      * treated as two distinct fields when the fields are read.
-      * 
-      * @param value the byte array value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void
-    writeBytes(byte[] value) throws JMSException;
-
-
-    /** Writes a portion of a byte array as a byte array field to the stream 
-      * message.
-      *  
-      * <P>The a portion of the byte array <code>value</code> is written to the
-      * message as a byte array field. Consecutively written byte 
-      * array fields are treated as two distinct fields when the fields are 
-      * read.
-      *
-      * @param value the byte array value to be written
-      * @param offset the initial offset within the byte array
-      * @param length the number of bytes to use
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
- 
-    void
-    writeBytes(byte[] value, int offset, int length) 
-			throws JMSException;
-
-
-    /** Writes an object to the stream message.
-      *
-      * <P>This method works only for the objectified primitive
-      * object types (<code>Integer</code>, <code>Double</code>, 
-      * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
-      * arrays.
-      *
-      * @param value the Java object to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if the object is invalid.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeObject(Object value) throws JMSException;
-
-
-    /** Puts the message body in read-only mode and repositions the stream
-      * to the beginning.
-      *  
-      * @exception JMSException if the JMS provider fails to reset the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if the message has an invalid
-      *                                   format.
-      */ 
- 
-    void
-    reset() throws JMSException;
+ * types in the Java programming language. It is filled and read sequentially.
+ * It inherits from the <CODE>Message</CODE> interface
+ * and adds a stream message body. Its methods are based largely on those
+ * found in <CODE>java.io.DataInputStream</CODE> and
+ * <CODE>java.io.DataOutputStream</CODE>.
+ *
+ * <P>The primitive types can be read or written explicitly using methods
+ * for each type. They may also be read or written generically as objects.
+ * For instance, a call to <CODE>StreamMessage.writeInt(6)</CODE> is
+ * equivalent to <CODE>StreamMessage.writeObject(new Integer(6))</CODE>.
+ * Both forms are provided, because the explicit form is convenient for
+ * static programming, and the object form is needed when types are not known
+ * at compile time.
+ *
+ * <P>When the message is first created, and when <CODE>clearBody</CODE>
+ * is called, the body of the message is in write-only mode. After the
+ * first call to <CODE>reset</CODE> has been made, the message body is in
+ * read-only mode.
+ * After a message has been sent, the client that sent it can retain and
+ * modify it without affecting the message that has been sent. The same message
+ * object can be sent multiple times.
+ * When a message has been received, the provider has called
+ * <CODE>reset</CODE> so that the message body is in read-only mode for the client.
+ *
+ * <P>If <CODE>clearBody</CODE> is called on a message in read-only mode,
+ * the message body is cleared and the message body is in write-only mode.
+ *
+ * <P>If a client attempts to read a message in write-only mode, a
+ * <CODE>MessageNotReadableException</CODE> is thrown.
+ *
+ * <P>If a client attempts to write a message in read-only mode, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown.
+ *
+ * <P><CODE>StreamMessage</CODE> objects support the following conversion
+ * table. The marked cases must be supported. The unmarked cases must throw a
+ * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions
+ * may throw a runtime exception if the primitive's <CODE>valueOf()</CODE>
+ * method does not accept it as a valid <CODE>String</CODE> representation of
+ * the primitive.
+ *
+ * <P>A value written as the row type can be read as the column type.
+ *
+ * <PRE>
+ * |        | boolean byte short char int long float double String byte[]
+ * |----------------------------------------------------------------------
+ * |boolean |    X                                            X
+ * |byte    |          X     X         X   X                  X
+ * |short   |                X         X   X                  X
+ * |char    |                     X                           X
+ * |int     |                          X   X                  X
+ * |long    |                              X                  X
+ * |float   |                                    X     X      X
+ * |double  |                                          X      X
+ * |String  |    X     X     X         X   X     X     X      X
+ * |byte[]  |                                                        X
+ * |----------------------------------------------------------------------
+ * </PRE>
+ *
+ * <P>Attempting to read a null value as a primitive type must be treated
+ * as calling the primitive's corresponding <code>valueOf(String)</code>
+ * conversion method with a null value. Since <code>char</code> does not
+ * support a <code>String</code> conversion, attempting to read a null value
+ * as a <code>char</code> must throw a <code>NullPointerException</code>.
+ *
+ * @version     1.0 - 6 August 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.Session#createStreamMessage()
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.TextMessage
+ */
+
+public interface StreamMessage extends Message
+{
+
+  /** Reads a <code>boolean</code> from the stream message.
+    *
+    * @return the <code>boolean</code> value read
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  boolean readBoolean() throws JMSException;
+
+  /** Reads a <code>byte</code> value from the stream message.
+    *
+    * @return the next byte from the stream message as a 8-bit
+    * <code>byte</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  byte readByte() throws JMSException;
+
+  /** Reads a 16-bit integer from the stream message.
+    *
+    * @return a 16-bit integer from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  short readShort() throws JMSException;
+
+  /** Reads a Unicode character value from the stream message.
+    *
+    * @return a Unicode character from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid      
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  char readChar() throws JMSException;
+
+  /** Reads a 32-bit integer from the stream message.
+    *
+    * @return a 32-bit integer value from the stream message, interpreted
+    * as an <code>int</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readInt() throws JMSException;
+
+  /** Reads a 64-bit integer from the stream message.
+    *
+    * @return a 64-bit integer value from the stream message, interpreted as
+    * a <code>long</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  long readLong() throws JMSException;
+
+  /** Reads a <code>float</code> from the stream message.
+    *
+    * @return a <code>float</code> value from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  float readFloat() throws JMSException;
+
+  /** Reads a <code>double</code> from the stream message.
+    *
+    * @return a <code>double</code> value from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  double readDouble() throws JMSException;
+
+  /** Reads a <CODE>String</CODE> from the stream message.
+    *
+    * @return a Unicode string from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  String readString() throws JMSException;
+
+  /** Reads a byte array field from the stream message into the 
+    * specified <CODE>byte[]</CODE> object (the read buffer). 
+    * 
+    * <P>To read the field value, <CODE>readBytes</CODE> should be 
+    * successively called 
+    * until it returns a value less than the length of the read buffer.
+    * The value of the bytes in the buffer following the last byte 
+    * read is undefined.
+    * 
+    * <P>If <CODE>readBytes</CODE> returns a value equal to the length of the 
+    * buffer, a subsequent <CODE>readBytes</CODE> call must be made. If there 
+    * are no more bytes to be read, this call returns -1.
+    * 
+    * <P>If the byte array field value is null, <CODE>readBytes</CODE> 
+    * returns -1.
+    *
+    * <P>If the byte array field value is empty, <CODE>readBytes</CODE> 
+    * returns 0.
+    * 
+    * <P>Once the first <CODE>readBytes</CODE> call on a <CODE>byte[]</CODE>
+    * field value has been made,
+    * the full value of the field must be read before it is valid to read 
+    * the next field. An attempt to read the next field before that has 
+    * been done will throw a <CODE>MessageFormatException</CODE>.
+    * 
+    * <P>To read the byte field value into a new <CODE>byte[]</CODE> object, 
+    * use the <CODE>readObject</CODE> method.
+    *
+    * @param value the buffer into which the data is read
+    *
+    * @return the total number of bytes read into the buffer, or -1 if 
+    * there is no more data because the end of the byte field has been 
+    * reached
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    * 
+    * @see #readObject()
+    */
+
+  int readBytes(byte[] value) throws JMSException;
+
+  /** Reads an object from the stream message.
+    *
+    * <P>This method can be used to return, in objectified format,
+    * an object in the Java programming language ("Java object") that has 
+    * been written to the stream with the equivalent
+    * <CODE>writeObject</CODE> method call, or its equivalent primitive
+    * <CODE>write<I>type</I></CODE> method.
+    *  
+    * <P>Note that byte values are returned as <CODE>byte[]</CODE>, not 
+    * <CODE>Byte[]</CODE>.
+    *
+    * <P>An attempt to call <CODE>readObject</CODE> to read a byte field 
+    * value into a new <CODE>byte[]</CODE> object before the full value of the
+    * byte field has been read will throw a 
+    * <CODE>MessageFormatException</CODE>.
+    *
+    * @return a Java object from the stream message, in objectified
+    * format (for example, if the object was written as an <CODE>int</CODE>, 
+    * an <CODE>Integer</CODE> is returned)
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    * 
+    * @see #readBytes(byte[] value)
+    */
+
+  Object readObject() throws JMSException;
+
+  /** Writes a <code>boolean</code> to the stream message.
+    * The value <code>true</code> is written as the value 
+    * <code>(byte)1</code>; the value <code>false</code> is written as 
+    * the value <code>(byte)0</code>.
+    *
+    * @param value the <code>boolean</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBoolean(boolean value) throws JMSException;
+
+  /** Writes a <code>byte</code> to the stream message.
+    *
+    * @param value the <code>byte</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeByte(byte value) throws JMSException;
+
+  /** Writes a <code>short</code> to the stream message.
+    *
+    * @param value the <code>short</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeShort(short value) throws JMSException;
+
+  /** Writes a <code>char</code> to the stream message.
+    *
+    * @param value the <code>char</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeChar(char value) throws JMSException;
+
+  /** Writes an <code>int</code> to the stream message.
+    *
+    * @param value the <code>int</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeInt(int value) throws JMSException;
+
+  /** Writes a <code>long</code> to the stream message.
+    *
+    * @param value the <code>long</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeLong(long value) throws JMSException;
+
+  /** Writes a <code>float</code> to the stream message.
+    *
+    * @param value the <code>float</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeFloat(float value) throws JMSException;
+
+  /** Writes a <code>double</code> to the stream message.
+    *
+    * @param value the <code>double</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeDouble(double value) throws JMSException;
+
+  /** Writes a <code>String</code> to the stream message.
+    *
+    * @param value the <code>String</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeString(String value) throws JMSException;
+
+  /** Writes a byte array field to the stream message.
+    *
+    * <P>The byte array <code>value</code> is written to the message
+    * as a byte array field. Consecutively written byte array fields are 
+    * treated as two distinct fields when the fields are read.
+    * 
+    * @param value the byte array value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBytes(byte[] value) throws JMSException;
+
+  /** Writes a portion of a byte array as a byte array field to the stream 
+    * message.
+    *  
+    * <P>The a portion of the byte array <code>value</code> is written to the
+    * message as a byte array field. Consecutively written byte 
+    * array fields are treated as two distinct fields when the fields are 
+    * read.
+    *
+    * @param value the byte array value to be written
+    * @param offset the initial offset within the byte array
+    * @param length the number of bytes to use
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBytes(byte[] value, int offset, int length) throws JMSException;
+
+  /** Writes an object to the stream message.
+    *
+    * <P>This method works only for the objectified primitive
+    * object types (<code>Integer</code>, <code>Double</code>, 
+    * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
+    * arrays.
+    *
+    * @param value the Java object to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if the object is invalid.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeObject(Object value) throws JMSException;
+
+  /** Puts the message body in read-only mode and repositions the stream
+    * to the beginning.
+    *  
+    * @exception JMSException if the JMS provider fails to reset the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if the message has an invalid
+    *                                   format.
+    */
+
+  void reset() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java
index 1de79ef678..82a9af87bf 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java
@@ -1,58 +1,58 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A <CODE>TemporaryQueue</CODE> object is a unique <CODE>Queue</CODE> object 
-  * created for the duration of a <CODE>Connection</CODE>. It is a 
-  * system-defined queue that can be consumed only by the 
-  * <CODE>Connection</CODE> that created it.
-  *
-  *<P>A <CODE>TemporaryQueue</CODE> object can be created at either the 
-  * <CODE>Session</CODE> or <CODE>QueueSession</CODE> level. Creating it at the
-  * <CODE>Session</CODE> level allows to the <CODE>TemporaryQueue</CODE> to 
-  * participate in transactions with objects from the Pub/Sub  domain. 
-  * If it is created at the <CODE>QueueSession</CODE>, it will only
-  * be able participate in transactions with objects from the PTP domain.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see Session#createTemporaryQueue()
-  * @see QueueSession#createTemporaryQueue()
-  */
+/** A <CODE>TemporaryQueue</CODE> object is a unique <CODE>Queue</CODE> object
+ * created for the duration of a <CODE>Connection</CODE>. It is a
+ * system-defined queue that can be consumed only by the
+ * <CODE>Connection</CODE> that created it.
+ *
+ *<P>A <CODE>TemporaryQueue</CODE> object can be created at either the
+ * <CODE>Session</CODE> or <CODE>QueueSession</CODE> level. Creating it at the
+ * <CODE>Session</CODE> level allows to the <CODE>TemporaryQueue</CODE> to
+ * participate in transactions with objects from the Pub/Sub  domain.
+ * If it is created at the <CODE>QueueSession</CODE>, it will only
+ * be able participate in transactions with objects from the PTP domain.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see Session#createTemporaryQueue()
+ * @see QueueSession#createTemporaryQueue()
+ */
 
-public interface TemporaryQueue extends Queue {
+public interface TemporaryQueue extends Queue
+{
 
-    /** Deletes this temporary queue. If there are existing receivers
-      * still using it, a <CODE>JMSException</CODE> will be thrown.
-      *  
-      * @exception JMSException if the JMS provider fails to delete the 
-      *                         temporary queue due to some internal error.
-      */
+  /** Deletes this temporary queue. If there are existing receivers
+    * still using it, a <CODE>JMSException</CODE> will be thrown.
+    *  
+    * @exception JMSException if the JMS provider fails to delete the 
+    *                         temporary queue due to some internal error.
+    */
 
-    void 
-    delete() throws JMSException; 
+  void delete() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java
index cf56d565f6..4d9c9506e7 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java
@@ -1,60 +1,59 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>TemporaryTopic</CODE> object is a unique <CODE>Topic</CODE> object 
-  * created for the duration of a <CODE>Connection</CODE>. It is a 
-  * system-defined topic that can be consumed only by the 
-  * <CODE>Connection</CODE> that created it.
-  *
-  *<P>A <CODE>TemporaryTopic</CODE> object can be created either at the 
-  * <CODE>Session</CODE> or <CODE>TopicSession</CODE> level. Creating it at the
-  * <CODE>Session</CODE> level allows the <CODE>TemporaryTopic</CODE> to participate
-  * in the same transaction with objects from the PTP domain. 
-  * If a <CODE>TemporaryTopic</CODE> is  created at the 
-  * <CODE>TopicSession</CODE>, it will only
-  * be able participate in transactions with objects from the Pub/Sub domain.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see Session#createTemporaryTopic()
-  * @see TopicSession#createTemporaryTopic()
-  */
+/** A <CODE>TemporaryTopic</CODE> object is a unique <CODE>Topic</CODE> object
+ * created for the duration of a <CODE>Connection</CODE>. It is a
+ * system-defined topic that can be consumed only by the
+ * <CODE>Connection</CODE> that created it.
+ *
+ *<P>A <CODE>TemporaryTopic</CODE> object can be created either at the
+ * <CODE>Session</CODE> or <CODE>TopicSession</CODE> level. Creating it at the
+ * <CODE>Session</CODE> level allows the <CODE>TemporaryTopic</CODE> to participate
+ * in the same transaction with objects from the PTP domain.
+ * If a <CODE>TemporaryTopic</CODE> is  created at the
+ * <CODE>TopicSession</CODE>, it will only
+ * be able participate in transactions with objects from the Pub/Sub domain.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see Session#createTemporaryTopic()
+ * @see TopicSession#createTemporaryTopic()
+ */
 
-public interface TemporaryTopic extends Topic {
+public interface TemporaryTopic extends Topic
+{
 
-    /** Deletes this temporary topic. If there are existing subscribers
-      * still using it, a <CODE>JMSException</CODE> will be thrown.
-      *  
-      * @exception JMSException if the JMS provider fails to delete the
-      *                         temporary topic due to some internal error.
-      */
+  /** Deletes this temporary topic. If there are existing subscribers
+    * still using it, a <CODE>JMSException</CODE> will be thrown.
+    *  
+    * @exception JMSException if the JMS provider fails to delete the
+    *                         temporary topic due to some internal error.
+    */
 
-    void 
-    delete() throws JMSException; 
+  void delete() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java
index 0ee45a0df1..bbca08286e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java
@@ -1,82 +1,80 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A <CODE>TextMessage</CODE> object is used to send a message containing a 
-  * <CODE>java.lang.String</CODE>.
-  * It inherits from the <CODE>Message</CODE> interface and adds a text message 
-  * body.
-  *
-  * <P>This message type can be used to transport text-based messages, including
-  *  those with XML content.
-  *
-  * <P>When a client receives a <CODE>TextMessage</CODE>, it is in read-only 
-  * mode. If a client attempts to write to the message at this point, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown. If 
-  * <CODE>clearBody</CODE> is 
-  * called, the message can now be both read from and written to.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session#createTextMessage()
-  * @see         javax.jms.Session#createTextMessage(String)
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.StreamMessage
-  * @see         java.lang.String
-  */
- 
-public interface TextMessage extends Message { 
+/** A <CODE>TextMessage</CODE> object is used to send a message containing a
+ * <CODE>java.lang.String</CODE>.
+ * It inherits from the <CODE>Message</CODE> interface and adds a text message
+ * body.
+ *
+ * <P>This message type can be used to transport text-based messages, including
+ *  those with XML content.
+ *
+ * <P>When a client receives a <CODE>TextMessage</CODE>, it is in read-only
+ * mode. If a client attempts to write to the message at this point, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown. If
+ * <CODE>clearBody</CODE> is
+ * called, the message can now be both read from and written to.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session#createTextMessage()
+ * @see         javax.jms.Session#createTextMessage(String)
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.StreamMessage
+ * @see         java.lang.String
+ */
 
-    /** Sets the string containing this message's data.
-      *  
-      * @param string the <CODE>String</CODE> containing the message's data
-      *  
-      * @exception JMSException if the JMS provider fails to set the text due to
-      *                         some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
+public interface TextMessage extends Message
+{
 
-    void
-    setText(String string) throws JMSException;
+  /** Sets the string containing this message's data.
+    *  
+    * @param string the <CODE>String</CODE> containing the message's data
+    *  
+    * @exception JMSException if the JMS provider fails to set the text due to
+    *                         some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
 
+  void setText(String string) throws JMSException;
 
-    /** Gets the string containing this message's data.  The default
-      * value is null.
-      *  
-      * @return the <CODE>String</CODE> containing the message's data
-      *  
-      * @exception JMSException if the JMS provider fails to get the text due to
-      *                         some internal error.
-      */ 
+  /** Gets the string containing this message's data.  The default
+    * value is null.
+    *  
+    * @return the <CODE>String</CODE> containing the message's data
+    *  
+    * @exception JMSException if the JMS provider fails to get the text due to
+    *                         some internal error.
+    */
 
-    String
-    getText() throws JMSException;
+  String getText() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java
index 37db768ce5..2886dadead 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java
@@ -1,90 +1,87 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
+/** A <CODE>Topic</CODE> object encapsulates a provider-specific topic name.
+ * It is the way a client specifies the identity of a topic to JMS API methods.
+ * For those methods that use a <CODE>Destination</CODE> as a parameter, a
+ * <CODE>Topic</CODE> object may used as an argument . For
+ * example, a Topic can be used to create a <CODE>MessageConsumer</CODE>
+ * and a <CODE>MessageProducer</CODE>
+ * by calling:
+ *<UL>
+ *<LI> <CODE>Session.CreateConsumer(Destination destination)</CODE>
+ *<LI> <CODE>Session.CreateProducer(Destination destination)</CODE>
+ *
+ *</UL>
+ *
+ * <P>Many publish/subscribe (pub/sub) providers group topics into hierarchies
+ * and provide various options for subscribing to parts of the hierarchy. The
+ * JMS API places no restriction on what a <CODE>Topic</CODE> object
+ * represents. It may be a leaf in a topic hierarchy, or it may be a larger
+ * part of the hierarchy.
+ *
+ * <P>The organization of topics and the granularity of subscriptions to
+ * them is an important part of a pub/sub application's architecture. The JMS
+ * API
+ * does not specify a policy for how this should be done. If an application
+ * takes advantage of a provider-specific topic-grouping mechanism, it
+ * should document this. If the application is installed using a different
+ * provider, it is the job of the administrator to construct an equivalent
+ * topic architecture and create equivalent <CODE>Topic</CODE> objects.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see        Session#createConsumer(Destination)
+ * @see        Session#createProducer(Destination)
+ * @see        javax.jms.TopicSession#createTopic(String)
+ */
 
-/** A <CODE>Topic</CODE> object encapsulates a provider-specific topic name. 
-  * It is the way a client specifies the identity of a topic to JMS API methods.
- * For those methods that use a <CODE>Destination</CODE> as a parameter, a 
-  * <CODE>Topic</CODE> object may used as an argument . For 
-  * example, a Topic can be used to create a <CODE>MessageConsumer</CODE>
-  * and a <CODE>MessageProducer</CODE>
-  * by calling:
-  *<UL>
-  *<LI> <CODE>Session.CreateConsumer(Destination destination)</CODE>
-  *<LI> <CODE>Session.CreateProducer(Destination destination)</CODE>
-  *
-  *</UL>
-  *
-  * <P>Many publish/subscribe (pub/sub) providers group topics into hierarchies 
-  * and provide various options for subscribing to parts of the hierarchy. The 
-  * JMS API places no restriction on what a <CODE>Topic</CODE> object 
-  * represents. It may be a leaf in a topic hierarchy, or it may be a larger 
-  * part of the hierarchy.
-  *
-  * <P>The organization of topics and the granularity of subscriptions to 
-  * them is an important part of a pub/sub application's architecture. The JMS 
-  * API 
-  * does not specify a policy for how this should be done. If an application 
-  * takes advantage of a provider-specific topic-grouping mechanism, it 
-  * should document this. If the application is installed using a different 
-  * provider, it is the job of the administrator to construct an equivalent 
-  * topic architecture and create equivalent <CODE>Topic</CODE> objects.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see        Session#createConsumer(Destination)
-  * @see        Session#createProducer(Destination)
-  * @see        javax.jms.TopicSession#createTopic(String)
-  */
- 
-public interface Topic extends Destination {
-
-    /** Gets the name of this topic.
-      *  
-      * <P>Clients that depend upon the name are not portable.
-      *  
-      * @return the topic name
-      *  
-      * @exception JMSException if the JMS provider implementation of 
-      *                         <CODE>Topic</CODE> fails to return the topic
-      *                         name due to some internal
-      *                         error.
-      */ 
+public interface Topic extends Destination
+{
 
-    String
-    getTopicName() throws JMSException;
+  /** Gets the name of this topic.
+    *  
+    * <P>Clients that depend upon the name are not portable.
+    *  
+    * @return the topic name
+    *  
+    * @exception JMSException if the JMS provider implementation of 
+    *                         <CODE>Topic</CODE> fails to return the topic
+    *                         name due to some internal
+    *                         error.
+    */
 
+  String getTopicName() throws JMSException;
 
-    /** Returns a string representation of this object.
-      *
-      * @return the provider-specific identity values for this topic
-      */
+  /** Returns a string representation of this object.
+    *
+    * @return the provider-specific identity values for this topic
+    */
 
-    String
-    toString();
+  String toString();
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
index 15d9a9f605..2f8cdf6fc7 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
@@ -1,146 +1,133 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>TopicConnection</CODE> object is an active connection to a 
-  * publish/subscribe JMS provider. A client uses a <CODE>TopicConnection</CODE> 
-  * object to create one or more <CODE>TopicSession</CODE> objects
-  * for producing and consuming messages.
-  *
-  *<P>A <CODE>TopicConnection</CODE> can be used to create a 
-  *<CODE>TopicSession</CODE>, from which
-  * specialized topic-related objects can be created. 
-  * A more general, and recommended approach is to use the 
-  * <CODE>Connection</CODE> object. 
-  *
-  *
-  * <P>The <CODE>TopicConnection</CODE> object
-  * should be used to support existing code.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Connection
-  * @see         javax.jms.ConnectionFactory
-  * @see	 javax.jms.TopicConnectionFactory
-  */
-
-public interface TopicConnection extends Connection {
-
-    /** Creates a <CODE>TopicSession</CODE> object.
-      *
-      * @param transacted indicates whether the session is transacted
-      * @param acknowledgeMode indicates whether the consumer or the
-      * client will acknowledge any messages it receives; ignored if the session
-      * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
-      * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
-      * <code>Session.DUPS_OK_ACKNOWLEDGE</code>. 
-      *  
-      * @return a newly created topic session
-      *  
-      * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
-      *                         to create a session due to some internal error or
-      *                         lack of support for the specific transaction
-      *                         and acknowledgement mode.
-      *
-      * @see Session#AUTO_ACKNOWLEDGE 
-      * @see Session#CLIENT_ACKNOWLEDGE 
-      * @see Session#DUPS_OK_ACKNOWLEDGE 
-      */ 
+/** A <CODE>TopicConnection</CODE> object is an active connection to a
+ * publish/subscribe JMS provider. A client uses a <CODE>TopicConnection</CODE>
+ * object to create one or more <CODE>TopicSession</CODE> objects
+ * for producing and consuming messages.
+ *
+ *<P>A <CODE>TopicConnection</CODE> can be used to create a
+ *<CODE>TopicSession</CODE>, from which
+ * specialized topic-related objects can be created.
+ * A more general, and recommended approach is to use the
+ * <CODE>Connection</CODE> object.
+ *
+ *
+ * <P>The <CODE>TopicConnection</CODE> object
+ * should be used to support existing code.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Connection
+ * @see         javax.jms.ConnectionFactory
+ * @see	 javax.jms.TopicConnectionFactory
+ */
 
-    TopicSession
-    createTopicSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+public interface TopicConnection extends Connection
+{
 
+  /** Creates a <CODE>TopicSession</CODE> object.
+    *
+    * @param transacted indicates whether the session is transacted
+    * @param acknowledgeMode indicates whether the consumer or the
+    * client will acknowledge any messages it receives; ignored if the session
+    * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
+    * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
+    * <code>Session.DUPS_OK_ACKNOWLEDGE</code>. 
+    *  
+    * @return a newly created topic session
+    *  
+    * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
+    *                         to create a session due to some internal error or
+    *                         lack of support for the specific transaction
+    *                         and acknowledgement mode.
+    *
+    * @see Session#AUTO_ACKNOWLEDGE 
+    * @see Session#CLIENT_ACKNOWLEDGE 
+    * @see Session#DUPS_OK_ACKNOWLEDGE 
+    */
 
-    /** Creates a connection consumer for this connection (optional operation).
-      * This is an expert facility not used by regular JMS clients.
-      *  
-      * @param topic the topic to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector  
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the connection consumer
-      *
-      * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      * @see javax.jms.ConnectionConsumer
-      */ 
+  TopicSession createTopicSession(boolean transacted, int acknowledgeMode) throws JMSException;
 
-    ConnectionConsumer
-    createConnectionConsumer(Topic topic,
-                             String messageSelector,
-                             ServerSessionPool sessionPool,
-			     int maxMessages)
-			     throws JMSException;
+  /** Creates a connection consumer for this connection (optional operation).
+    * This is an expert facility not used by regular JMS clients.
+    *  
+    * @param topic the topic to access
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector  
+    * for the message consumer.
+    * @param sessionPool the server session pool to associate with this 
+    * connection consumer
+    * @param maxMessages the maximum number of messages that can be
+    * assigned to a server session at one time
+    *
+    * @return the connection consumer
+    *
+    * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
+    *                         to create a connection consumer due to some
+    *                         internal error or invalid arguments for 
+    *                         <CODE>sessionPool</CODE> and 
+    *                         <CODE>messageSelector</CODE>.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    * @see javax.jms.ConnectionConsumer
+    */
 
+  ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages) throws JMSException;
 
-    /** Create a durable connection consumer for this connection (optional operation). 
-      * This is an expert facility not used by regular JMS clients.
-      *                
-      * @param topic the topic to access
-      * @param subscriptionName durable subscription name
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * durable connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the durable connection consumer
-      *  
-      * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      * @see javax.jms.ConnectionConsumer
-      */
+  /** Create a durable connection consumer for this connection (optional operation). 
+    * This is an expert facility not used by regular JMS clients.
+    *                
+    * @param topic the topic to access
+    * @param subscriptionName durable subscription name
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param sessionPool the server session pool to associate with this 
+    * durable connection consumer
+    * @param maxMessages the maximum number of messages that can be
+    * assigned to a server session at one time
+    *
+    * @return the durable connection consumer
+    *  
+    * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
+    *                         to create a connection consumer due to some
+    *                         internal error or invalid arguments for 
+    *                         <CODE>sessionPool</CODE> and 
+    *                         <CODE>messageSelector</CODE>.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    * @see javax.jms.ConnectionConsumer
+    */
 
-    ConnectionConsumer
-    createDurableConnectionConsumer(Topic topic,
-				    String subscriptionName,
-                                    String messageSelector,
-                                    ServerSessionPool sessionPool,
-				    int maxMessages)
-                             throws JMSException;
+  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
+      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java
index 68376b3a53..e518665d31 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java
@@ -1,84 +1,80 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A client uses a <CODE>TopicConnectionFactory</CODE> object to create 
-  * <CODE>TopicConnection</CODE> objects with a publish/subscribe JMS provider.
-  *
-  * <P>A<CODE> TopicConnectionFactory</CODE> can be used to create a 
-  * <CODE>TopicConnection</CODE>, from which specialized topic-related objects
-  * can be  created. A more general, and recommended approach 
-  * is to use the <CODE>ConnectionFactory</CODE> object.
-  *  
-  * <P> The <CODE>TopicConnectionFactory</CODE> object
-  * should be used to support existing code.
-  *
-  * @version    1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.ConnectionFactory
-  */
-
-public interface TopicConnectionFactory extends ConnectionFactory {
+/** A client uses a <CODE>TopicConnectionFactory</CODE> object to create
+ * <CODE>TopicConnection</CODE> objects with a publish/subscribe JMS provider.
+ *
+ * <P>A<CODE> TopicConnectionFactory</CODE> can be used to create a
+ * <CODE>TopicConnection</CODE>, from which specialized topic-related objects
+ * can be  created. A more general, and recommended approach
+ * is to use the <CODE>ConnectionFactory</CODE> object.
+ *
+ * <P> The <CODE>TopicConnectionFactory</CODE> object
+ * should be used to support existing code.
+ *
+ * @version    1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.ConnectionFactory
+ */
 
-    /** Creates a topic connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created topic connection
-      *
-      * @exception JMSException if the JMS provider fails to create a topic 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException if client authentication fails due to 
-      *                                 an invalid user name or password.
-      */ 
+public interface TopicConnectionFactory extends ConnectionFactory
+{
 
-    TopicConnection
-    createTopicConnection() throws JMSException;
+  /** Creates a topic connection with the default user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *
+    * @return a newly created topic connection
+    *
+    * @exception JMSException if the JMS provider fails to create a topic 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException if client authentication fails due to 
+    *                                 an invalid user name or password.
+    */
 
+  TopicConnection createTopicConnection() throws JMSException;
 
-    /** Creates a topic connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created topic connection
-      *
-      * @exception JMSException if the JMS provider fails to create a topic 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException if client authentication fails due to 
-      *                                 an invalid user name or password.
-      */ 
+  /** Creates a topic connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created topic connection
+    *
+    * @exception JMSException if the JMS provider fails to create a topic 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException if client authentication fails due to 
+    *                                 an invalid user name or password.
+    */
 
-    TopicConnection
-    createTopicConnection(String userName, String password) 
-					     throws JMSException;
+  TopicConnection createTopicConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java
index b7dbb9fc69..5019bef7b7 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java
@@ -1,207 +1,191 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A client uses a <CODE>TopicPublisher</CODE> object to publish messages on a 
-  * topic. A <CODE>TopicPublisher</CODE> object is the publish-subscribe form
-  * of a message producer.
-  *
-  * <P>Normally, the <CODE>Topic</CODE> is specified when a 
-  * <CODE>TopicPublisher</CODE> is created.  In this case, an attempt to use 
-  * the <CODE>publish</CODE> methods for an unidentified 
-  * <CODE>TopicPublisher</CODE> will throw a 
-  * <CODE>java.lang.UnsupportedOperationException</CODE>.
-  *
-  * <P>If the <CODE>TopicPublisher</CODE> is created with an unidentified 
-  * <CODE>Topic</CODE>, an attempt to use the <CODE>publish</CODE> methods that 
-  * assume that the <CODE>Topic</CODE> has been identified will throw a 
-  * <CODE>java.lang.UnsupportedOperationException</CODE>.
-  *
-  * <P>During the execution of its <CODE>publish</CODE> method,
-  * a message must not be changed by other threads within the client. 
-  * If the message is modified, the result of the <CODE>publish</CODE> is 
-  * undefined.
-  * 
-  * <P>After publishing a message, a client may retain and modify it
-  * without affecting the message that has been published. The same message
-  * object may be published multiple times.
-  * 
-  * <P>The following message headers are set as part of publishing a 
-  * message: <code>JMSDestination</code>, <code>JMSDeliveryMode</code>, 
-  * <code>JMSExpiration</code>, <code>JMSPriority</code>, 
-  * <code>JMSMessageID</code> and <code>JMSTimeStamp</code>.
-  * When the message is published, the values of these headers are ignored. 
-  * After completion of the <CODE>publish</CODE>, the headers hold the values 
-  * specified by the method publishing the message. It is possible for the 
-  * <CODE>publish</CODE> method not to set <code>JMSMessageID</code> and 
-  * <code>JMSTimeStamp</code> if the 
-  * setting of these headers is explicitly disabled by the 
-  * <code>MessageProducer.setDisableMessageID</code> or
-  * <code>MessageProducer.setDisableMessageTimestamp</code> method.
-  *
-  *<P>Creating a <CODE>MessageProducer</CODE> provides the same features as
-  * creating a <CODE>TopicPublisher</CODE>. A <CODE>MessageProducer</CODE> object is 
-  * recommended when creating new code. The  <CODE>TopicPublisher</CODE> is
-  * provided to support existing code.
-
-  *
-  *<P>Because <CODE>TopicPublisher</CODE> inherits from 
-  * <CODE>MessageProducer</CODE>, it inherits the
-  * <CODE>send</CODE> methods that are a part of the <CODE>MessageProducer</CODE> 
-  * interface. Using the <CODE>send</CODE> methods will have the same
-  * effect as using the
-  * <CODE>publish</CODE> methods: they are functionally the same.
-  * 
-  *
-  * @version    1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see Session#createProducer(Destination) 
-  * @see TopicSession#createPublisher(Topic)
-  */
-
-public interface TopicPublisher extends MessageProducer {
-
-    /** Gets the topic associated with this <CODE>TopicPublisher</CODE>.
-      *
-      * @return this publisher's topic
-      *  
-      * @exception JMSException if the JMS provider fails to get the topic for
-      *                         this <CODE>TopicPublisher</CODE>
-      *                         due to some internal error.
-      */
-
-    Topic 
-    getTopic() throws JMSException;
-
- 
-    /** Publishes a message to the topic.
-      * Uses the <CODE>TopicPublisher</CODE>'s default delivery mode, priority,
-      * and time to live.
-      *
-      * @param message the message to publish
-      *
-      * @exception JMSException if the JMS provider fails to publish the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses this method
-      *                         with a <CODE>TopicPublisher</CODE> with
-      *                         an invalid topic.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>TopicPublisher</CODE> that
-      *                         did not specify a topic at creation time.
-      * 
-      * @see javax.jms.MessageProducer#getDeliveryMode()
-      * @see javax.jms.MessageProducer#getTimeToLive()
-      * @see javax.jms.MessageProducer#getPriority()
-      */
-
-    void 
-    publish(Message message) throws JMSException;
-
-
-    /** Publishes a message to the topic, specifying delivery mode,
-      * priority, and time to live.
-      *
-      * @param message the message to publish
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *
-      * @exception JMSException if the JMS provider fails to publish the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses this method
-      *                         with a <CODE>TopicPublisher</CODE> with
-      *                         an invalid topic.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>TopicPublisher</CODE> that
-      *                         did not specify a topic at creation time.
-      */
- 
-    void
-    publish(Message message, 
-            int deliveryMode, 
-	    int priority,
-	    long timeToLive) throws JMSException;
-
-
-    /** Publishes a message to a topic for an unidentified message producer. 
-      * Uses the <CODE>TopicPublisher</CODE>'s default delivery mode, 
-      * priority, and time to live.
-      *  
-      * <P>Typically, a message producer is assigned a topic at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the topic be supplied every time a message is
-      * published.
-      *
-      * @param topic the topic to publish this message to
-      * @param message the message to publish
-      *  
-      * @exception JMSException if the JMS provider fails to publish the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid topic.
-      * 
-      * @see javax.jms.MessageProducer#getDeliveryMode()
-      * @see javax.jms.MessageProducer#getTimeToLive()
-      * @see javax.jms.MessageProducer#getPriority()
-      */ 
-
-    void
-    publish(Topic topic, Message message) throws JMSException;
-
-
-    /** Publishes a message to a topic for an unidentified message 
-      * producer, specifying delivery mode, priority and time to live.
-      *  
-      * <P>Typically, a message producer is assigned a topic at creation
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the topic be supplied every time a message is
-      * published.
-      *
-      * @param topic the topic to publish this message to
-      * @param message the message to publish
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to publish the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid topic.
-      */ 
+/** A client uses a <CODE>TopicPublisher</CODE> object to publish messages on a
+ * topic. A <CODE>TopicPublisher</CODE> object is the publish-subscribe form
+ * of a message producer.
+ *
+ * <P>Normally, the <CODE>Topic</CODE> is specified when a
+ * <CODE>TopicPublisher</CODE> is created.  In this case, an attempt to use
+ * the <CODE>publish</CODE> methods for an unidentified
+ * <CODE>TopicPublisher</CODE> will throw a
+ * <CODE>java.lang.UnsupportedOperationException</CODE>.
+ *
+ * <P>If the <CODE>TopicPublisher</CODE> is created with an unidentified
+ * <CODE>Topic</CODE>, an attempt to use the <CODE>publish</CODE> methods that
+ * assume that the <CODE>Topic</CODE> has been identified will throw a
+ * <CODE>java.lang.UnsupportedOperationException</CODE>.
+ *
+ * <P>During the execution of its <CODE>publish</CODE> method,
+ * a message must not be changed by other threads within the client.
+ * If the message is modified, the result of the <CODE>publish</CODE> is
+ * undefined.
+ *
+ * <P>After publishing a message, a client may retain and modify it
+ * without affecting the message that has been published. The same message
+ * object may be published multiple times.
+ *
+ * <P>The following message headers are set as part of publishing a
+ * message: <code>JMSDestination</code>, <code>JMSDeliveryMode</code>,
+ * <code>JMSExpiration</code>, <code>JMSPriority</code>,
+ * <code>JMSMessageID</code> and <code>JMSTimeStamp</code>.
+ * When the message is published, the values of these headers are ignored.
+ * After completion of the <CODE>publish</CODE>, the headers hold the values
+ * specified by the method publishing the message. It is possible for the
+ * <CODE>publish</CODE> method not to set <code>JMSMessageID</code> and
+ * <code>JMSTimeStamp</code> if the
+ * setting of these headers is explicitly disabled by the
+ * <code>MessageProducer.setDisableMessageID</code> or
+ * <code>MessageProducer.setDisableMessageTimestamp</code> method.
+ *
+ *<P>Creating a <CODE>MessageProducer</CODE> provides the same features as
+ * creating a <CODE>TopicPublisher</CODE>. A <CODE>MessageProducer</CODE> object is
+ * recommended when creating new code. The  <CODE>TopicPublisher</CODE> is
+ * provided to support existing code.
+
+ *
+ *<P>Because <CODE>TopicPublisher</CODE> inherits from
+ * <CODE>MessageProducer</CODE>, it inherits the
+ * <CODE>send</CODE> methods that are a part of the <CODE>MessageProducer</CODE>
+ * interface. Using the <CODE>send</CODE> methods will have the same
+ * effect as using the
+ * <CODE>publish</CODE> methods: they are functionally the same.
+ *
+ *
+ * @version    1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see Session#createProducer(Destination)
+ * @see TopicSession#createPublisher(Topic)
+ */
 
-    void
-    publish(Topic topic, 
-            Message message, 
-            int deliveryMode, 
-            int priority,
-	    long timeToLive) throws JMSException;
+public interface TopicPublisher extends MessageProducer
+{
+
+  /** Gets the topic associated with this <CODE>TopicPublisher</CODE>.
+    *
+    * @return this publisher's topic
+    *  
+    * @exception JMSException if the JMS provider fails to get the topic for
+    *                         this <CODE>TopicPublisher</CODE>
+    *                         due to some internal error.
+    */
+
+  Topic getTopic() throws JMSException;
+
+  /** Publishes a message to the topic.
+    * Uses the <CODE>TopicPublisher</CODE>'s default delivery mode, priority,
+    * and time to live.
+    *
+    * @param message the message to publish
+    *
+    * @exception JMSException if the JMS provider fails to publish the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses this method
+    *                         with a <CODE>TopicPublisher</CODE> with
+    *                         an invalid topic.
+    * @exception java.lang.UnsupportedOperationException if a client uses this
+    *                         method with a <CODE>TopicPublisher</CODE> that
+    *                         did not specify a topic at creation time.
+    * 
+    * @see javax.jms.MessageProducer#getDeliveryMode()
+    * @see javax.jms.MessageProducer#getTimeToLive()
+    * @see javax.jms.MessageProducer#getPriority()
+    */
+
+  void publish(Message message) throws JMSException;
+
+  /** Publishes a message to the topic, specifying delivery mode,
+    * priority, and time to live.
+    *
+    * @param message the message to publish
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *
+    * @exception JMSException if the JMS provider fails to publish the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses this method
+    *                         with a <CODE>TopicPublisher</CODE> with
+    *                         an invalid topic.
+    * @exception java.lang.UnsupportedOperationException if a client uses this
+    *                         method with a <CODE>TopicPublisher</CODE> that
+    *                         did not specify a topic at creation time.
+    */
+
+  void publish(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
+
+  /** Publishes a message to a topic for an unidentified message producer. 
+    * Uses the <CODE>TopicPublisher</CODE>'s default delivery mode, 
+    * priority, and time to live.
+    *  
+    * <P>Typically, a message producer is assigned a topic at creation 
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the topic be supplied every time a message is
+    * published.
+    *
+    * @param topic the topic to publish this message to
+    * @param message the message to publish
+    *  
+    * @exception JMSException if the JMS provider fails to publish the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid topic.
+    * 
+    * @see javax.jms.MessageProducer#getDeliveryMode()
+    * @see javax.jms.MessageProducer#getTimeToLive()
+    * @see javax.jms.MessageProducer#getPriority()
+    */
+
+  void publish(Topic topic, Message message) throws JMSException;
+
+  /** Publishes a message to a topic for an unidentified message 
+    * producer, specifying delivery mode, priority and time to live.
+    *  
+    * <P>Typically, a message producer is assigned a topic at creation
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the topic be supplied every time a message is
+    * published.
+    *
+    * @param topic the topic to publish this message to
+    * @param message the message to publish
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *  
+    * @exception JMSException if the JMS provider fails to publish the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid topic.
+    */
+
+  void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java
index 0ef194b428..8424e94f5a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java
@@ -1,123 +1,125 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /** The <CODE>TopicRequestor</CODE> helper class simplifies
-  * making service requests.
-  *
-  * <P>The <CODE>TopicRequestor</CODE> constructor is given a non-transacted 
-  * <CODE>TopicSession</CODE> and a destination <CODE>Topic</CODE>. It creates a 
-  * <CODE>TemporaryTopic</CODE> for the responses and provides a 
-  * <CODE>request</CODE> method that sends the request message and waits 
-  * for its reply.
-  *
-  * <P>This is a basic request/reply abstraction that should be sufficient 
-  * for most uses. JMS providers and clients are free to create more 
-  * sophisticated versions.
-  *
-  * @version     1.0 - 8 July 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.QueueRequestor
-  */
+ * making service requests.
+ *
+ * <P>The <CODE>TopicRequestor</CODE> constructor is given a non-transacted
+ * <CODE>TopicSession</CODE> and a destination <CODE>Topic</CODE>. It creates a
+ * <CODE>TemporaryTopic</CODE> for the responses and provides a
+ * <CODE>request</CODE> method that sends the request message and waits
+ * for its reply.
+ *
+ * <P>This is a basic request/reply abstraction that should be sufficient
+ * for most uses. JMS providers and clients are free to create more
+ * sophisticated versions.
+ *
+ * @version     1.0 - 8 July 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.QueueRequestor
+ */
+
+public class TopicRequestor
+{
 
-public class TopicRequestor {
+  TopicSession session; // The topic session the topic belongs to.
 
-    TopicSession    session;    // The topic session the topic belongs to.
-    Topic           topic;      // The topic to perform the request/reply on.  
-    TemporaryTopic  tempTopic;
-    TopicPublisher  publisher;
-    TopicSubscriber subscriber;
+  Topic topic; // The topic to perform the request/reply on.
 
+  TemporaryTopic tempTopic;
 
-    /** Constructor for the <CODE>TopicRequestor</CODE> class.
-      * 
-      * <P>This implementation assumes the session parameter to be non-transacted,
-      * with a delivery mode of either <CODE>AUTO_ACKNOWLEDGE</CODE> or 
-      * <CODE>DUPS_OK_ACKNOWLEDGE</CODE>.
-      *
-      * @param session the <CODE>TopicSession</CODE> the topic belongs to
-      * @param topic the topic to perform the request/reply call on
-      *
-      * @exception JMSException if the JMS provider fails to create the
-      *                         <CODE>TopicRequestor</CODE> due to some internal
-      *                         error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      */ 
+  TopicPublisher publisher;
 
-    public 
-    TopicRequestor(TopicSession session, Topic topic) throws JMSException {
-	this.session = session;
-	this.topic   = topic;
-        tempTopic    = session.createTemporaryTopic();
-        publisher    = session.createPublisher(topic);
-        subscriber   = session.createSubscriber(tempTopic);
-    }
+  TopicSubscriber subscriber;
 
+  /** Constructor for the <CODE>TopicRequestor</CODE> class.
+    * 
+    * <P>This implementation assumes the session parameter to be non-transacted,
+    * with a delivery mode of either <CODE>AUTO_ACKNOWLEDGE</CODE> or 
+    * <CODE>DUPS_OK_ACKNOWLEDGE</CODE>.
+    *
+    * @param session the <CODE>TopicSession</CODE> the topic belongs to
+    * @param topic the topic to perform the request/reply call on
+    *
+    * @exception JMSException if the JMS provider fails to create the
+    *                         <CODE>TopicRequestor</CODE> due to some internal
+    *                         error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    */
 
-    /** Sends a request and waits for a reply. The temporary topic is used for
-      * the <CODE>JMSReplyTo</CODE> destination; the first reply is returned, 
-      * and any following replies are discarded.
-      *
-      * @param message the message to send
-      *  
-      * @return the reply message
-      *  
-      * @exception JMSException if the JMS provider fails to complete the
-      *                         request due to some internal error.
-      */
+  public TopicRequestor(TopicSession session, Topic topic) throws JMSException
+  {
+    this.session = session;
+    this.topic = topic;
+    tempTopic = session.createTemporaryTopic();
+    publisher = session.createPublisher(topic);
+    subscriber = session.createSubscriber(tempTopic);
+  }
 
-    public Message
-    request(Message message) throws JMSException {
-	message.setJMSReplyTo(tempTopic);
-        publisher.publish(message);
-	return(subscriber.receive());
-    }
+  /** Sends a request and waits for a reply. The temporary topic is used for
+    * the <CODE>JMSReplyTo</CODE> destination; the first reply is returned, 
+    * and any following replies are discarded.
+    *
+    * @param message the message to send
+    *  
+    * @return the reply message
+    *  
+    * @exception JMSException if the JMS provider fails to complete the
+    *                         request due to some internal error.
+    */
 
+  public Message request(Message message) throws JMSException
+  {
+    message.setJMSReplyTo(tempTopic);
+    publisher.publish(message);
+    return subscriber.receive();
+  }
 
-    /** Closes the <CODE>TopicRequestor</CODE> and its session.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a 
-      * <CODE>TopicRequestor</CODE> outside the Java virtual machine, clients 
-      * should close them when they 
-      * are not needed. Relying on garbage collection to eventually reclaim 
-      * these resources may not be timely enough.
-      *
-      * <P>Note that this method closes the <CODE>TopicSession</CODE> object 
-      * passed to the <CODE>TopicRequestor</CODE> constructor.
-      *  
-      * @exception JMSException if the JMS provider fails to close the
-      *                         <CODE>TopicRequestor</CODE> due to some internal
-      *                         error.
-      */
+  /** Closes the <CODE>TopicRequestor</CODE> and its session.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a 
+    * <CODE>TopicRequestor</CODE> outside the Java virtual machine, clients 
+    * should close them when they 
+    * are not needed. Relying on garbage collection to eventually reclaim 
+    * these resources may not be timely enough.
+    *
+    * <P>Note that this method closes the <CODE>TopicSession</CODE> object 
+    * passed to the <CODE>TopicRequestor</CODE> constructor.
+    *  
+    * @exception JMSException if the JMS provider fails to close the
+    *                         <CODE>TopicRequestor</CODE> due to some internal
+    *                         error.
+    */
 
-    public void
-    close() throws JMSException {
+  public void close() throws JMSException
+  {
 
-	// publisher and consumer created by constructor are implicitly closed.
-	session.close();
-	tempTopic.delete();
-    }
+    // publisher and consumer created by constructor are implicitly closed.
+    session.close();
+    tempTopic.delete();
+  }
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
index d42dc5fb94..ca6cbb51b3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
@@ -1,293 +1,273 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>TopicSession</CODE> object provides methods for creating 
-  * <CODE>TopicPublisher</CODE>, <CODE>TopicSubscriber</CODE>, and 
-  * <CODE>TemporaryTopic</CODE> objects. It also provides a method for 
-  * deleting its client's durable subscribers.
-  *
-  *<P>A <CODE>TopicSession</CODE> is used for creating Pub/Sub specific
-  * objects. In general, use the  <CODE>Session</CODE> object, and 
-  *  use <CODE>TopicSession</CODE>  only to support
-  * existing code. Using the <CODE>Session</CODE> object simplifies the 
-  * programming model, and allows transactions to be used across the two 
-  * messaging domains.
-  * 
-  * <P>A <CODE>TopicSession</CODE> cannot be used to create objects specific to the 
-  * point-to-point domain. The following methods inherit from 
-  * <CODE>Session</CODE>, but must throw an 
-  * <CODE>IllegalStateException</CODE> 
-  * if used from <CODE>TopicSession</CODE>:
-  *<UL>
-  *   <LI><CODE>createBrowser</CODE>
-  *   <LI><CODE>createQueue</CODE>
-  *   <LI><CODE>createTemporaryQueue</CODE>
-  *</UL>
-  *
-  * @version     1.1 - April 9, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author       Kate Stout
-  *
-  * @see         javax.jms.Session
-  * @see	 javax.jms.Connection#createSession(boolean, int)
-  * @see	 javax.jms.TopicConnection#createTopicSession(boolean, int)
-  * @see         javax.jms.XATopicSession#getTopicSession()
-  */
-
-public interface TopicSession extends Session {
-
-    /** Creates a topic identity given a <CODE>Topic</CODE> name.
-      *
-      * <P>This facility is provided for the rare cases where clients need to
-      * dynamically manipulate topic identity. This allows the creation of a
-      * topic identity with a provider-specific name. Clients that depend 
-      * on this ability are not portable.
-      *
-      * <P>Note that this method is not for creating the physical topic. 
-      * The physical creation of topics is an administrative task and is not
-      * to be initiated by the JMS API. The one exception is the
-      * creation of temporary topics, which is accomplished with the 
-      * <CODE>createTemporaryTopic</CODE> method.
-      *  
-      * @param topicName the name of this <CODE>Topic</CODE>
-      *
-      * @return a <CODE>Topic</CODE> with the given name
-      *
-      * @exception JMSException if the session fails to create a topic
-      *                         due to some internal error.
-      */
-
-    Topic
-    createTopic(String topicName) throws JMSException;
-
-
-    /** Creates a nondurable subscriber to the specified topic.
-      *  
-      * <P>A client uses a <CODE>TopicSubscriber</CODE> object to receive 
-      * messages that have been published to a topic.
-      *
-      * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. 
-      * They receive only messages that are published while they are active.
-      *
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is false.
-      *
-      * @param topic the <CODE>Topic</CODE> to subscribe to
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      */ 
+/** A <CODE>TopicSession</CODE> object provides methods for creating
+ * <CODE>TopicPublisher</CODE>, <CODE>TopicSubscriber</CODE>, and
+ * <CODE>TemporaryTopic</CODE> objects. It also provides a method for
+ * deleting its client's durable subscribers.
+ *
+ *<P>A <CODE>TopicSession</CODE> is used for creating Pub/Sub specific
+ * objects. In general, use the  <CODE>Session</CODE> object, and
+ *  use <CODE>TopicSession</CODE>  only to support
+ * existing code. Using the <CODE>Session</CODE> object simplifies the
+ * programming model, and allows transactions to be used across the two
+ * messaging domains.
+ *
+ * <P>A <CODE>TopicSession</CODE> cannot be used to create objects specific to the
+ * point-to-point domain. The following methods inherit from
+ * <CODE>Session</CODE>, but must throw an
+ * <CODE>IllegalStateException</CODE>
+ * if used from <CODE>TopicSession</CODE>:
+ *<UL>
+ *   <LI><CODE>createBrowser</CODE>
+ *   <LI><CODE>createQueue</CODE>
+ *   <LI><CODE>createTemporaryQueue</CODE>
+ *</UL>
+ *
+ * @version     1.1 - April 9, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author       Kate Stout
+ *
+ * @see         javax.jms.Session
+ * @see	 javax.jms.Connection#createSession(boolean, int)
+ * @see	 javax.jms.TopicConnection#createTopicSession(boolean, int)
+ * @see         javax.jms.XATopicSession#getTopicSession()
+ */
 
-    TopicSubscriber
-    createSubscriber(Topic topic) throws JMSException;
+public interface TopicSession extends Session
+{
 
+  /** Creates a topic identity given a <CODE>Topic</CODE> name.
+    *
+    * <P>This facility is provided for the rare cases where clients need to
+    * dynamically manipulate topic identity. This allows the creation of a
+    * topic identity with a provider-specific name. Clients that depend 
+    * on this ability are not portable.
+    *
+    * <P>Note that this method is not for creating the physical topic. 
+    * The physical creation of topics is an administrative task and is not
+    * to be initiated by the JMS API. The one exception is the
+    * creation of temporary topics, which is accomplished with the 
+    * <CODE>createTemporaryTopic</CODE> method.
+    *  
+    * @param topicName the name of this <CODE>Topic</CODE>
+    *
+    * @return a <CODE>Topic</CODE> with the given name
+    *
+    * @exception JMSException if the session fails to create a topic
+    *                         due to some internal error.
+    */
 
-    /** Creates a nondurable subscriber to the specified topic, using a
-      * message selector or specifying whether messages published by its
-      * own connection should be delivered to it.
-      *
-      * <P>A client uses a <CODE>TopicSubscriber</CODE> object to receive 
-      * messages that have been published to a topic.
-      *  
-      * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. 
-      * They receive only messages that are published while they are active.
-      *
-      * <P>Messages filtered out by a subscriber's message selector will 
-      * never be delivered to the subscriber. From the subscriber's 
-      * perspective, they do not exist.
-      *
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is false.
-      *
-      * @param topic the <CODE>Topic</CODE> to subscribe to
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param noLocal if set, inhibits the delivery of messages published
-      * by its own connection
-      * 
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      */
+  Topic createTopic(String topicName) throws JMSException;
 
-    TopicSubscriber 
-    createSubscriber(Topic topic, 
-		     String messageSelector,
-		     boolean noLocal) throws JMSException;
+  /** Creates a nondurable subscriber to the specified topic.
+    *  
+    * <P>A client uses a <CODE>TopicSubscriber</CODE> object to receive 
+    * messages that have been published to a topic.
+    *
+    * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. 
+    * They receive only messages that are published while they are active.
+    *
+    * <P>In some cases, a connection may both publish and subscribe to a 
+    * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
+    * to inhibit the delivery of messages published by its own connection.
+    * The default value for this attribute is false.
+    *
+    * @param topic the <CODE>Topic</CODE> to subscribe to
+    *  
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    */
 
+  TopicSubscriber createSubscriber(Topic topic) throws JMSException;
 
-    /** Creates a durable subscriber to the specified topic.
-      *  
-      * <P>If a client needs to receive all the messages published on a 
-      * topic, including the ones published while the subscriber is inactive,
-      * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
-      * retains a record of this 
-      * durable subscription and insures that all messages from the topic's 
-      * publishers are retained until they are acknowledged by this 
-      * durable subscriber or they have expired.
-      *
-      * <P>Sessions with durable subscribers must always provide the same 
-      * client identifier. In addition, each client must specify a name that 
-      * uniquely identifies (within client identifier) each durable 
-      * subscription it creates. Only one session at a time can have a 
-      * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
-      *
-      * <P>A client can change an existing durable subscription by creating 
-      * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
-      * topic and/or 
-      * message selector. Changing a durable subscriber is equivalent to 
-      * unsubscribing (deleting) the old one and creating a new one.
-      *
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is false.
-      *
-      * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
-      * @param name the name used to identify this subscription
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      */ 
+  /** Creates a nondurable subscriber to the specified topic, using a
+    * message selector or specifying whether messages published by its
+    * own connection should be delivered to it.
+    *
+    * <P>A client uses a <CODE>TopicSubscriber</CODE> object to receive 
+    * messages that have been published to a topic.
+    *  
+    * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. 
+    * They receive only messages that are published while they are active.
+    *
+    * <P>Messages filtered out by a subscriber's message selector will 
+    * never be delivered to the subscriber. From the subscriber's 
+    * perspective, they do not exist.
+    *
+    * <P>In some cases, a connection may both publish and subscribe to a 
+    * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
+    * to inhibit the delivery of messages published by its own connection.
+    * The default value for this attribute is false.
+    *
+    * @param topic the <CODE>Topic</CODE> to subscribe to
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param noLocal if set, inhibits the delivery of messages published
+    * by its own connection
+    * 
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    */
 
-    TopicSubscriber
-    createDurableSubscriber(Topic topic, 
-			    String name) throws JMSException;
+  TopicSubscriber createSubscriber(Topic topic, String messageSelector, boolean noLocal) throws JMSException;
 
+  /** Creates a durable subscriber to the specified topic.
+    *  
+    * <P>If a client needs to receive all the messages published on a 
+    * topic, including the ones published while the subscriber is inactive,
+    * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
+    * retains a record of this 
+    * durable subscription and insures that all messages from the topic's 
+    * publishers are retained until they are acknowledged by this 
+    * durable subscriber or they have expired.
+    *
+    * <P>Sessions with durable subscribers must always provide the same 
+    * client identifier. In addition, each client must specify a name that 
+    * uniquely identifies (within client identifier) each durable 
+    * subscription it creates. Only one session at a time can have a 
+    * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
+    *
+    * <P>A client can change an existing durable subscription by creating 
+    * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
+    * topic and/or 
+    * message selector. Changing a durable subscriber is equivalent to 
+    * unsubscribing (deleting) the old one and creating a new one.
+    *
+    * <P>In some cases, a connection may both publish and subscribe to a 
+    * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
+    * to inhibit the delivery of messages published by its own connection.
+    * The default value for this attribute is false.
+    *
+    * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
+    * @param name the name used to identify this subscription
+    *  
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    */
 
-    /** Creates a durable subscriber to the specified topic, using a
-      * message selector or specifying whether messages published by its
-      * own connection should be delivered to it.
-      *  
-      * <P>If a client needs to receive all the messages published on a 
-      * topic, including the ones published while the subscriber is inactive,
-      * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
-      * retains a record of this 
-      * durable subscription and insures that all messages from the topic's 
-      * publishers are retained until they are acknowledged by this 
-      * durable subscriber or they have expired.
-      *
-      * <P>Sessions with durable subscribers must always provide the same
-      * client identifier. In addition, each client must specify a name which
-      * uniquely identifies (within client identifier) each durable
-      * subscription it creates. Only one session at a time can have a
-      * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
-      * An inactive durable subscriber is one that exists but
-      * does not currently have a message consumer associated with it.
-      *
-      * <P>A client can change an existing durable subscription by creating 
-      * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
-      * topic and/or 
-      * message selector. Changing a durable subscriber is equivalent to 
-      * unsubscribing (deleting) the old one and creating a new one.
-      *
-      * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
-      * @param name the name used to identify this subscription
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param noLocal if set, inhibits the delivery of messages published
-      * by its own connection
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      */ 
- 
-    TopicSubscriber
-    createDurableSubscriber(Topic topic,
-                            String name, 
-			    String messageSelector,
-			    boolean noLocal) throws JMSException;
+  TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException;
 
+  /** Creates a durable subscriber to the specified topic, using a
+    * message selector or specifying whether messages published by its
+    * own connection should be delivered to it.
+    *  
+    * <P>If a client needs to receive all the messages published on a 
+    * topic, including the ones published while the subscriber is inactive,
+    * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
+    * retains a record of this 
+    * durable subscription and insures that all messages from the topic's 
+    * publishers are retained until they are acknowledged by this 
+    * durable subscriber or they have expired.
+    *
+    * <P>Sessions with durable subscribers must always provide the same
+    * client identifier. In addition, each client must specify a name which
+    * uniquely identifies (within client identifier) each durable
+    * subscription it creates. Only one session at a time can have a
+    * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
+    * An inactive durable subscriber is one that exists but
+    * does not currently have a message consumer associated with it.
+    *
+    * <P>A client can change an existing durable subscription by creating 
+    * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
+    * topic and/or 
+    * message selector. Changing a durable subscriber is equivalent to 
+    * unsubscribing (deleting) the old one and creating a new one.
+    *
+    * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
+    * @param name the name used to identify this subscription
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param noLocal if set, inhibits the delivery of messages published
+    * by its own connection
+    *  
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    */
 
-    /** Creates a publisher for the specified topic.
-      *
-      * <P>A client uses a <CODE>TopicPublisher</CODE> object to publish 
-      * messages on a topic.
-      * Each time a client creates a <CODE>TopicPublisher</CODE> on a topic, it
-      * defines a 
-      * new sequence of messages that have no ordering relationship with the 
-      * messages it has previously sent.
-      *
-      * @param topic the <CODE>Topic</CODE> to publish to, or null if this is an
-      * unidentified producer
-      *
-      * @exception JMSException if the session fails to create a publisher
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-     */
+  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
+      throws JMSException;
 
-    TopicPublisher 
-    createPublisher(Topic topic) throws JMSException;
+  /** Creates a publisher for the specified topic.
+    *
+    * <P>A client uses a <CODE>TopicPublisher</CODE> object to publish 
+    * messages on a topic.
+    * Each time a client creates a <CODE>TopicPublisher</CODE> on a topic, it
+    * defines a 
+    * new sequence of messages that have no ordering relationship with the 
+    * messages it has previously sent.
+    *
+    * @param topic the <CODE>Topic</CODE> to publish to, or null if this is an
+    * unidentified producer
+    *
+    * @exception JMSException if the session fails to create a publisher
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+   */
 
+  TopicPublisher createPublisher(Topic topic) throws JMSException;
 
-    /** Creates a <CODE>TemporaryTopic</CODE> object. Its lifetime will be that 
-      * of the <CODE>TopicConnection</CODE> unless it is deleted earlier.
-      *
-      * @return a temporary topic identity
-      *
-      * @exception JMSException if the session fails to create a temporary
-      *                         topic due to some internal error.
-      */
- 
-    TemporaryTopic
-    createTemporaryTopic() throws JMSException;
+  /** Creates a <CODE>TemporaryTopic</CODE> object. Its lifetime will be that 
+    * of the <CODE>TopicConnection</CODE> unless it is deleted earlier.
+    *
+    * @return a temporary topic identity
+    *
+    * @exception JMSException if the session fails to create a temporary
+    *                         topic due to some internal error.
+    */
 
+  TemporaryTopic createTemporaryTopic() throws JMSException;
 
-    /** Unsubscribes a durable subscription that has been created by a client.
-      *  
-      * <P>This method deletes the state being maintained on behalf of the 
-      * subscriber by its provider.
-      *
-      * <P>It is erroneous for a client to delete a durable subscription
-      * while there is an active <CODE>TopicSubscriber</CODE> for the 
-      * subscription, or while a consumed message is part of a pending 
-      * transaction or has not been acknowledged in the session.
-      *
-      * @param name the name used to identify this subscription
-      *  
-      * @exception JMSException if the session fails to unsubscribe to the 
-      *                         durable subscription due to some internal error.
-      * @exception InvalidDestinationException if an invalid subscription name
-      *                                        is specified.
-      */
+  /** Unsubscribes a durable subscription that has been created by a client.
+    *  
+    * <P>This method deletes the state being maintained on behalf of the 
+    * subscriber by its provider.
+    *
+    * <P>It is erroneous for a client to delete a durable subscription
+    * while there is an active <CODE>TopicSubscriber</CODE> for the 
+    * subscription, or while a consumed message is part of a pending 
+    * transaction or has not been acknowledged in the session.
+    *
+    * @param name the name used to identify this subscription
+    *  
+    * @exception JMSException if the session fails to unsubscribe to the 
+    *                         durable subscription due to some internal error.
+    * @exception InvalidDestinationException if an invalid subscription name
+    *                                        is specified.
+    */
 
-    void
-    unsubscribe(String name) throws JMSException;
+  void unsubscribe(String name) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java
index 9a1337c5cb..034df82ff7 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java
@@ -1,125 +1,122 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** A client uses a <CODE>TopicSubscriber</CODE> object to receive messages that
-  * have been published to a topic. A <CODE>TopicSubscriber</CODE> object is the
-  * publish/subscribe form of a message consumer. A <CODE>MessageConsumer</CODE>
-  * can be created by using <CODE>Session.createConsumer</CODE>. 
-  *
-  * <P>A <CODE>TopicSession</CODE> allows the creation of multiple 
-  * <CODE>TopicSubscriber</CODE> objects per topic.  It will deliver each 
-  * message for a topic to each
-  * subscriber eligible to receive it. Each copy of the message
-  * is treated as a completely separate message. Work done on one copy has
-  * no effect on the others; acknowledging one does not acknowledge the
-  * others; one message may be delivered immediately, while another waits
-  * for its subscriber to process messages ahead of it.
-  *
-  * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. They 
-  * receive only messages that are published while they are active.
-  *
-  * <P>Messages filtered out by a subscriber's message selector will never 
-  * be delivered to the subscriber. From the subscriber's perspective, they 
-  * do not exist.
-  *
-  * <P>In some cases, a connection may both publish and subscribe to a topic.
-  * The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber to inhibit
-  * the 
-  * delivery of messages published by its own connection.
-  *
-  * <P>If a client needs to receive all the messages published on a topic, 
-  * including the ones published while the subscriber is inactive, it uses 
-  * a durable <CODE>TopicSubscriber</CODE>. The JMS provider retains a record of
-  * this durable 
-  * subscription and insures that all messages from the topic's publishers 
-  * are retained until they are acknowledged by this durable 
-  * subscriber or they have expired.
-  *
-  * <P>Sessions with durable subscribers must always provide the same client 
-  * identifier. In addition, each client must specify a name that uniquely 
-  * identifies (within client identifier) each durable subscription it creates.
-  * Only one session at a time can have a <CODE>TopicSubscriber</CODE> for a 
-  * particular durable subscription. 
-  *
-  * <P>A client can change an existing durable subscription by creating a 
-  * durable <CODE>TopicSubscriber</CODE> with the same name and a new topic 
-  * and/or message 
-  * selector. Changing a durable subscription is equivalent to unsubscribing 
-  * (deleting) the old one and creating a new one.
-  *
-  * <P>The <CODE>unsubscribe</CODE> method is used to delete a durable 
-  * subscription. The <CODE>unsubscribe</CODE> method can be used at the 
-  * <CODE>Session</CODE> or <CODE>TopicSession</CODE> level.
-  * This method deletes the state being 
-  * maintained on behalf of the subscriber by its provider.
-  *
-  * <P>Creating a <CODE>MessageConsumer</CODE> provides the same features as
-  * creating a <CODE>TopicSubscriber</CODE>. To create a durable subscriber, 
-  * use of <CODE>Session.CreateDurableSubscriber</CODE> is recommended. The 
-  * <CODE>TopicSubscriber</CODE> is provided to support existing code.
-  * 
-  * 
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session#createConsumer
-  * @see         javax.jms.Session#createDurableSubscriber
-  * @see         javax.jms.TopicSession
-  * @see         javax.jms.TopicSession#createSubscriber
-  * @see         javax.jms.MessageConsumer
-  */
-
-public interface TopicSubscriber extends MessageConsumer {
+ * have been published to a topic. A <CODE>TopicSubscriber</CODE> object is the
+ * publish/subscribe form of a message consumer. A <CODE>MessageConsumer</CODE>
+ * can be created by using <CODE>Session.createConsumer</CODE>.
+ *
+ * <P>A <CODE>TopicSession</CODE> allows the creation of multiple
+ * <CODE>TopicSubscriber</CODE> objects per topic.  It will deliver each
+ * message for a topic to each
+ * subscriber eligible to receive it. Each copy of the message
+ * is treated as a completely separate message. Work done on one copy has
+ * no effect on the others; acknowledging one does not acknowledge the
+ * others; one message may be delivered immediately, while another waits
+ * for its subscriber to process messages ahead of it.
+ *
+ * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. They
+ * receive only messages that are published while they are active.
+ *
+ * <P>Messages filtered out by a subscriber's message selector will never
+ * be delivered to the subscriber. From the subscriber's perspective, they
+ * do not exist.
+ *
+ * <P>In some cases, a connection may both publish and subscribe to a topic.
+ * The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber to inhibit
+ * the
+ * delivery of messages published by its own connection.
+ *
+ * <P>If a client needs to receive all the messages published on a topic,
+ * including the ones published while the subscriber is inactive, it uses
+ * a durable <CODE>TopicSubscriber</CODE>. The JMS provider retains a record of
+ * this durable
+ * subscription and insures that all messages from the topic's publishers
+ * are retained until they are acknowledged by this durable
+ * subscriber or they have expired.
+ *
+ * <P>Sessions with durable subscribers must always provide the same client
+ * identifier. In addition, each client must specify a name that uniquely
+ * identifies (within client identifier) each durable subscription it creates.
+ * Only one session at a time can have a <CODE>TopicSubscriber</CODE> for a
+ * particular durable subscription.
+ *
+ * <P>A client can change an existing durable subscription by creating a
+ * durable <CODE>TopicSubscriber</CODE> with the same name and a new topic
+ * and/or message
+ * selector. Changing a durable subscription is equivalent to unsubscribing
+ * (deleting) the old one and creating a new one.
+ *
+ * <P>The <CODE>unsubscribe</CODE> method is used to delete a durable
+ * subscription. The <CODE>unsubscribe</CODE> method can be used at the
+ * <CODE>Session</CODE> or <CODE>TopicSession</CODE> level.
+ * This method deletes the state being
+ * maintained on behalf of the subscriber by its provider.
+ *
+ * <P>Creating a <CODE>MessageConsumer</CODE> provides the same features as
+ * creating a <CODE>TopicSubscriber</CODE>. To create a durable subscriber,
+ * use of <CODE>Session.CreateDurableSubscriber</CODE> is recommended. The
+ * <CODE>TopicSubscriber</CODE> is provided to support existing code.
+ *
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session#createConsumer
+ * @see         javax.jms.Session#createDurableSubscriber
+ * @see         javax.jms.TopicSession
+ * @see         javax.jms.TopicSession#createSubscriber
+ * @see         javax.jms.MessageConsumer
+ */
 
-    /** Gets the <CODE>Topic</CODE> associated with this subscriber.
-      *  
-      * @return this subscriber's <CODE>Topic</CODE>
-      *  
-      * @exception JMSException if the JMS provider fails to get the topic for
-      *                         this topic subscriber
-      *                         due to some internal error.
-      */ 
+public interface TopicSubscriber extends MessageConsumer
+{
 
-    Topic
-    getTopic() throws JMSException;
+  /** Gets the <CODE>Topic</CODE> associated with this subscriber.
+    *  
+    * @return this subscriber's <CODE>Topic</CODE>
+    *  
+    * @exception JMSException if the JMS provider fails to get the topic for
+    *                         this topic subscriber
+    *                         due to some internal error.
+    */
 
+  Topic getTopic() throws JMSException;
 
-    /** Gets the <CODE>NoLocal</CODE> attribute for this subscriber. 
-      * The default value for this attribute is false.
-      *  
-      * @return true if locally published messages are being inhibited
-      *  
-      * @exception JMSException if the JMS provider fails to get the
-      *                         <CODE>NoLocal</CODE> attribute for
-      *                         this topic subscriber
-      *                         due to some internal error.
-      */ 
+  /** Gets the <CODE>NoLocal</CODE> attribute for this subscriber. 
+    * The default value for this attribute is false.
+    *  
+    * @return true if locally published messages are being inhibited
+    *  
+    * @exception JMSException if the JMS provider fails to get the
+    *                         <CODE>NoLocal</CODE> attribute for
+    *                         this topic subscriber
+    *                         due to some internal error.
+    */
 
-    boolean
-    getNoLocal() throws JMSException;
+  boolean getNoLocal() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TransactionInProgressException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TransactionInProgressException.java
index 010bb58c2b..67d6407c6e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TransactionInProgressException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TransactionInProgressException.java
@@ -1,61 +1,64 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /**
- * <P> This exception is thrown when an 
- *     operation is invalid because a transaction is in progress. 
- *     For instance, an attempt to call <CODE>Session.commit</CODE> when a 
- *     session is part of a distributed transaction should throw a 
+ * <P> This exception is thrown when an
+ *     operation is invalid because a transaction is in progress.
+ *     For instance, an attempt to call <CODE>Session.commit</CODE> when a
+ *     session is part of a distributed transaction should throw a
  *     <CODE>TransactionInProgressException</CODE>.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class TransactionInProgressException extends JMSException {
+public class TransactionInProgressException extends JMSException
+{
 
-  /** Constructs a <CODE>TransactionInProgressException</CODE> with the 
+  private static final long serialVersionUID = 1L;
+
+  /** Constructs a <CODE>TransactionInProgressException</CODE> with the
    *  specified reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  TransactionInProgressException(String reason, String errorCode) {
+  public TransactionInProgressException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>TransactionInProgressException</CODE> with the 
+  /** Constructs a <CODE>TransactionInProgressException</CODE> with the
    *  specified reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  TransactionInProgressException(String reason) {
+  public TransactionInProgressException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TransactionRolledBackException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TransactionRolledBackException.java
index d23a9f70a5..cce088b730 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TransactionRolledBackException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/TransactionRolledBackException.java
@@ -1,59 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a 
- *     call to <CODE>Session.commit</CODE> results in a rollback of the current 
+ * <P> This exception must be thrown when a
+ *     call to <CODE>Session.commit</CODE> results in a rollback of the current
  *     transaction.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class TransactionRolledBackException extends JMSException {
+public class TransactionRolledBackException extends JMSException
+{
 
-  /** Constructs a <CODE>TransactionRolledBackException</CODE> with the 
+  private static final long serialVersionUID = 1L;
+
+  /** Constructs a <CODE>TransactionRolledBackException</CODE> with the
    *  specified reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  TransactionRolledBackException(String reason, String errorCode) {
+  public TransactionRolledBackException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>TransactionRolledBackException</CODE> with the 
+  /** Constructs a <CODE>TransactionRolledBackException</CODE> with the
    *  specified reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  TransactionRolledBackException(String reason) {
+  public TransactionRolledBackException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java
index cd308aaa4e..34a4019a2d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java
@@ -1,78 +1,75 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** The <CODE>XAConnection</CODE> interface extends the capability of 
-  * <CODE>Connection</CODE> by providing an <CODE>XASession</CODE> (optional).
-  *
-  *<P>The <CODE>XAConnection</CODE> interface is optional. JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XAQueueConnection
-  * @see         javax.jms.XATopicConnection
-  */
+/** The <CODE>XAConnection</CODE> interface extends the capability of
+ * <CODE>Connection</CODE> by providing an <CODE>XASession</CODE> (optional).
+ *
+ *<P>The <CODE>XAConnection</CODE> interface is optional. JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XAQueueConnection
+ * @see         javax.jms.XATopicConnection
+ */
+
+public interface XAConnection extends Connection
+{
 
-public interface XAConnection extends Connection{
-    
-    /** Creates an <CODE>XASession</CODE> object.
-      *  
-      * @return a newly created <CODE>XASession</CODE>
-      *  
-      * @exception JMSException if the <CODE>XAConnection</CODE> object 
-      *                         fails to create an <CODE>XASession</CODE> due to
-      *                         some internal error.
-      *
-      * @since 1.1
-      */ 
+  /** Creates an <CODE>XASession</CODE> object.
+    *  
+    * @return a newly created <CODE>XASession</CODE>
+    *  
+    * @exception JMSException if the <CODE>XAConnection</CODE> object 
+    *                         fails to create an <CODE>XASession</CODE> due to
+    *                         some internal error.
+    *
+    * @since 1.1
+    */
 
-    XASession
-    createXASession() throws JMSException;
+  XASession createXASession() throws JMSException;
 
-    /** Creates an <CODE>Session</CODE> object.
-      *
-      * @param transacted       usage undefined
-      * @param acknowledgeMode  usage undefined
-      *  
-      * @return a <CODE>Session</CODE> object
-      *  
-      * @exception JMSException if the <CODE>XAConnection</CODE> object 
-      *                         fails to create an <CODE>Session</CODE> due to
-      *                         some internal error.
-      *
-      * @since 1.1
-      */ 
-    Session
-    createSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+  /** Creates an <CODE>Session</CODE> object.
+    *
+    * @param transacted       usage undefined
+    * @param acknowledgeMode  usage undefined
+    *  
+    * @return a <CODE>Session</CODE> object
+    *  
+    * @exception JMSException if the <CODE>XAConnection</CODE> object 
+    *                         fails to create an <CODE>Session</CODE> due to
+    *                         some internal error.
+    *
+    * @since 1.1
+    */
+  Session createSession(boolean transacted, int acknowledgeMode) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java
index bf4dc2393f..ec332ef6af 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java
@@ -1,101 +1,97 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** The <CODE>XAConnectionFactory</CODE> interface is a base interface for the
-  * <CODE>XAQueueConnectionFactory</CODE> and 
-  * <CODE>XATopicConnectionFactory</CODE> interfaces.
-  *
-  * <P>Some application servers provide support for grouping JTS capable 
-  * resource use into a distributed transaction (optional). To include JMS API transactions 
-  * in a JTS transaction, an application server requires a JTS aware JMS
-  * provider. A JMS provider exposes its JTS support using an
-  * <CODE>XAConnectionFactory</CODE> object, which an application server uses 
-  * to create <CODE>XAConnection</CODE> objects.
-  *
-  * <P><CODE>XAConnectionFactory</CODE> objects are JMS administered objects, 
-  * just like <CODE>ConnectionFactory</CODE> objects. It is expected that 
-  * application servers will find them using the Java Naming and Directory
-  * Interface (JNDI) API.
-  *
-  *<P>The <CODE>XAConnectionFactory</CODE> interface is optional. JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 April 4, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XAQueueConnectionFactory
-  * @see         javax.jms.XATopicConnectionFactory
-  */
+ * <CODE>XAQueueConnectionFactory</CODE> and
+ * <CODE>XATopicConnectionFactory</CODE> interfaces.
+ *
+ * <P>Some application servers provide support for grouping JTS capable
+ * resource use into a distributed transaction (optional). To include JMS API transactions
+ * in a JTS transaction, an application server requires a JTS aware JMS
+ * provider. A JMS provider exposes its JTS support using an
+ * <CODE>XAConnectionFactory</CODE> object, which an application server uses
+ * to create <CODE>XAConnection</CODE> objects.
+ *
+ * <P><CODE>XAConnectionFactory</CODE> objects are JMS administered objects,
+ * just like <CODE>ConnectionFactory</CODE> objects. It is expected that
+ * application servers will find them using the Java Naming and Directory
+ * Interface (JNDI) API.
+ *
+ *<P>The <CODE>XAConnectionFactory</CODE> interface is optional. JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 April 4, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XAQueueConnectionFactory
+ * @see         javax.jms.XATopicConnectionFactory
+ */
 
-public interface XAConnectionFactory {
-    
-     /** Creates an <CODE>XAConnection</CODE> with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created <CODE>XAConnection</CODE>
-      *
-      * @exception JMSException if the JMS provider fails to create an XA  
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      * 
-      * @since 1.1 
-      */ 
+public interface XAConnectionFactory
+{
 
-    XAConnection
-    createXAConnection() throws JMSException;
+  /** Creates an <CODE>XAConnection</CODE> with the default user identity.
+   * The connection is created in stopped mode. No messages 
+   * will be delivered until the <code>Connection.start</code> method
+   * is explicitly called.
+   *
+   * @return a newly created <CODE>XAConnection</CODE>
+   *
+   * @exception JMSException if the JMS provider fails to create an XA  
+   *                         connection due to some internal error.
+   * @exception JMSSecurityException  if client authentication fails due to 
+   *                         an invalid user name or password.
+   * 
+   * @since 1.1 
+   */
 
+  XAConnection createXAConnection() throws JMSException;
 
-    /** Creates an XA  connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created XA connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA  
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      *
-      * @since 1.1 
-      */ 
+  /** Creates an XA  connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created XA connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA  
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    *
+    * @since 1.1 
+    */
 
-    XAConnection
-    createXAConnection(String userName, String password) 
-					     throws JMSException;
+  XAConnection createXAConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java
index 691c7fdd46..b6e485272d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java
@@ -1,75 +1,72 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** An <CODE>XAQueueConnection</CODE> provides the same create options as 
-  * <CODE>QueueConnection</CODE> (optional).  
-  * The only difference is that an <CODE>XAConnection</CODE> is by definition 
-  * transacted.
-  *
-  *<P>The <CODE>XAQueueConnection</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2 - 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XAConnection
-  */
+/** An <CODE>XAQueueConnection</CODE> provides the same create options as
+ * <CODE>QueueConnection</CODE> (optional).
+ * The only difference is that an <CODE>XAConnection</CODE> is by definition
+ * transacted.
+ *
+ *<P>The <CODE>XAQueueConnection</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2 - 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XAConnection
+ */
 
-public interface XAQueueConnection 
-	extends XAConnection, QueueConnection {
+public interface XAQueueConnection extends XAConnection, QueueConnection
+{
 
-    /** Creates an <CODE>XAQueueSession</CODE> object.
-      *  
-      * @return a newly created <CODE>XAQueueSession</CODE>
-      *  
-      * @exception JMSException if the <CODE>XAQueueConnection</CODE> object 
-      *                         fails to create an XA queue session due to some
-      *                         internal error.
-      */ 
+  /** Creates an <CODE>XAQueueSession</CODE> object.
+    *  
+    * @return a newly created <CODE>XAQueueSession</CODE>
+    *  
+    * @exception JMSException if the <CODE>XAQueueConnection</CODE> object 
+    *                         fails to create an XA queue session due to some
+    *                         internal error.
+    */
 
-    XAQueueSession
-    createXAQueueSession() throws JMSException;
+  XAQueueSession createXAQueueSession() throws JMSException;
 
-    /** Creates an <CODE>XAQueueSession</CODE> object.
-      *
-      * @param transacted       usage undefined
-      * @param acknowledgeMode  usage undefined
-      *  
-      * @return a newly created <CODE>XAQueueSession</CODE>
-      *  
-      * @exception JMSException if the <CODE>XAQueueConnection</CODE> object 
-      *                         fails to create an XA queue session due to some
-      *                         internal error.
-      */ 
-    QueueSession
-    createQueueSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+  /** Creates an <CODE>XAQueueSession</CODE> object.
+    *
+    * @param transacted       usage undefined
+    * @param acknowledgeMode  usage undefined
+    *  
+    * @return a newly created <CODE>XAQueueSession</CODE>
+    *  
+    * @exception JMSException if the <CODE>XAQueueConnection</CODE> object 
+    *                         fails to create an XA queue session due to some
+    *                         internal error.
+    */
+  QueueSession createQueueSession(boolean transacted, int acknowledgeMode) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java
index 5978e54d12..d7fe335724 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java
@@ -1,85 +1,80 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** An <CODE>XAQueueConnectionFactory</CODE> provides the same create options as
-  * a <CODE>QueueConnectionFactory</CODE> (optional).
-  *
-  * <P>The <CODE>XATopicConnectionFactory</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 - 8 April 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.QueueConnectionFactory
-  * @see         javax.jms.XAConnectionFactory
-  */
-
-public interface XAQueueConnectionFactory 
-       extends XAConnectionFactory, QueueConnectionFactory {
+ * a <CODE>QueueConnectionFactory</CODE> (optional).
+ *
+ * <P>The <CODE>XATopicConnectionFactory</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 - 8 April 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.QueueConnectionFactory
+ * @see         javax.jms.XAConnectionFactory
+ */
 
-    /** Creates an XA queue connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created XA queue connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA queue 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-       */ 
+public interface XAQueueConnectionFactory extends XAConnectionFactory, QueueConnectionFactory
+{
 
-    XAQueueConnection
-    createXAQueueConnection() throws JMSException;
+  /** Creates an XA queue connection with the default user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *
+    * @return a newly created XA queue connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA queue 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+     */
 
+  XAQueueConnection createXAQueueConnection() throws JMSException;
 
-    /** Creates an XA queue connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created XA queue connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA queue 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+  /** Creates an XA queue connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created XA queue connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA queue 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
-    XAQueueConnection
-    createXAQueueConnection(String userName, String password) 
-					     throws JMSException;
+  XAQueueConnection createXAQueueConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java
index d524162a6a..e35dbf679d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java
@@ -1,58 +1,57 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** An <CODE>XAQueueSession</CODE> provides a regular <CODE>QueueSession</CODE>,
-  * which can be used to
-  * create <CODE>QueueReceiver</CODE>, <CODE>QueueSender</CODE>, and 
-  *<CODE>QueueBrowser</CODE> objects (optional).
-  *
-  * <P>The <CODE>XAQueueSession</CODE> interface is optional. JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
+ * which can be used to
+ * create <CODE>QueueReceiver</CODE>, <CODE>QueueSender</CODE>, and
+ *<CODE>QueueBrowser</CODE> objects (optional).
  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XASession
-  */
+ * <P>The <CODE>XAQueueSession</CODE> interface is optional. JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XASession
+ */
+
+public interface XAQueueSession extends XASession
+{
 
-public interface XAQueueSession extends XASession {
+  /** Gets the queue session associated with this <CODE>XAQueueSession</CODE>.
+    *  
+    * @return the queue session object
+    *  
+    * @exception JMSException if an internal error occurs.
+    */
 
-    /** Gets the queue session associated with this <CODE>XAQueueSession</CODE>.
-      *  
-      * @return the queue session object
-      *  
-      * @exception JMSException if an internal error occurs.
-      */ 
- 
-    QueueSession
-    getQueueSession() throws JMSException;
+  QueueSession getQueueSession() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java
index 31689cf49c..38679b627e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java
@@ -1,23 +1,23 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
@@ -25,99 +25,93 @@ package javax.jms;
 
 import javax.transaction.xa.XAResource;
 
-/** The <CODE>XASession</CODE> interface extends the capability of 
-  * <CODE>Session</CODE> by adding access to a JMS provider's support for the
-  * Java Transaction API (JTA) (optional). This support takes the form of a 
-  * <CODE>javax.transaction.xa.XAResource</CODE> object. The functionality of 
-  * this object closely resembles that defined by the standard X/Open XA 
-  * Resource interface.
-  *
-  * <P>An application server controls the transactional assignment of an 
-  * <CODE>XASession</CODE> by obtaining its <CODE>XAResource</CODE>. It uses 
-  * the <CODE>XAResource</CODE> to assign the session to a transaction, prepare 
-  * and commit work on the transaction, and so on.
-  *
-  * <P>An <CODE>XAResource</CODE> provides some fairly sophisticated facilities 
-  * for interleaving work on multiple transactions, recovering a list of 
-  * transactions in progress, and so on. A JTA aware JMS provider must fully 
-  * implement this functionality. This could be done by using the services 
-  * of a database that supports XA, or a JMS provider may choose to implement 
-  * this functionality from scratch.
-  *
-  * <P>A client of the application server is given what it thinks is a 
-  * regular JMS <CODE>Session</CODE>. Behind the scenes, the application server 
-  * controls the transaction management of the underlying 
-  * <CODE>XASession</CODE>.
-  *
-  * <P>The <CODE>XASession</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session
-  */ 
- 
-public interface XASession extends Session {
+/** The <CODE>XASession</CODE> interface extends the capability of
+ * <CODE>Session</CODE> by adding access to a JMS provider's support for the
+ * Java Transaction API (JTA) (optional). This support takes the form of a
+ * <CODE>javax.transaction.xa.XAResource</CODE> object. The functionality of
+ * this object closely resembles that defined by the standard X/Open XA
+ * Resource interface.
+ *
+ * <P>An application server controls the transactional assignment of an
+ * <CODE>XASession</CODE> by obtaining its <CODE>XAResource</CODE>. It uses
+ * the <CODE>XAResource</CODE> to assign the session to a transaction, prepare
+ * and commit work on the transaction, and so on.
+ *
+ * <P>An <CODE>XAResource</CODE> provides some fairly sophisticated facilities
+ * for interleaving work on multiple transactions, recovering a list of
+ * transactions in progress, and so on. A JTA aware JMS provider must fully
+ * implement this functionality. This could be done by using the services
+ * of a database that supports XA, or a JMS provider may choose to implement
+ * this functionality from scratch.
+ *
+ * <P>A client of the application server is given what it thinks is a
+ * regular JMS <CODE>Session</CODE>. Behind the scenes, the application server
+ * controls the transaction management of the underlying
+ * <CODE>XASession</CODE>.
+ *
+ * <P>The <CODE>XASession</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session
+ */
+
+public interface XASession extends Session
+{
 
-   /** Gets the session associated with this <CODE>XASession</CODE>.
-      *  
-      * @return the  session object
-      *  
-      * @exception JMSException if an internal error occurs.
-      *
-      * @since 1.1
-      */ 
- 
-        Session
-        getSession() throws JMSException;
-  
-    /** Returns an XA resource to the caller.
-      *
-      * @return an XA resource to the caller
-      */
+  /** Gets the session associated with this <CODE>XASession</CODE>.
+     *  
+     * @return the  session object
+     *  
+     * @exception JMSException if an internal error occurs.
+     *
+     * @since 1.1
+     */
 
-     XAResource
-     getXAResource();
+  Session getSession() throws JMSException;
 
-    /** Indicates whether the session is in transacted mode.
-      *  
-      * @return true
-      *  
-      * @exception JMSException if the JMS provider fails to return the 
-      *                         transaction mode due to some internal error.
-      */ 
+  /** Returns an XA resource to the caller.
+    *
+    * @return an XA resource to the caller
+    */
 
-    boolean
-    getTransacted() throws JMSException;
+  XAResource getXAResource();
 
+  /** Indicates whether the session is in transacted mode.
+    *  
+    * @return true
+    *  
+    * @exception JMSException if the JMS provider fails to return the 
+    *                         transaction mode due to some internal error.
+    */
 
-    /** Throws a <CODE>TransactionInProgressException</CODE>, since it should 
-      * not be called for an <CODE>XASession</CODE> object.
-      *
-      * @exception TransactionInProgressException if the method is called on 
-      *                         an <CODE>XASession</CODE>.
-      *                                     
-      */
+  boolean getTransacted() throws JMSException;
 
-    void
-    commit() throws JMSException;
+  /** Throws a <CODE>TransactionInProgressException</CODE>, since it should 
+    * not be called for an <CODE>XASession</CODE> object.
+    *
+    * @exception TransactionInProgressException if the method is called on 
+    *                         an <CODE>XASession</CODE>.
+    *                                     
+    */
 
+  void commit() throws JMSException;
 
-    /** Throws a <CODE>TransactionInProgressException</CODE>, since it should 
-      * not be called for an <CODE>XASession</CODE> object.
-      *
-      * @exception TransactionInProgressException if the method is called on 
-      *                         an <CODE>XASession</CODE>.
-      *                                     
-      */
+  /** Throws a <CODE>TransactionInProgressException</CODE>, since it should 
+    * not be called for an <CODE>XASession</CODE> object.
+    *
+    * @exception TransactionInProgressException if the method is called on 
+    *                         an <CODE>XASession</CODE>.
+    *                                     
+    */
 
-    void
-    rollback() throws JMSException;
+  void rollback() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java
index 5f6b218fff..e05efb13f7 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java
@@ -1,76 +1,72 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** An <CODE>XATopicConnection</CODE> provides the same create options as 
-  * <CODE>TopicConnection</CODE> (optional). The Topic connections created are
-  * transactional.
-  *
-  * <P>The <CODE>XATopicConnection</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XAConnection
-  */
+/** An <CODE>XATopicConnection</CODE> provides the same create options as
+ * <CODE>TopicConnection</CODE> (optional). The Topic connections created are
+ * transactional.
+ *
+ * <P>The <CODE>XATopicConnection</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XAConnection
+ */
 
-public interface XATopicConnection 
-	extends XAConnection, TopicConnection {
+public interface XATopicConnection extends XAConnection, TopicConnection
+{
 
-    /** Creates an <CODE>XATopicSession</CODE> object.
-      *  
-      * @return a newly created XA topic session
-      *  
-      * @exception JMSException if the <CODE>XATopicConnection</CODE> object
-      *                         fails to create an XA topic session due to some 
-      *                         internal error.
-      */ 
+  /** Creates an <CODE>XATopicSession</CODE> object.
+    *  
+    * @return a newly created XA topic session
+    *  
+    * @exception JMSException if the <CODE>XATopicConnection</CODE> object
+    *                         fails to create an XA topic session due to some 
+    *                         internal error.
+    */
 
-    XATopicSession
-    createXATopicSession() throws JMSException;
+  XATopicSession createXATopicSession() throws JMSException;
 
-    /** Creates an <CODE>XATopicSession</CODE> object.
-      *
-      * @param transacted usage undefined
-      * @param acknowledgeMode usage undefined
-      *  
-      * @return a newly created XA topic session
-      *  
-      * @exception JMSException if the <CODE>XATopicConnection</CODE> object
-      *                         fails to create an XA topic session due to some 
-      *                         internal error.
-      */ 
+  /** Creates an <CODE>XATopicSession</CODE> object.
+    *
+    * @param transacted usage undefined
+    * @param acknowledgeMode usage undefined
+    *  
+    * @return a newly created XA topic session
+    *  
+    * @exception JMSException if the <CODE>XATopicConnection</CODE> object
+    *                         fails to create an XA topic session due to some 
+    *                         internal error.
+    */
 
-    TopicSession
-    createTopicSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+  TopicSession createTopicSession(boolean transacted, int acknowledgeMode) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java
index 6f589d1493..3259498fb0 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java
@@ -1,85 +1,80 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** An <CODE>XATopicConnectionFactory</CODE> provides the same create options as 
-  * a <CODE>TopicConnectionFactory</CODE> (optional).
-  *
-  * <P>The <CODE>XATopicConnectionFactory</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.TopicConnectionFactory
-  * @see         javax.jms.XAConnectionFactory
-  */
-
-public interface XATopicConnectionFactory 
-	extends XAConnectionFactory, TopicConnectionFactory {
+/** An <CODE>XATopicConnectionFactory</CODE> provides the same create options as
+ * a <CODE>TopicConnectionFactory</CODE> (optional).
+ *
+ * <P>The <CODE>XATopicConnectionFactory</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.TopicConnectionFactory
+ * @see         javax.jms.XAConnectionFactory
+ */
 
-    /** Creates an XA topic connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created XA topic connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA topic 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+public interface XATopicConnectionFactory extends XAConnectionFactory, TopicConnectionFactory
+{
 
-    XATopicConnection
-    createXATopicConnection() throws JMSException;
+  /** Creates an XA topic connection with the default user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *
+    * @return a newly created XA topic connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA topic 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
+  XATopicConnection createXATopicConnection() throws JMSException;
 
-    /** Creates an XA topic connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created XA topic connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA topic 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+  /** Creates an XA topic connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created XA topic connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA topic 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
-    XATopicConnection
-    createXATopicConnection(String userName, String password) 
-					     throws JMSException;
+  XATopicConnection createXATopicConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java
index 091e391438..c395d56d57 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java
@@ -1,57 +1,57 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /** An <CODE>XATopicSession</CODE> provides a regular <CODE>TopicSession</CODE>.
-  * which can be used to create <CODE>TopicSubscriber</CODE> and 
-  * <CODE>TopicPublisher</CODE> objects (optional).
-  *
-  * <P>The <CODE>XATopicSession</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than using these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XASession
-  * @see         javax.jms.TopicSession
-  */
+ * which can be used to create <CODE>TopicSubscriber</CODE> and
+ * <CODE>TopicPublisher</CODE> objects (optional).
+ *
+ * <P>The <CODE>XATopicSession</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than using these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XASession
+ * @see         javax.jms.TopicSession
+ */
+
+public interface XATopicSession extends XASession
+{
 
-public interface XATopicSession extends XASession {
+  /** Gets the topic session associated with this <CODE>XATopicSession</CODE>.
+    *   
+    * @return the topic session object
+    *   
+    * @exception JMSException if an internal error occurs.
+    */
 
-    /** Gets the topic session associated with this <CODE>XATopicSession</CODE>.
-      *   
-      * @return the topic session object
-      *   
-      * @exception JMSException if an internal error occurs.
-      */  
-  
-    TopicSession 
-    getTopicSession() throws JMSException;
+  TopicSession getTopicSession() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
index e2ac69a792..e5589bb19d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.server.jdbc
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.jms.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: javax.jms;version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.server.internal.jdbc.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.server.jdbc;version="4.0.300"
+Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.server.internal.jdbc.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.server.jdbc;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java
index d572c4e18f..d2422821b3 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java
index 489baaa349..9d2dc91a96 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
index 9933cb5239..3b0ee5b348 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
@@ -31,13 +31,13 @@ public class JMSSchema
   public static final IDBTable DESTINATIONS = INSTANCE.addTable("destinations"); //$NON-NLS-1$
 
   public static final IDBField DESTINATIONS_NAME = //
-  DESTINATIONS.addField("name", DBType.VARCHAR, 255); //$NON-NLS-1$
+      DESTINATIONS.addField("name", DBType.VARCHAR, 255); //$NON-NLS-1$
 
   public static final IDBField DESTINATIONS_TYPE = //
-  DESTINATIONS.addField("type", DBType.INTEGER); //$NON-NLS-1$
+      DESTINATIONS.addField("type", DBType.INTEGER); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_DESTINATIONS_PK = //
-  DESTINATIONS.addIndex(IDBIndex.Type.PRIMARY_KEY, DESTINATIONS_NAME);
+      DESTINATIONS.addIndex(IDBIndex.Type.PRIMARY_KEY, DESTINATIONS_NAME);
 
   /**
    * DBTable Messages
@@ -45,16 +45,16 @@ public class JMSSchema
   public static final IDBTable MESSAGES = INSTANCE.addTable("messages"); //$NON-NLS-1$
 
   public static final IDBField MESSAGES_ID = //
-  MESSAGES.addField("id", DBType.VARCHAR); //$NON-NLS-1$
+      MESSAGES.addField("id", DBType.VARCHAR); //$NON-NLS-1$
 
   public static final IDBField MESSAGES_DESTINATION = //
-  MESSAGES.addField("destination", DBType.VARCHAR); //$NON-NLS-1$
+      MESSAGES.addField("destination", DBType.VARCHAR); //$NON-NLS-1$
 
   public static final IDBField MESSAGES_PRIORITY = //
-  MESSAGES.addField("priority", DBType.INTEGER); //$NON-NLS-1$
+      MESSAGES.addField("priority", DBType.INTEGER); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_MESSAGES_PK = //
-  MESSAGES.addIndex(IDBIndex.Type.PRIMARY_KEY, MESSAGES_ID);
+      MESSAGES.addIndex(IDBIndex.Type.PRIMARY_KEY, MESSAGES_ID);
 
   /**
    * Queries
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
index 17fb21bf16..f63cea203c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java
index 4056f7f21e..80237afc7b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
index 11d9a3120c..33844b8959 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.server
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,10 +12,10 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.jms;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: javax.jms;version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.net4j.jms.internal.server;version="4.0.300";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
- org.eclipse.net4j.jms.internal.server.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.internal.server.messages;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.internal.server.protocol;version="4.0.300";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
- org.eclipse.net4j.jms.internal.server.protocol.admin;version="4.0.300";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
- org.eclipse.net4j.jms.internal.server.store;version="4.0.300";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
- org.eclipse.net4j.jms.server;version="4.0.300"
+Export-Package: org.eclipse.net4j.jms.internal.server;version="4.0.400";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.internal.server.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.internal.server.messages;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.internal.server.protocol;version="4.0.400";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.internal.server.protocol.admin;version="4.0.400";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.internal.server.store;version="4.0.400";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.server;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
index 0ecee99501..aea37c580b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
@@ -37,7 +37,7 @@ import java.util.concurrent.ConcurrentMap;
 /**
  * @author Eike Stepper
  */
-public class Server extends QueueWorker<MessageImpl> implements IServer
+public class Server extends QueueWorker<MessageImpl>implements IServer
 {
   public static final Server INSTANCE = new Server();
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
index e9510c08e3..bd0df1552f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
index fa0128b35b..80e00ecaf2 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -40,7 +40,8 @@ public class ServerConsumer implements IServerConsumer
 
   private ConcurrentMap<String, MessageImpl> messages = new ConcurrentHashMap<String, MessageImpl>();
 
-  public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal, boolean durable)
+  public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal,
+      boolean durable)
   {
     this.id = id;
     this.destination = destination;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
index 8c14d7cc35..b3f72a7b8e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
index 91b243bc25..151de418df 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
index 001aa51b43..a9a2aa0a37 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/messages/Messages.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/messages/Messages.java
index 47d3f6c971..ee969cd557 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
index febeb2708b..fe5a1c6ac5 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
index b275c47628..0fadc8741b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
index dc9bbc0a05..142df75590 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
index 2c1296dd52..f387afdec4 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
index fe5d1f6e1d..004ec58e6e 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
index 983deecf97..71b5cc45af 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
index 0dc12bbdc7..e28d6cb4dd 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
index 3865fd810e..883ff82bb6 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
index 60591a016f..5046288696 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
index 75d4bdbd8a..4b1fb8eb03 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
index 4d0d26b8ab..fa0d9d770c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
index a3d5954159..b3fcdd01c0 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
index a14be5f340..bfeca720b6 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
index af5925ac51..2ddf206e63 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
index be0c2b0eab..f376ba6999 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java
index 03a9034f42..95c488f6f9 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
index fdc725be74..476f29f073 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java
index a36c2c111a..cfeefe5f1d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java
index 27982b10c8..eb5647a85a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java
index d375271a4f..b30b0756dd 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java
index d3d96edd67..09e467034b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java
index dd227bd8dd..493b6a414b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java
index 7f6b8f1bbe..e931747d3a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
index 4d16f38859..a828472a2a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java
index 1f7bd152b2..2de16729a1 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java
index bb42455125..c2edfe8fab 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
index 02652e4a1c..cbc6f3c83f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java
index 0af2cd79b8..db5208e28b 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
index 1c2493c118..1668b7074f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.jms.tests
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
 Bundle-Localization: plugin
@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.jms.server.jdbc;bundle-version="[4.0.0,5.0.0)"
 Import-Package: javax.jms;version="[1.1.0,2.0.0)",
  org.eclipse.net4j.db.derby;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.jms.tests;version="4.0.200";x-internal:=true
+Export-Package: org.eclipse.net4j.jms.tests;version="4.0.300";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java
index 491cd02892..e311dab76c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java
index 0b768839d5..8abc78ef1c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
index 015c53027a..5fd77371d5 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,9 +12,9 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: javax.jms;version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.net4j.internal.jms;version="4.0.300",
- org.eclipse.net4j.internal.jms.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.internal.jms.messages;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.internal.jms.protocol;version="4.0.300",
- org.eclipse.net4j.internal.jms.util;version="4.0.300",
- org.eclipse.net4j.jms;version="4.0.300"
+Export-Package: org.eclipse.net4j.internal.jms;version="4.0.400",
+ org.eclipse.net4j.internal.jms.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.internal.jms.messages;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.internal.jms.protocol;version="4.0.400",
+ org.eclipse.net4j.internal.jms.util;version="4.0.400",
+ org.eclipse.net4j.jms;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
index be8a4010de..959a692e27 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
index 7f40704a59..40c48b119d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
index 7c07da06a8..15cd152377 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
@@ -44,7 +44,7 @@ import javax.jms.Topic;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ConnectionImpl extends Container<Session> implements Connection
+public class ConnectionImpl extends Container<Session>implements Connection
 {
   private String connectorType;
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
index 86c3dcbc26..f16e16c252 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java
index 16eb20dab4..b5bc816bd0 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java
index d3abddbd9b..38781fa498 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java
index 20ddc95d29..7995a0c537 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
index ac8c67c6cd..521ef37b53 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
index 1f2c994d86..0abc6eab99 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
index 6ede4348cc..c08ada2eac 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -33,7 +33,7 @@ import java.util.Map.Entry;
 public class MessageImpl implements Message, Comparable<MessageImpl>
 {
   private static final String[] KEYWORDS = { "and", "between", "escape", "in", "is", "like", "false", "null", "or", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "not", "true" }; //$NON-NLS-1$ //$NON-NLS-2$
+    "not", "true" }; //$NON-NLS-1$ //$NON-NLS-2$
 
   private Map<String, Object> properties = new HashMap<String, Object>();
 
@@ -310,8 +310,8 @@ public class MessageImpl implements Message, Comparable<MessageImpl>
     }
     else
     {
-      throw new MessageFormatException(MessageFormat.format(
-          Messages.getString("MessageImpl_11"), value.getClass().getName())); //$NON-NLS-1$ 
+      throw new MessageFormatException(
+          MessageFormat.format(Messages.getString("MessageImpl_11"), value.getClass().getName())); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java
index ded5ccdc7e..e806abbde7 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
index 81c7b42daa..14fb7aa2d9 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
index fbe03971b5..722cd9534a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java
index fcb03068ec..1d7d412fce 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java
index 34db7358ea..d48b308126 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java
index 80a32c9f53..7eec43b40f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
index 22d7057a41..b172e6b41d 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
@@ -54,7 +54,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Session
+public class SessionImpl extends QueueWorker<MessageConsumerImpl>implements Session
 {
   private ConnectionImpl connection;
 
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
index df4baefa09..479ddc4989 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
index 4c125d0122..4a23b8dad6 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java
index 2c504a593d..d7bbda13c7 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java
index 8a80920794..f9561c00f4 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -42,8 +42,7 @@ public class TopicPublisherImpl extends MessageProducerImpl implements TopicPubl
     publish(topic, message, getDeliveryMode(), getPriority(), getTimeToLive());
   }
 
-  public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException
+  public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
   {
     send(topic, message, deliveryMode, priority, timeToLive);
   }
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
index 5dbb47ef92..f4fcb1f396 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
index e1fb63300e..fded4b6656 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/messages/Messages.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/messages/Messages.java
index d12570a9c2..5152781077 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/messages/Messages.java
@@ -4,9 +4,9 @@
  * 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:
- *    Victor Roldan Betancort - initial API and implementation 
+ *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
 package org.eclipse.net4j.internal.jms.messages;
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java
index 91b03d43aa..24a821635c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java
index fba208fb60..ae8cbce261 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
index 56515a0ccc..20d27c74c1 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java
index c69cc5a294..43831db624 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java
index 482643a7d9..ee281aabee 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java
index d52ff229dc..8fe85a1ce5 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java
index fa4026b7b6..6be0fd11cf 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java
index 113e1d309b..d042465e74 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java
index e52cb885ec..4fa727328f 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java
index f9219f88db..8c4f069456 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
index e5e4976ed0..2f45b2a097 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java
index ddd2e0e05d..b81cb53c6c 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
index e5b132793b..4d499d3937 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java
index 9a78e79db1..4fa27ae104 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
index a6bc7ba12a..62506ecb70 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
index b1796234d1..7c920550ae 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
index 4f71083c0c..8285baa04a 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java
index f48d5b534c..9fb4db25cc 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
index ebc21585c9..7d1a18a1d4 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java
index 92b5182f04..f6fe142957 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
index d8abc83783..6a845bb0de 100644
--- a/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
+++ b/plugins/org.eclipse.net4j.examples.installer/examples/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
index 4fc99edeca..32cbca24d3 100644
--- a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.examples;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.internal.examples.bundle.OM$Activator
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.net4j.examples.echo;version="4.0.300",
- org.eclipse.net4j.examples.echo.client;version="4.0.300",
- org.eclipse.net4j.examples.echo.server;version="4.0.300",
- org.eclipse.net4j.examples.transfer;version="4.0.300",
- org.eclipse.net4j.internal.examples.bundle;version="4.0.300"
+Export-Package: org.eclipse.net4j.examples.echo;version="4.0.400",
+ org.eclipse.net4j.examples.echo.client;version="4.0.400",
+ org.eclipse.net4j.examples.echo.server;version="4.0.400",
+ org.eclipse.net4j.examples.transfer;version="4.0.400",
+ org.eclipse.net4j.internal.examples.bundle;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java
index 3435590cc7..025b183122 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java
index bd7f7b51cd..3add75d591 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java
@@ -42,7 +42,7 @@ public class EchoClient
     try
     {
       // Start a connector that represents the client side of a physical connection
-      IConnector connector = Net4jUtil.getConnector(container, "tcp", "localhost:2036"); //$NON-NLS-1$ //$NON-NLS-2$ 
+      IConnector connector = Net4jUtil.getConnector(container, "tcp", "localhost:2036"); //$NON-NLS-1$ //$NON-NLS-2$
 
       // Open a virtual channel with the ECHO protocol, send an ECHO request and close the channel
       EchoClientProtocol protocol = new EchoClientProtocol(connector);
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
index db976fd66b..dd67cf70d8 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.signal.SignalProtocol;
  * @author Eike Stepper
  * @since 2.0
  */
-public class EchoClientProtocol extends SignalProtocol<Object> implements EchoProtocol
+public class EchoClientProtocol extends SignalProtocol<Object>implements EchoProtocol
 {
   public EchoClientProtocol(IConnector connector)
   {
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java
index 000144fb43..28f6f11025 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoSSLClient.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoSSLClient.java
index 7db1b725eb..92ecb919a9 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoSSLClient.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoSSLClient.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  */
@@ -42,7 +42,7 @@ public class EchoSSLClient
     try
     {
       // Start a connector that represents the client side of a physical connection
-      IConnector connector = Net4jUtil.getConnector(container, "ssl", "localhost:2036"); //$NON-NLS-1$ //$NON-NLS-2$ 
+      IConnector connector = Net4jUtil.getConnector(container, "ssl", "localhost:2036"); //$NON-NLS-1$ //$NON-NLS-2$
 
       // Open a virtual channel with the ECHO protocol, send an ECHO request and close the channel
       EchoClientProtocol protocol = new EchoClientProtocol(connector);
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java
index 19ddf06cee..ca2fee5a4c 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoSSLServer.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoSSLServer.java
index 01a6a08f93..f621563701 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoSSLServer.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoSSLServer.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  */
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
index bd62581b1c..e2311415c1 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -21,7 +21,7 @@ import org.eclipse.spi.net4j.ServerProtocolFactory;
  * @author Eike Stepper
  * @since 2.0
  */
-public class EchoServerProtocol extends SignalProtocol<Object> implements EchoProtocol
+public class EchoServerProtocol extends SignalProtocol<Object>implements EchoProtocol
 {
   public EchoServerProtocol()
   {
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadProtocol.java
index 4b34f6d6fd..78a1b33ef3 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadProtocol.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadSSLClientAction.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadSSLClientAction.java
index 3909f9c4f1..30c96a1b31 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadSSLClientAction.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadSSLClientAction.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  */
@@ -38,7 +38,7 @@ import java.io.FileInputStream;
 
 /**
  * Need to change to this class in plugin.xml
- * 
+ *
  * @author Teerawat Chaiyakijpichet (No Magic Asia Ltd.)
  * @since 4.0
  */
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadSSLServer.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadSSLServer.java
index 82aff2f70e..f15269dbec 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadSSLServer.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadSSLServer.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  */
@@ -36,7 +36,7 @@ import java.io.FileOutputStream;
 
 /**
  * Need to change to this class in plugin.xml
- * 
+ *
  * @author Teerawat Chaiyakijpichet (No Magic Asia Ltd.)
  * @since 4.0
  */
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java
index fc59f6f250..2f1bfd7581 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java
index 9e2a70642b..93658bcefb 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/IHTTPConnector.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import org.eclipse.net4j.connector.IConnector;
 
 /**
  * A {@link IConnector connector} that implements polling HTTP transport.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/package-info.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/package-info.java
index 84094ac6dc..39fc05e8d4 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/package-info.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/common/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
- * Transport layer extension with support for HTTP connections. 
+ * Transport layer extension with support for HTTP connections.
  */
 package org.eclipse.net4j.http.common;
-
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/bundle/OM.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/bundle/OM.java
index a0b89542eb..cee557b0c6 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/Messages.java b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/Messages.java
index ea239014bb..f7e4351dc3 100644
--- a/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.http.common/src/org/eclipse/net4j/http/internal/common/messages/Messages.java
@@ -4,10 +4,10 @@
  * 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:
- *    Victor Roldan Betancort - initial API and implementation 
- *    Eike Stepper - maintenance  
+ *    Victor Roldan Betancort - initial API and implementation
+ *    Eike Stepper - maintenance
  */
 package org.eclipse.net4j.http.internal.common.messages;
 
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptorFactory.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptorFactory.java
index 96fc17f13d..f1507b1082 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptorFactory.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptorFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
index 20f06ec433..052984d0f6 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -176,8 +176,8 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
     }
   }
 
-  protected void doConnect(ExtendedDataInputStream in, ExtendedDataOutputStream out) throws ServletException,
-      IOException
+  protected void doConnect(ExtendedDataInputStream in, ExtendedDataOutputStream out)
+      throws ServletException, IOException
   {
     try
     {
@@ -198,8 +198,8 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
     }
   }
 
-  protected void doDisconnect(ExtendedDataInputStream in, ExtendedDataOutputStream out) throws ServletException,
-      IOException
+  protected void doDisconnect(ExtendedDataInputStream in, ExtendedDataOutputStream out)
+      throws ServletException, IOException
   {
     try
     {
@@ -217,8 +217,8 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
     }
   }
 
-  protected void doOperations(ExtendedDataInputStream in, ExtendedDataOutputStream out) throws ServletException,
-      IOException
+  protected void doOperations(ExtendedDataInputStream in, ExtendedDataOutputStream out)
+      throws ServletException, IOException
   {
     String connectorID = in.readString();
     if (TRACER.isEnabled())
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/RandomizerInjector.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/RandomizerInjector.java
index bdde705fcb..2c6731826d 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/RandomizerInjector.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/RandomizerInjector.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/bundle/OM.java
index 6aede1fcbb..8d73af8a86 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/messages/Messages.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/messages/Messages.java
index e07d138fc6..8653093bfe 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/HTTPServerUtil.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/HTTPServerUtil.java
index 3415cc7f4f..0ec1d7b64a 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/HTTPServerUtil.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/HTTPServerUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.container.IManagedContainer;
 
 /**
  * A utility class with static convenience methods.
- * 
+ *
  * @author Eike Stepper
  */
 public final class HTTPServerUtil
@@ -33,7 +33,7 @@ public final class HTTPServerUtil
 
   public static IHTTPAcceptor getAcceptor(IManagedContainer container, String description)
   {
-    return (IHTTPAcceptor)container
-        .getElement(HTTPAcceptorFactory.PRODUCT_GROUP, HTTPAcceptorFactory.TYPE, description);
+    return (IHTTPAcceptor)container.getElement(HTTPAcceptorFactory.PRODUCT_GROUP, HTTPAcceptorFactory.TYPE,
+        description);
   }
 }
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/IHTTPAcceptor.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/IHTTPAcceptor.java
index 6a634bab13..5d0a0bac4a 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/IHTTPAcceptor.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/IHTTPAcceptor.java
@@ -4,7 +4,7 @@
  * 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,7 +15,7 @@ import org.eclipse.net4j.acceptor.IAcceptor;
 /**
  * An {@link IAcceptor acceptor} that implements HTTP transport by collaborating with a configured
  * {@link INet4jTransportServlet servlet}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/INet4jTransportServlet.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/INet4jTransportServlet.java
index beb71c8e49..e6199a8f4b 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/INet4jTransportServlet.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/INet4jTransportServlet.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import java.io.IOException;
 
 /**
  * A {@link Servlet servlet} with a configured {@link RequestHandler request handler}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
@@ -33,7 +33,7 @@ public interface INet4jTransportServlet extends Servlet
 
   /**
    * Call-back that handles the requests that arrive at a {@link INet4jTransportServlet servlet}.
-   * 
+   *
    * @author Eike Stepper
    */
   public interface RequestHandler
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/package-info.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/package-info.java
index 36f5b0791c..7e06fe5e5c 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/package-info.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/server/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
- * Transport layer extension with support for HTTP connections. 
+ * Transport layer extension with support for HTTP connections.
  */
 package org.eclipse.net4j.http.server;
-
diff --git a/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/Net4jEchoTestServlet.java b/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/Net4jEchoTestServlet.java
index 359cbfeadb..b4ae91310e 100644
--- a/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/Net4jEchoTestServlet.java
+++ b/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/Net4jEchoTestServlet.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
index ebed8981f6..62937773b5 100644
--- a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.http;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -15,6 +15,6 @@ Import-Package: org.apache.commons.codec;version="[1.3.0,2.0.0)",
  org.apache.commons.httpclient;version="[3.0.0,4.0.0)",
  org.apache.commons.httpclient.methods;version="[3.0.0,4.0.0)",
  org.apache.commons.logging;version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.net4j.http;version="4.0.300",
- org.eclipse.net4j.internal.http;version="4.0.300";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs",
- org.eclipse.net4j.internal.http.bundle;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.net4j.http;version="4.0.400",
+ org.eclipse.net4j.internal.http;version="4.0.400";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs",
+ org.eclipse.net4j.internal.http.bundle;version="4.0.400";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/HTTPUtil.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/HTTPUtil.java
index 801c66f9ef..f79edf7566 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/HTTPUtil.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/HTTPUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.container.IManagedContainer;
 
 /**
  * A utility class with static convenience methods.
- * 
+ *
  * @author Eike Stepper
  */
 public final class HTTPUtil
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/package-info.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/package-info.java
index 1762accae2..a5949fe062 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/package-info.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/http/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
- * Transport layer extension with support for HTTP connections. 
+ * Transport layer extension with support for HTTP connections.
  */
 package org.eclipse.net4j.http;
-
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPConnectorFactory.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPConnectorFactory.java
index dc372173fe..16e898b1b8 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPConnectorFactory.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPConnectorFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/bundle/OM.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/bundle/OM.java
index 371313e24a..5327308b68 100644
--- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
index adaffccc9a..7b55808de9 100644
--- a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.admin
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.net4j.jms.internal.admin.bundle.OM
@@ -10,8 +10,8 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.jms;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.jms.admin;version="4.0.300",
- org.eclipse.net4j.jms.internal.admin;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.internal.admin.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.internal.admin.protocol;version="4.0.300";x-internal:=true
+Export-Package: org.eclipse.net4j.jms.admin;version="4.0.400",
+ org.eclipse.net4j.jms.internal.admin;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.internal.admin.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.internal.admin.protocol;version="4.0.400";x-internal:=true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java
index f8336ddd89..bd76cee07e 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/IJMSAdmin.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java
index 7bc2d9aa17..cd17f1d056 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java
index 40602b7baf..c2083d8332 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
index e5cf3bf8de..483ef9bcdb 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
index c095b580f3..62fbb3f0de 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java
index 7a7da05c49..0d2854fd0a 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
index 09e394fde1..bd9d798a60 100644
--- a/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.api
-Bundle-Version: 3.1.100.qualifier
+Bundle-Version: 3.1.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java
index 669d1b3891..139d5a2da3 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/BytesMessage.java
@@ -1,577 +1,519 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
- 
 package javax.jms;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/** A <CODE>BytesMessage</CODE> object is used to send a message containing a 
-  * stream of uninterpreted bytes. It inherits from the <CODE>Message</CODE> 
-  * interface and adds a bytes
-  * message body. The receiver of the message supplies the interpretation
-  * of the bytes.
-  *
-  * <P>The <CODE>BytesMessage</CODE> methods are based largely on those found in
-  * <CODE>java.io.DataInputStream</CODE> and
-  * <CODE>java.io.DataOutputStream</CODE>.
-  *
-  * <P>This message type is for client encoding of existing message formats. 
-  * If possible, one of the other self-defining message types should be used 
-  * instead.
-  *
-  * <P>Although the JMS API allows the use of message properties with byte 
-  * messages, they are typically not used, since the inclusion of properties 
-  * may affect the format.
-  *
-  * <P>The primitive types can be written explicitly using methods
-  * for each type. They may also be written generically as objects.
-  * For instance, a call to <CODE>BytesMessage.writeInt(6)</CODE> is
-  * equivalent to <CODE>BytesMessage.writeObject(new Integer(6))</CODE>.
-  * Both forms are provided, because the explicit form is convenient for
-  * static programming, and the object form is needed when types are not known
-  * at compile time.
-  *
-  * <P>When the message is first created, and when <CODE>clearBody</CODE>
-  * is called, the body of the message is in write-only mode. After the 
-  * first call to <CODE>reset</CODE> has been made, the message body is in 
-  * read-only mode. 
-  * After a message has been sent, the client that sent it can retain and 
-  * modify it without affecting the message that has been sent. The same message
-  * object can be sent multiple times.
-  * When a message has been received, the provider has called 
-  * <CODE>reset</CODE> so that the message body is in read-only mode for the client.
-  *
-  * <P>If <CODE>clearBody</CODE> is called on a message in read-only mode, 
-  * the message body is cleared and the message is in write-only mode.
-  *
-  * <P>If a client attempts to read a message in write-only mode, a 
-  * <CODE>MessageNotReadableException</CODE> is thrown.
-  *
-  * <P>If a client attempts to write a message in read-only mode, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown.
-  *
-  * @version     1.1 April 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session#createBytesMessage()
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.StreamMessage
-  * @see         javax.jms.TextMessage
-  */
-
-public interface BytesMessage extends Message {
-    
-     /** Gets the number of bytes of the message body when the message
-       * is in read-only mode. The value returned can be used to allocate 
-       * a byte array. The value returned is the entire length of the message
-       *  body, regardless of where the pointer for reading the message 
-       * is currently located.
-       * 
-       * @return number of bytes in the message 
-       * @exception JMSException if the JMS provider fails to read the message 
-       *                         due to some internal error.
-       * @exception MessageNotReadableException if the message is in write-only
-       *                         mode.
-       * @since 1.1 
-       */
-       
-      long getBodyLength() throws JMSException;
-
-    /** Reads a <code>boolean</code> from the bytes message stream.
-      *
-      * @return the <code>boolean</code> value read
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */
-    
- 
-    boolean 
-    readBoolean() throws JMSException;
-
-
-    /** Reads a signed 8-bit value from the bytes message stream.
-      *
-      * @return the next byte from the bytes message stream as a signed 8-bit
-      * <code>byte</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    byte 
-    readByte() throws JMSException;
-
-
-    /** Reads an unsigned 8-bit number from the bytes message stream.
-      *  
-      * @return the next byte from the bytes message stream, interpreted as an
-      * unsigned 8-bit number
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */
-
-    int
-    readUnsignedByte() throws JMSException;
-
-
-    /** Reads a signed 16-bit number from the bytes message stream.
-      *
-      * @return the next two bytes from the bytes message stream, interpreted as
-      * a signed 16-bit number
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    short 
-    readShort() throws JMSException;
-
-
-    /** Reads an unsigned 16-bit number from the bytes message stream.
-      *  
-      * @return the next two bytes from the bytes message stream, interpreted as
-      * an unsigned 16-bit integer
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
- 
-    int
-    readUnsignedShort() throws JMSException;
-
-
-    /** Reads a Unicode character value from the bytes message stream.
-      *
-      * @return the next two bytes from the bytes message stream as a Unicode
-      * character
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    char 
-    readChar() throws JMSException;
-
-
-    /** Reads a signed 32-bit integer from the bytes message stream.
-      *
-      * @return the next four bytes from the bytes message stream, interpreted
-      * as an <code>int</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    int 
-    readInt() throws JMSException;
-
-
-    /** Reads a signed 64-bit integer from the bytes message stream.
-      *
-      * @return the next eight bytes from the bytes message stream, interpreted
-      * as a <code>long</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    long 
-    readLong() throws JMSException;
-
-
-    /** Reads a <code>float</code> from the bytes message stream.
-      *
-      * @return the next four bytes from the bytes message stream, interpreted
-      * as a <code>float</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    float 
-    readFloat() throws JMSException;
-
-
-    /** Reads a <code>double</code> from the bytes message stream.
-      *
-      * @return the next eight bytes from the bytes message stream, interpreted
-      * as a <code>double</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    double 
-    readDouble() throws JMSException;
-
-
-    /** Reads a string that has been encoded using a modified UTF-8
-      * format from the bytes message stream.
-      *
-      * <P>For more information on the UTF-8 format, see "File System Safe
-      * UCS Transformation Format (FSS_UTF)", X/Open Preliminary Specification,
-      * X/Open Company Ltd., Document Number: P316. This information also
-      * appears in ISO/IEC 10646, Annex P.
-      *
-      * @return a Unicode string from the bytes message stream
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of bytes stream has 
-      *                                been reached.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    String 
-    readUTF() throws JMSException;
-
-
-    /** Reads a byte array from the bytes message stream.
-      *
-      * <P>If the length of array <code>value</code> is less than the number of 
-      * bytes remaining to be read from the stream, the array should 
-      * be filled. A subsequent call reads the next increment, and so on.
-      * 
-      * <P>If the number of bytes remaining in the stream is less than the 
-      * length of 
-      * array <code>value</code>, the bytes should be read into the array. 
-      * The return value of the total number of bytes read will be less than
-      * the length of the array, indicating that there are no more bytes left 
-      * to be read from the stream. The next read of the stream returns -1.
-      *
-      * @param value the buffer into which the data is read
-      *
-      * @return the total number of bytes read into the buffer, or -1 if 
-      * there is no more data because the end of the stream has been reached
-      *
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    int
-    readBytes(byte[] value) throws JMSException;
-
-
-    /** Reads a portion of the bytes message stream.
-      *
-      * <P>If the length of array <code>value</code> is less than the number of
-      * bytes remaining to be read from the stream, the array should 
-      * be filled. A subsequent call reads the next increment, and so on.
-      * 
-      * <P>If the number of bytes remaining in the stream is less than the 
-      * length of 
-      * array <code>value</code>, the bytes should be read into the array. 
-      * The return value of the total number of bytes read will be less than
-      * the length of the array, indicating that there are no more bytes left 
-      * to be read from the stream. The next read of the stream returns -1.
-      *
-      * <p> If <code>length</code> is negative, or
-      * <code>length</code> is greater than the length of the array
-      * <code>value</code>, then an <code>IndexOutOfBoundsException</code> is
-      * thrown. No bytes will be read from the stream for this exception case.
-      *  
-      * @param value the buffer into which the data is read
-      * @param length the number of bytes to read; must be less than or equal to
-      *        <code>value.length</code>
-      * 
-      * @return the total number of bytes read into the buffer, or -1 if
-      * there is no more data because the end of the stream has been reached
-      *  
-      * @exception JMSException if the JMS provider fails to read the message 
-      *                         due to some internal error.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    int
-    readBytes(byte[] value, int length) 
-			throws JMSException;
-
-
-    /** Writes a <code>boolean</code> to the bytes message stream as a 1-byte 
-      * value.
-      * The value <code>true</code> is written as the value 
-      * <code>(byte)1</code>; the value <code>false</code> is written as 
-      * the value <code>(byte)0</code>.
-      *
-      * @param value the <code>boolean</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */
-
-    void 
-    writeBoolean(boolean value) 
-			throws JMSException;
-
-
-    /** Writes a <code>byte</code> to the bytes message stream as a 1-byte 
-      * value.
-      *
-      * @param value the <code>byte</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeByte(byte value) throws JMSException;
-
-
-    /** Writes a <code>short</code> to the bytes message stream as two bytes,
-      * high byte first.
-      *
-      * @param value the <code>short</code> to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeShort(short value) throws JMSException;
-
-
-    /** Writes a <code>char</code> to the bytes message stream as a 2-byte
-      * value, high byte first.
-      *
-      * @param value the <code>char</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeChar(char value) throws JMSException;
-
-
-    /** Writes an <code>int</code> to the bytes message stream as four bytes, 
-      * high byte first.
-      *
-      * @param value the <code>int</code> to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeInt(int value) throws JMSException;
-
-
-    /** Writes a <code>long</code> to the bytes message stream as eight bytes, 
-      * high byte first.
-      *
-      * @param value the <code>long</code> to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeLong(long value) throws JMSException;
-
-
-    /** Converts the <code>float</code> argument to an <code>int</code> using 
-      * the
-      * <code>floatToIntBits</code> method in class <code>Float</code>,
-      * and then writes that <code>int</code> value to the bytes message
-      * stream as a 4-byte quantity, high byte first.
-      *
-      * @param value the <code>float</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeFloat(float value) throws JMSException;
-
-
-    /** Converts the <code>double</code> argument to a <code>long</code> using 
-      * the
-      * <code>doubleToLongBits</code> method in class <code>Double</code>,
-      * and then writes that <code>long</code> value to the bytes message
-      * stream as an 8-byte quantity, high byte first.
-      *
-      * @param value the <code>double</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeDouble(double value) throws JMSException;
-
-
-    /** Writes a string to the bytes message stream using UTF-8 encoding in a 
-      * machine-independent manner.
-      *
-      * <P>For more information on the UTF-8 format, see "File System Safe 
-      * UCS Transformation Format (FSS_UTF)", X/Open Preliminary Specification,       
-      * X/Open Company Ltd., Document Number: P316. This information also 
-      * appears in ISO/IEC 10646, Annex P. 
-      *
-      * @param value the <code>String</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeUTF(String value) throws JMSException;
-
-
-    /** Writes a byte array to the bytes message stream.
-      *
-      * @param value the byte array to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void
-    writeBytes(byte[] value) throws JMSException;
-
-
-    /** Writes a portion of a byte array to the bytes message stream.
-      *  
-      * @param value the byte array value to be written
-      * @param offset the initial offset within the byte array
-      * @param length the number of bytes to use
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
- 
-    void
-    writeBytes(byte[] value, int offset, int length) 
-			throws JMSException;
-
-
-    /** Writes an object to the bytes message stream.
-      *
-      * <P>This method works only for the objectified primitive
-      * object types (<code>Integer</code>, <code>Double</code>, 
-      * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
-      * arrays.
-      *
-      * @param value the object in the Java programming language ("Java 
-      *              object") to be written; it must not be null
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if the object is of an invalid type.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      * @exception java.lang.NullPointerException if the parameter 
-      *                                           <code>value</code> is null.
-      */ 
-
-    void 
-    writeObject(Object value) throws JMSException;
-
-
-    /** Puts the message body in read-only mode and repositions the stream of 
-      * bytes to the beginning.
-      *  
-      * @exception JMSException if the JMS provider fails to reset the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if the message has an invalid
-      *                         format.
-      */ 
-
-    void
-    reset() throws JMSException;
+/** A <CODE>BytesMessage</CODE> object is used to send a message containing a
+ * stream of uninterpreted bytes. It inherits from the <CODE>Message</CODE>
+ * interface and adds a bytes
+ * message body. The receiver of the message supplies the interpretation
+ * of the bytes.
+ *
+ * <P>The <CODE>BytesMessage</CODE> methods are based largely on those found in
+ * <CODE>java.io.DataInputStream</CODE> and
+ * <CODE>java.io.DataOutputStream</CODE>.
+ *
+ * <P>This message type is for client encoding of existing message formats.
+ * If possible, one of the other self-defining message types should be used
+ * instead.
+ *
+ * <P>Although the JMS API allows the use of message properties with byte
+ * messages, they are typically not used, since the inclusion of properties
+ * may affect the format.
+ *
+ * <P>The primitive types can be written explicitly using methods
+ * for each type. They may also be written generically as objects.
+ * For instance, a call to <CODE>BytesMessage.writeInt(6)</CODE> is
+ * equivalent to <CODE>BytesMessage.writeObject(new Integer(6))</CODE>.
+ * Both forms are provided, because the explicit form is convenient for
+ * static programming, and the object form is needed when types are not known
+ * at compile time.
+ *
+ * <P>When the message is first created, and when <CODE>clearBody</CODE>
+ * is called, the body of the message is in write-only mode. After the
+ * first call to <CODE>reset</CODE> has been made, the message body is in
+ * read-only mode.
+ * After a message has been sent, the client that sent it can retain and
+ * modify it without affecting the message that has been sent. The same message
+ * object can be sent multiple times.
+ * When a message has been received, the provider has called
+ * <CODE>reset</CODE> so that the message body is in read-only mode for the client.
+ *
+ * <P>If <CODE>clearBody</CODE> is called on a message in read-only mode,
+ * the message body is cleared and the message is in write-only mode.
+ *
+ * <P>If a client attempts to read a message in write-only mode, a
+ * <CODE>MessageNotReadableException</CODE> is thrown.
+ *
+ * <P>If a client attempts to write a message in read-only mode, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown.
+ *
+ * @version     1.1 April 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session#createBytesMessage()
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.StreamMessage
+ * @see         javax.jms.TextMessage
+ */
+
+public interface BytesMessage extends Message
+{
+
+  /** Gets the number of bytes of the message body when the message
+    * is in read-only mode. The value returned can be used to allocate 
+    * a byte array. The value returned is the entire length of the message
+    *  body, regardless of where the pointer for reading the message 
+    * is currently located.
+    * 
+    * @return number of bytes in the message 
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageNotReadableException if the message is in write-only
+    *                         mode.
+    * @since 1.1 
+    */
+
+  long getBodyLength() throws JMSException;
+
+  /** Reads a <code>boolean</code> from the bytes message stream.
+    *
+    * @return the <code>boolean</code> value read
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  boolean readBoolean() throws JMSException;
+
+  /** Reads a signed 8-bit value from the bytes message stream.
+    *
+    * @return the next byte from the bytes message stream as a signed 8-bit
+    * <code>byte</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  byte readByte() throws JMSException;
+
+  /** Reads an unsigned 8-bit number from the bytes message stream.
+    *  
+    * @return the next byte from the bytes message stream, interpreted as an
+    * unsigned 8-bit number
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readUnsignedByte() throws JMSException;
+
+  /** Reads a signed 16-bit number from the bytes message stream.
+    *
+    * @return the next two bytes from the bytes message stream, interpreted as
+    * a signed 16-bit number
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  short readShort() throws JMSException;
+
+  /** Reads an unsigned 16-bit number from the bytes message stream.
+    *  
+    * @return the next two bytes from the bytes message stream, interpreted as
+    * an unsigned 16-bit integer
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readUnsignedShort() throws JMSException;
+
+  /** Reads a Unicode character value from the bytes message stream.
+    *
+    * @return the next two bytes from the bytes message stream as a Unicode
+    * character
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  char readChar() throws JMSException;
+
+  /** Reads a signed 32-bit integer from the bytes message stream.
+    *
+    * @return the next four bytes from the bytes message stream, interpreted
+    * as an <code>int</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readInt() throws JMSException;
+
+  /** Reads a signed 64-bit integer from the bytes message stream.
+    *
+    * @return the next eight bytes from the bytes message stream, interpreted
+    * as a <code>long</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  long readLong() throws JMSException;
+
+  /** Reads a <code>float</code> from the bytes message stream.
+    *
+    * @return the next four bytes from the bytes message stream, interpreted
+    * as a <code>float</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  float readFloat() throws JMSException;
+
+  /** Reads a <code>double</code> from the bytes message stream.
+    *
+    * @return the next eight bytes from the bytes message stream, interpreted
+    * as a <code>double</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  double readDouble() throws JMSException;
+
+  /** Reads a string that has been encoded using a modified UTF-8
+    * format from the bytes message stream.
+    *
+    * <P>For more information on the UTF-8 format, see "File System Safe
+    * UCS Transformation Format (FSS_UTF)", X/Open Preliminary Specification,
+    * X/Open Company Ltd., Document Number: P316. This information also
+    * appears in ISO/IEC 10646, Annex P.
+    *
+    * @return a Unicode string from the bytes message stream
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of bytes stream has 
+    *                                been reached.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  String readUTF() throws JMSException;
+
+  /** Reads a byte array from the bytes message stream.
+    *
+    * <P>If the length of array <code>value</code> is less than the number of 
+    * bytes remaining to be read from the stream, the array should 
+    * be filled. A subsequent call reads the next increment, and so on.
+    * 
+    * <P>If the number of bytes remaining in the stream is less than the 
+    * length of 
+    * array <code>value</code>, the bytes should be read into the array. 
+    * The return value of the total number of bytes read will be less than
+    * the length of the array, indicating that there are no more bytes left 
+    * to be read from the stream. The next read of the stream returns -1.
+    *
+    * @param value the buffer into which the data is read
+    *
+    * @return the total number of bytes read into the buffer, or -1 if 
+    * there is no more data because the end of the stream has been reached
+    *
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readBytes(byte[] value) throws JMSException;
+
+  /** Reads a portion of the bytes message stream.
+    *
+    * <P>If the length of array <code>value</code> is less than the number of
+    * bytes remaining to be read from the stream, the array should 
+    * be filled. A subsequent call reads the next increment, and so on.
+    * 
+    * <P>If the number of bytes remaining in the stream is less than the 
+    * length of 
+    * array <code>value</code>, the bytes should be read into the array. 
+    * The return value of the total number of bytes read will be less than
+    * the length of the array, indicating that there are no more bytes left 
+    * to be read from the stream. The next read of the stream returns -1.
+    *
+    * <p> If <code>length</code> is negative, or
+    * <code>length</code> is greater than the length of the array
+    * <code>value</code>, then an <code>IndexOutOfBoundsException</code> is
+    * thrown. No bytes will be read from the stream for this exception case.
+    *  
+    * @param value the buffer into which the data is read
+    * @param length the number of bytes to read; must be less than or equal to
+    *        <code>value.length</code>
+    * 
+    * @return the total number of bytes read into the buffer, or -1 if
+    * there is no more data because the end of the stream has been reached
+    *  
+    * @exception JMSException if the JMS provider fails to read the message 
+    *                         due to some internal error.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readBytes(byte[] value, int length) throws JMSException;
+
+  /** Writes a <code>boolean</code> to the bytes message stream as a 1-byte 
+    * value.
+    * The value <code>true</code> is written as the value 
+    * <code>(byte)1</code>; the value <code>false</code> is written as 
+    * the value <code>(byte)0</code>.
+    *
+    * @param value the <code>boolean</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBoolean(boolean value) throws JMSException;
+
+  /** Writes a <code>byte</code> to the bytes message stream as a 1-byte 
+    * value.
+    *
+    * @param value the <code>byte</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeByte(byte value) throws JMSException;
+
+  /** Writes a <code>short</code> to the bytes message stream as two bytes,
+    * high byte first.
+    *
+    * @param value the <code>short</code> to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeShort(short value) throws JMSException;
+
+  /** Writes a <code>char</code> to the bytes message stream as a 2-byte
+    * value, high byte first.
+    *
+    * @param value the <code>char</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeChar(char value) throws JMSException;
+
+  /** Writes an <code>int</code> to the bytes message stream as four bytes, 
+    * high byte first.
+    *
+    * @param value the <code>int</code> to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeInt(int value) throws JMSException;
+
+  /** Writes a <code>long</code> to the bytes message stream as eight bytes, 
+    * high byte first.
+    *
+    * @param value the <code>long</code> to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeLong(long value) throws JMSException;
+
+  /** Converts the <code>float</code> argument to an <code>int</code> using 
+    * the
+    * <code>floatToIntBits</code> method in class <code>Float</code>,
+    * and then writes that <code>int</code> value to the bytes message
+    * stream as a 4-byte quantity, high byte first.
+    *
+    * @param value the <code>float</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeFloat(float value) throws JMSException;
+
+  /** Converts the <code>double</code> argument to a <code>long</code> using 
+    * the
+    * <code>doubleToLongBits</code> method in class <code>Double</code>,
+    * and then writes that <code>long</code> value to the bytes message
+    * stream as an 8-byte quantity, high byte first.
+    *
+    * @param value the <code>double</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeDouble(double value) throws JMSException;
+
+  /** Writes a string to the bytes message stream using UTF-8 encoding in a 
+    * machine-independent manner.
+    *
+    * <P>For more information on the UTF-8 format, see "File System Safe 
+    * UCS Transformation Format (FSS_UTF)", X/Open Preliminary Specification,       
+    * X/Open Company Ltd., Document Number: P316. This information also 
+    * appears in ISO/IEC 10646, Annex P. 
+    *
+    * @param value the <code>String</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeUTF(String value) throws JMSException;
+
+  /** Writes a byte array to the bytes message stream.
+    *
+    * @param value the byte array to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBytes(byte[] value) throws JMSException;
+
+  /** Writes a portion of a byte array to the bytes message stream.
+    *  
+    * @param value the byte array value to be written
+    * @param offset the initial offset within the byte array
+    * @param length the number of bytes to use
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBytes(byte[] value, int offset, int length) throws JMSException;
+
+  /** Writes an object to the bytes message stream.
+    *
+    * <P>This method works only for the objectified primitive
+    * object types (<code>Integer</code>, <code>Double</code>, 
+    * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
+    * arrays.
+    *
+    * @param value the object in the Java programming language ("Java 
+    *              object") to be written; it must not be null
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if the object is of an invalid type.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    * @exception java.lang.NullPointerException if the parameter 
+    *                                           <code>value</code> is null.
+    */
+
+  void writeObject(Object value) throws JMSException;
+
+  /** Puts the message body in read-only mode and repositions the stream of 
+    * bytes to the beginning.
+    *  
+    * @exception JMSException if the JMS provider fails to reset the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if the message has an invalid
+    *                         format.
+    */
+
+  void reset() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
index 93e1361bd0..690d89bf72 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Connection.java
@@ -1,414 +1,388 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A <CODE>Connection</CODE> object is a client's active connection to its JMS 
-  * provider. It typically allocates provider resources outside the Java virtual
-  * machine (JVM).
-  *
-  * <P>Connections support concurrent use.
-  *
-  * <P>A connection serves several purposes:
-  *
-  * <UL>
-  *   <LI>It encapsulates an open connection with a JMS provider. It 
-  *       typically represents an open TCP/IP socket between a client and 
-  *       the service provider software.
-  *   <LI>Its creation is where client authentication takes place.
-  *   <LI>It can specify a unique client identifier.
-  *   <LI>It provides a <CODE>ConnectionMetaData</CODE> object.
-  *   <LI>It supports an optional <CODE>ExceptionListener</CODE> object.
-  * </UL>
-  *
-  * <P>Because the creation of a connection involves setting up authentication 
-  * and communication, a connection is a relatively heavyweight 
-  * object. Most clients will do all their messaging with a single connection.
-  * Other more advanced applications may use several connections. The JMS API
-  * does 
-  * not architect a reason for using multiple connections; however, there may 
-  * be operational reasons for doing so.
-  *
-  * <P>A JMS client typically creates a connection, one or more sessions, 
-  * and a number of message producers and consumers. When a connection is
-  * created, it is in stopped mode. That means that no messages are being
-  * delivered.
-  *
-  * <P>It is typical to leave the connection in stopped mode until setup 
-  * is complete (that is, until all message consumers have been 
-  * created).  At that point, the client calls 
-  * the connection's <CODE>start</CODE> method, and messages begin arriving at 
-  * the connection's consumers. This setup
-  * convention minimizes any client confusion that may result from 
-  * asynchronous message delivery while the client is still in the process 
-  * of setting itself up.
-  *
-  * <P>A connection can be started immediately, and the setup can be done 
-  * afterwards. Clients that do this must be prepared to handle asynchronous 
-  * message delivery while they are still in the process of setting up.
-  *
-  * <P>A message producer can send messages while a connection is stopped.
-  *
-  * @version     1.1 - February 1, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.ConnectionFactory
-  * @see         javax.jms.QueueConnection
-  * @see         javax.jms.TopicConnection
-  */
+/** A <CODE>Connection</CODE> object is a client's active connection to its JMS
+ * provider. It typically allocates provider resources outside the Java virtual
+ * machine (JVM).
+ *
+ * <P>Connections support concurrent use.
+ *
+ * <P>A connection serves several purposes:
+ *
+ * <UL>
+ *   <LI>It encapsulates an open connection with a JMS provider. It
+ *       typically represents an open TCP/IP socket between a client and
+ *       the service provider software.
+ *   <LI>Its creation is where client authentication takes place.
+ *   <LI>It can specify a unique client identifier.
+ *   <LI>It provides a <CODE>ConnectionMetaData</CODE> object.
+ *   <LI>It supports an optional <CODE>ExceptionListener</CODE> object.
+ * </UL>
+ *
+ * <P>Because the creation of a connection involves setting up authentication
+ * and communication, a connection is a relatively heavyweight
+ * object. Most clients will do all their messaging with a single connection.
+ * Other more advanced applications may use several connections. The JMS API
+ * does
+ * not architect a reason for using multiple connections; however, there may
+ * be operational reasons for doing so.
+ *
+ * <P>A JMS client typically creates a connection, one or more sessions,
+ * and a number of message producers and consumers. When a connection is
+ * created, it is in stopped mode. That means that no messages are being
+ * delivered.
+ *
+ * <P>It is typical to leave the connection in stopped mode until setup
+ * is complete (that is, until all message consumers have been
+ * created).  At that point, the client calls
+ * the connection's <CODE>start</CODE> method, and messages begin arriving at
+ * the connection's consumers. This setup
+ * convention minimizes any client confusion that may result from
+ * asynchronous message delivery while the client is still in the process
+ * of setting itself up.
+ *
+ * <P>A connection can be started immediately, and the setup can be done
+ * afterwards. Clients that do this must be prepared to handle asynchronous
+ * message delivery while they are still in the process of setting up.
+ *
+ * <P>A message producer can send messages while a connection is stopped.
+ *
+ * @version     1.1 - February 1, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.ConnectionFactory
+ * @see         javax.jms.QueueConnection
+ * @see         javax.jms.TopicConnection
+ */
 
-public interface Connection {
+public interface Connection
+{
 
- /** Creates a <CODE>Session</CODE> object.
-      *  
-      * @param transacted indicates whether the session is transacted
-      * @param acknowledgeMode indicates whether the consumer or the
-      * client will acknowledge any messages it receives; ignored if the session
-      * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
-      * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
-      * <code>Session.DUPS_OK_ACKNOWLEDGE</code>.
-      *  
-      * @return a newly created  session
-      *  
-      * @exception JMSException if the <CODE>Connection</CODE> object fails
-      *                         to create a session due to some internal error or
-      *                         lack of support for the specific transaction
-      *                         and acknowledgement mode.
-      * @since 1.1
-      *
-      * @see Session#AUTO_ACKNOWLEDGE 
-      * @see Session#CLIENT_ACKNOWLEDGE 
-      * @see Session#DUPS_OK_ACKNOWLEDGE 
-  
-      */ 
+  /** Creates a <CODE>Session</CODE> object.
+   *
+   * @param transacted indicates whether the session is transacted
+   * @param acknowledgeMode indicates whether the consumer or the
+   * client will acknowledge any messages it receives; ignored if the session
+   * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>,
+   * <code>Session.CLIENT_ACKNOWLEDGE</code>, and
+   * <code>Session.DUPS_OK_ACKNOWLEDGE</code>.
+   *
+   * @return a newly created  session
+   *
+   * @exception JMSException if the <CODE>Connection</CODE> object fails
+   *                         to create a session due to some internal error or
+   *                         lack of support for the specific transaction
+   *                         and acknowledgement mode.
+   * @since 1.1
+   *
+   * @see Session#AUTO_ACKNOWLEDGE
+   * @see Session#CLIENT_ACKNOWLEDGE
+   * @see Session#DUPS_OK_ACKNOWLEDGE
 
-    Session
-    createSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
-    
-    
-    /** Gets the client identifier for this connection.
-      *  
-      * <P>This value is specific to the JMS provider.  It is either preconfigured 
-      * by an administrator in a <CODE>ConnectionFactory</CODE> object
-      * or assigned dynamically by the application by calling the
-      * <code>setClientID</code> method.
-      * 
-      * 
-      * @return the unique client identifier
-      *  
-      * @exception JMSException if the JMS provider fails to return
-      *                         the client ID for this connection due
-      *                         to some internal error.
-      *
-      **/
-    String
-    getClientID() throws JMSException;
+   */
 
+  Session createSession(boolean transacted, int acknowledgeMode) throws JMSException;
 
-    /** Sets the client identifier for this connection.
-      *  
-      * <P>The preferred way to assign a JMS client's client identifier is for
-      * it to be configured in a client-specific <CODE>ConnectionFactory</CODE>
-      * object and transparently assigned to the <CODE>Connection</CODE> object
-      * it creates.
-      * 
-      * <P>Alternatively, a client can set a connection's client identifier
-      * using a provider-specific value. The facility to set a connection's
-      * client identifier explicitly is not a mechanism for overriding the
-      * identifier that has been administratively configured. It is provided
-      * for the case where no administratively specified identifier exists.
-      * If one does exist, an attempt to change it by setting it must throw an
-      * <CODE>IllegalStateException</CODE>. If a client sets the client identifier
-      * explicitly, it must do so immediately after it creates the connection 
-      * and before any other
-      * action on the connection is taken. After this point, setting the
-      * client identifier is a programming error that should throw an
-      * <CODE>IllegalStateException</CODE>.
-      *
-      * <P>The purpose of the client identifier is to associate a connection and
-      * its objects with a state maintained on behalf of the client by a 
-      * provider. The only such state identified by the JMS API is that required
-      * to support durable subscriptions.
-      *
-      * <P>If another connection with the same <code>clientID</code> is already running when
-      * this method is called, the JMS provider should detect the duplicate ID and throw
-      * an <CODE>InvalidClientIDException</CODE>.
-      *
-      * @param clientID the unique client identifier
-      * 
-      * @exception JMSException if the JMS provider fails to
-      *                         set the client ID for this connection due
-      *                         to some internal error.
-      *
-      * @exception InvalidClientIDException if the JMS client specifies an
-      *                         invalid or duplicate client ID.
-      * @exception IllegalStateException if the JMS client attempts to set
-      *       a connection's client ID at the wrong time or
-      *       when it has been administratively configured.
-      */
+  /** Gets the client identifier for this connection.
+    *  
+    * <P>This value is specific to the JMS provider.  It is either preconfigured 
+    * by an administrator in a <CODE>ConnectionFactory</CODE> object
+    * or assigned dynamically by the application by calling the
+    * <code>setClientID</code> method.
+    * 
+    * 
+    * @return the unique client identifier
+    *  
+    * @exception JMSException if the JMS provider fails to return
+    *                         the client ID for this connection due
+    *                         to some internal error.
+    *
+    **/
+  String getClientID() throws JMSException;
 
-    void
-    setClientID(String clientID) throws JMSException;
+  /** Sets the client identifier for this connection.
+    *  
+    * <P>The preferred way to assign a JMS client's client identifier is for
+    * it to be configured in a client-specific <CODE>ConnectionFactory</CODE>
+    * object and transparently assigned to the <CODE>Connection</CODE> object
+    * it creates.
+    * 
+    * <P>Alternatively, a client can set a connection's client identifier
+    * using a provider-specific value. The facility to set a connection's
+    * client identifier explicitly is not a mechanism for overriding the
+    * identifier that has been administratively configured. It is provided
+    * for the case where no administratively specified identifier exists.
+    * If one does exist, an attempt to change it by setting it must throw an
+    * <CODE>IllegalStateException</CODE>. If a client sets the client identifier
+    * explicitly, it must do so immediately after it creates the connection 
+    * and before any other
+    * action on the connection is taken. After this point, setting the
+    * client identifier is a programming error that should throw an
+    * <CODE>IllegalStateException</CODE>.
+    *
+    * <P>The purpose of the client identifier is to associate a connection and
+    * its objects with a state maintained on behalf of the client by a 
+    * provider. The only such state identified by the JMS API is that required
+    * to support durable subscriptions.
+    *
+    * <P>If another connection with the same <code>clientID</code> is already running when
+    * this method is called, the JMS provider should detect the duplicate ID and throw
+    * an <CODE>InvalidClientIDException</CODE>.
+    *
+    * @param clientID the unique client identifier
+    * 
+    * @exception JMSException if the JMS provider fails to
+    *                         set the client ID for this connection due
+    *                         to some internal error.
+    *
+    * @exception InvalidClientIDException if the JMS client specifies an
+    *                         invalid or duplicate client ID.
+    * @exception IllegalStateException if the JMS client attempts to set
+    *       a connection's client ID at the wrong time or
+    *       when it has been administratively configured.
+    */
 
- 
-    /** Gets the metadata for this connection.
-      *  
-      * @return the connection metadata
-      *  
-      * @exception JMSException if the JMS provider fails to
-      *                         get the connection metadata for this connection.
-      *
-      * @see javax.jms.ConnectionMetaData
-      */
+  void setClientID(String clientID) throws JMSException;
 
-    ConnectionMetaData
-    getMetaData() throws JMSException;
+  /** Gets the metadata for this connection.
+    *  
+    * @return the connection metadata
+    *  
+    * @exception JMSException if the JMS provider fails to
+    *                         get the connection metadata for this connection.
+    *
+    * @see javax.jms.ConnectionMetaData
+    */
 
-    /**
-     * Gets the <CODE>ExceptionListener</CODE> object for this connection. 
-     * Not every <CODE>Connection</CODE> has an <CODE>ExceptionListener</CODE>
-     * associated with it.
-     *
-     * @return the <CODE>ExceptionListener</CODE> for this connection, or null. 
-     *              if no <CODE>ExceptionListener</CODE> is associated
-     *              with this connection.
-     *
-     * @exception JMSException if the JMS provider fails to
-     *                         get the <CODE>ExceptionListener</CODE> for this 
-     *                         connection. 
-     * @see javax.jms.Connection#setExceptionListener
-     */
+  ConnectionMetaData getMetaData() throws JMSException;
 
-    ExceptionListener 
-    getExceptionListener() throws JMSException;
+  /**
+   * Gets the <CODE>ExceptionListener</CODE> object for this connection. 
+   * Not every <CODE>Connection</CODE> has an <CODE>ExceptionListener</CODE>
+   * associated with it.
+   *
+   * @return the <CODE>ExceptionListener</CODE> for this connection, or null. 
+   *              if no <CODE>ExceptionListener</CODE> is associated
+   *              with this connection.
+   *
+   * @exception JMSException if the JMS provider fails to
+   *                         get the <CODE>ExceptionListener</CODE> for this 
+   *                         connection. 
+   * @see javax.jms.Connection#setExceptionListener
+   */
 
+  ExceptionListener getExceptionListener() throws JMSException;
 
-    /** Sets an exception listener for this connection.
-      *
-      * <P>If a JMS provider detects a serious problem with a connection, it
-      * informs the connection's <CODE>ExceptionListener</CODE>, if one has been
-      * registered. It does this by calling the listener's
-      * <CODE>onException</CODE> method, passing it a <CODE>JMSException</CODE>
-      * object describing the problem.
-      *
-      * <P>An exception listener allows a client to be notified of a problem
-      * asynchronously.
-      * Some connections only consume messages, so they would have no other 
-      * way to learn their connection has failed.
-      *
-      * <P>A connection serializes execution of its
-      * <CODE>ExceptionListener</CODE>.
-      *
-      * <P>A JMS provider should attempt to resolve connection problems 
-      * itself before it notifies the client of them.
-      *
-      * @param listener the exception listener
-      *
-      * @exception JMSException if the JMS provider fails to
-      *                         set the exception listener for this connection.
-      *
-      */
+  /** Sets an exception listener for this connection.
+    *
+    * <P>If a JMS provider detects a serious problem with a connection, it
+    * informs the connection's <CODE>ExceptionListener</CODE>, if one has been
+    * registered. It does this by calling the listener's
+    * <CODE>onException</CODE> method, passing it a <CODE>JMSException</CODE>
+    * object describing the problem.
+    *
+    * <P>An exception listener allows a client to be notified of a problem
+    * asynchronously.
+    * Some connections only consume messages, so they would have no other 
+    * way to learn their connection has failed.
+    *
+    * <P>A connection serializes execution of its
+    * <CODE>ExceptionListener</CODE>.
+    *
+    * <P>A JMS provider should attempt to resolve connection problems 
+    * itself before it notifies the client of them.
+    *
+    * @param listener the exception listener
+    *
+    * @exception JMSException if the JMS provider fails to
+    *                         set the exception listener for this connection.
+    *
+    */
 
-    void 
-    setExceptionListener(ExceptionListener listener) throws JMSException;
+  void setExceptionListener(ExceptionListener listener) throws JMSException;
 
-    /** Starts (or restarts) a connection's delivery of incoming messages.
-      * A call to <CODE>start</CODE> on a connection that has already been
-      * started is ignored.
-      * 
-      * @exception JMSException if the JMS provider fails to start
-      *                         message delivery due to some internal error.
-      *
-      * @see javax.jms.Connection#stop
-      */
+  /** Starts (or restarts) a connection's delivery of incoming messages.
+    * A call to <CODE>start</CODE> on a connection that has already been
+    * started is ignored.
+    * 
+    * @exception JMSException if the JMS provider fails to start
+    *                         message delivery due to some internal error.
+    *
+    * @see javax.jms.Connection#stop
+    */
 
-    void
-    start() throws JMSException;
+  void start() throws JMSException;
 
- 
-    /** Temporarily stops a connection's delivery of incoming messages.
-      * Delivery can be restarted using the connection's <CODE>start</CODE>
-      * method. When the connection is stopped,
-      * delivery to all the connection's message consumers is inhibited:
-      * synchronous receives block, and messages are not delivered to message
-      * listeners.
-      *
-      * <P>This call blocks until receives and/or message listeners in progress
-      * have completed.
-      *
-      * <P>Stopping a connection has no effect on its ability to send messages.
-      * A call to <CODE>stop</CODE> on a connection that has already been
-      * stopped is ignored.
-      *
-      * <P>A call to <CODE>stop</CODE> must not return until delivery of messages
-      * has paused. This means that a client can rely on the fact that none of 
-      * its message listeners will be called and that all threads of control 
-      * waiting for <CODE>receive</CODE> calls to return will not return with a 
-      * message until the
-      * connection is restarted. The receive timers for a stopped connection
-      * continue to advance, so receives may time out while the connection is
-      * stopped.
-      * 
-      * <P>If message listeners are running when <CODE>stop</CODE> is invoked, 
-      * the <CODE>stop</CODE> call must
-      * wait until all of them have returned before it may return. While these
-      * message listeners are completing, they must have the full services of the
-      * connection available to them.
-      *  
-      * @exception JMSException if the JMS provider fails to stop
-      *                         message delivery due to some internal error.
-      *
-      * @see javax.jms.Connection#start
-      */
+  /** Temporarily stops a connection's delivery of incoming messages.
+    * Delivery can be restarted using the connection's <CODE>start</CODE>
+    * method. When the connection is stopped,
+    * delivery to all the connection's message consumers is inhibited:
+    * synchronous receives block, and messages are not delivered to message
+    * listeners.
+    *
+    * <P>This call blocks until receives and/or message listeners in progress
+    * have completed.
+    *
+    * <P>Stopping a connection has no effect on its ability to send messages.
+    * A call to <CODE>stop</CODE> on a connection that has already been
+    * stopped is ignored.
+    *
+    * <P>A call to <CODE>stop</CODE> must not return until delivery of messages
+    * has paused. This means that a client can rely on the fact that none of 
+    * its message listeners will be called and that all threads of control 
+    * waiting for <CODE>receive</CODE> calls to return will not return with a 
+    * message until the
+    * connection is restarted. The receive timers for a stopped connection
+    * continue to advance, so receives may time out while the connection is
+    * stopped.
+    * 
+    * <P>If message listeners are running when <CODE>stop</CODE> is invoked, 
+    * the <CODE>stop</CODE> call must
+    * wait until all of them have returned before it may return. While these
+    * message listeners are completing, they must have the full services of the
+    * connection available to them.
+    *  
+    * @exception JMSException if the JMS provider fails to stop
+    *                         message delivery due to some internal error.
+    *
+    * @see javax.jms.Connection#start
+    */
 
-    void
-    stop() throws JMSException;
+  void stop() throws JMSException;
 
- 
-    /** Closes the connection.
-      *
-      * <P>Since a provider typically allocates significant resources outside 
-      * the JVM on behalf of a connection, clients should close these resources
-      * when they are not needed. Relying on garbage collection to eventually 
-      * reclaim these resources may not be timely enough.
-      *
-      * <P>There is no need to close the sessions, producers, and consumers
-      * of a closed connection.
-      *
-      * <P>Closing a connection causes all temporary destinations to be
-      * deleted.
-      *
-      * <P>When this method is invoked, it should not return until message
-      * processing has been shut down in an orderly fashion. This means that all
-      * message 
-      * listeners that may have been running have returned, and that all pending 
-      * receives have returned. A close terminates all pending message receives 
-      * on the connection's sessions' consumers. The receives may return with a 
-      * message or with null, depending on whether there was a message available 
-      * at the time of the close. If one or more of the connection's sessions' 
-      * message listeners is processing a message at the time when connection 
-      * <CODE>close</CODE> is invoked, all the facilities of the connection and 
-      * its sessions must remain available to those listeners until they return 
-      * control to the JMS provider. 
-      *
-      * <P>Closing a connection causes any of its sessions' transactions
-      * in progress to be rolled back. In the case where a session's
-      * work is coordinated by an external transaction manager, a session's 
-      * <CODE>commit</CODE> and <CODE>rollback</CODE> methods are
-      * not used and the result of a closed session's work is determined
-      * later by the transaction manager.
-      *
-      * Closing a connection does NOT force an 
-      * acknowledgment of client-acknowledged sessions. 
-      * 
-      * <P>Invoking the <CODE>acknowledge</CODE> method of a received message 
-      * from a closed connection's session must throw an 
-      * <CODE>IllegalStateException</CODE>.  Closing a closed connection must 
-      * NOT throw an exception.
-      *  
-      * @exception JMSException if the JMS provider fails to close the
-      *                         connection due to some internal error. For 
-      *                         example, a failure to release resources
-      *                         or to close a socket connection can cause
-      *                         this exception to be thrown.
-      *
-      */
+  /** Closes the connection.
+    *
+    * <P>Since a provider typically allocates significant resources outside 
+    * the JVM on behalf of a connection, clients should close these resources
+    * when they are not needed. Relying on garbage collection to eventually 
+    * reclaim these resources may not be timely enough.
+    *
+    * <P>There is no need to close the sessions, producers, and consumers
+    * of a closed connection.
+    *
+    * <P>Closing a connection causes all temporary destinations to be
+    * deleted.
+    *
+    * <P>When this method is invoked, it should not return until message
+    * processing has been shut down in an orderly fashion. This means that all
+    * message 
+    * listeners that may have been running have returned, and that all pending 
+    * receives have returned. A close terminates all pending message receives 
+    * on the connection's sessions' consumers. The receives may return with a 
+    * message or with null, depending on whether there was a message available 
+    * at the time of the close. If one or more of the connection's sessions' 
+    * message listeners is processing a message at the time when connection 
+    * <CODE>close</CODE> is invoked, all the facilities of the connection and 
+    * its sessions must remain available to those listeners until they return 
+    * control to the JMS provider. 
+    *
+    * <P>Closing a connection causes any of its sessions' transactions
+    * in progress to be rolled back. In the case where a session's
+    * work is coordinated by an external transaction manager, a session's 
+    * <CODE>commit</CODE> and <CODE>rollback</CODE> methods are
+    * not used and the result of a closed session's work is determined
+    * later by the transaction manager.
+    *
+    * Closing a connection does NOT force an 
+    * acknowledgment of client-acknowledged sessions. 
+    * 
+    * <P>Invoking the <CODE>acknowledge</CODE> method of a received message 
+    * from a closed connection's session must throw an 
+    * <CODE>IllegalStateException</CODE>.  Closing a closed connection must 
+    * NOT throw an exception.
+    *  
+    * @exception JMSException if the JMS provider fails to close the
+    *                         connection due to some internal error. For 
+    *                         example, a failure to release resources
+    *                         or to close a socket connection can cause
+    *                         this exception to be thrown.
+    *
+    */
 
-    void 
-    close() throws JMSException; 
-    
-      /** Creates a connection consumer for this connection (optional operation).
-      * This is an expert facility not used by regular JMS clients.
-      *  
-      * @param destination the destination to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector  
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the connection consumer
-      *
-      * @exception JMSException if the <CODE>Connection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid destination is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1
-      * @see javax.jms.ConnectionConsumer
-      */ 
+  void close() throws JMSException;
 
-    ConnectionConsumer
-    createConnectionConsumer(Destination destination,
-                             String messageSelector,
-                             ServerSessionPool sessionPool,
-			     int maxMessages)
-			     throws JMSException;
+  /** Creates a connection consumer for this connection (optional operation).
+  * This is an expert facility not used by regular JMS clients.
+  *  
+  * @param destination the destination to access
+  * @param messageSelector only messages with properties matching the
+  * message selector expression are delivered.  A value of null or
+  * an empty string indicates that there is no message selector  
+  * for the message consumer.
+  * @param sessionPool the server session pool to associate with this 
+  * connection consumer
+  * @param maxMessages the maximum number of messages that can be
+  * assigned to a server session at one time
+  *
+  * @return the connection consumer
+  *
+  * @exception JMSException if the <CODE>Connection</CODE> object fails
+  *                         to create a connection consumer due to some
+  *                         internal error or invalid arguments for 
+  *                         <CODE>sessionPool</CODE> and 
+  *                         <CODE>messageSelector</CODE>.
+  * @exception InvalidDestinationException if an invalid destination is specified.
+  * @exception InvalidSelectorException if the message selector is invalid.
+  *
+  * @since 1.1
+  * @see javax.jms.ConnectionConsumer
+  */
 
+  ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
+      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 
-    /** Create a durable connection consumer for this connection (optional operation). 
-      * This is an expert facility not used by regular JMS clients.
-      *                
-      * @param topic topic to access
-      * @param subscriptionName durable subscription name
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * durable connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the durable connection consumer
-      *  
-      * @exception JMSException if the <CODE>Connection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid destination
-      *             is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      * @since 1.1
-      * @see javax.jms.ConnectionConsumer
-      */
+  /** Create a durable connection consumer for this connection (optional operation). 
+    * This is an expert facility not used by regular JMS clients.
+    *                
+    * @param topic topic to access
+    * @param subscriptionName durable subscription name
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param sessionPool the server session pool to associate with this 
+    * durable connection consumer
+    * @param maxMessages the maximum number of messages that can be
+    * assigned to a server session at one time
+    *
+    * @return the durable connection consumer
+    *  
+    * @exception JMSException if the <CODE>Connection</CODE> object fails
+    *                         to create a connection consumer due to some
+    *                         internal error or invalid arguments for 
+    *                         <CODE>sessionPool</CODE> and 
+    *                         <CODE>messageSelector</CODE>.
+    * @exception InvalidDestinationException if an invalid destination
+    *             is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    * @since 1.1
+    * @see javax.jms.ConnectionConsumer
+    */
 
-    ConnectionConsumer
-    createDurableConnectionConsumer(Topic topic,
-				    String subscriptionName,
-                                    String messageSelector,
-                                    ServerSessionPool sessionPool,
-				    int maxMessages)
-                             throws JMSException;
+  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
+      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 }
-
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java
index d6876fbaac..1c09a0f4f8 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionConsumer.java
@@ -1,85 +1,82 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** For application servers, <CODE>Connection</CODE> objects provide a special 
-  * facility 
-  * for creating a <CODE>ConnectionConsumer</CODE> (optional). The messages it 
-  * is to consume are 
-  * specified by a <CODE>Destination</CODE> and a message selector. In addition,
-  * a <CODE>ConnectionConsumer</CODE> must be given a 
-  * <CODE>ServerSessionPool</CODE> to use for 
-  * processing its messages.
-  *
-  * <P>Normally, when traffic is light, a <CODE>ConnectionConsumer</CODE> gets a
-  * <CODE>ServerSession</CODE> from its pool, loads it with a single message, and
-  * starts it. As traffic picks up, messages can back up. If this happens, 
-  * a <CODE>ConnectionConsumer</CODE> can load each <CODE>ServerSession</CODE>
-  * with more than one 
-  * message. This reduces the thread context switches and minimizes resource 
-  * use at the expense of some serialization of message processing.
-  *
-  * @version     1.1 February 8, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see javax.jms.Connection#createConnectionConsumer
-  * @see javax.jms.Connection#createDurableConnectionConsumer
-  * @see javax.jms.QueueConnection#createConnectionConsumer
-  * @see javax.jms.TopicConnection#createConnectionConsumer
-  * @see javax.jms.TopicConnection#createDurableConnectionConsumer
-  */
+/** For application servers, <CODE>Connection</CODE> objects provide a special
+ * facility
+ * for creating a <CODE>ConnectionConsumer</CODE> (optional). The messages it
+ * is to consume are
+ * specified by a <CODE>Destination</CODE> and a message selector. In addition,
+ * a <CODE>ConnectionConsumer</CODE> must be given a
+ * <CODE>ServerSessionPool</CODE> to use for
+ * processing its messages.
+ *
+ * <P>Normally, when traffic is light, a <CODE>ConnectionConsumer</CODE> gets a
+ * <CODE>ServerSession</CODE> from its pool, loads it with a single message, and
+ * starts it. As traffic picks up, messages can back up. If this happens,
+ * a <CODE>ConnectionConsumer</CODE> can load each <CODE>ServerSession</CODE>
+ * with more than one
+ * message. This reduces the thread context switches and minimizes resource
+ * use at the expense of some serialization of message processing.
+ *
+ * @version     1.1 February 8, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see javax.jms.Connection#createConnectionConsumer
+ * @see javax.jms.Connection#createDurableConnectionConsumer
+ * @see javax.jms.QueueConnection#createConnectionConsumer
+ * @see javax.jms.TopicConnection#createConnectionConsumer
+ * @see javax.jms.TopicConnection#createDurableConnectionConsumer
+ */
 
-public interface ConnectionConsumer {
+public interface ConnectionConsumer
+{
 
-    /** Gets the server session pool associated with this connection consumer.
-      *  
-      * @return the server session pool used by this connection consumer
-      *  
-      * @exception JMSException if the JMS provider fails to get the server 
-      *                         session pool associated with this consumer due
-      *                         to some internal error.
-      */
+  /** Gets the server session pool associated with this connection consumer.
+    *  
+    * @return the server session pool used by this connection consumer
+    *  
+    * @exception JMSException if the JMS provider fails to get the server 
+    *                         session pool associated with this consumer due
+    *                         to some internal error.
+    */
 
-    ServerSessionPool 
-    getServerSessionPool() throws JMSException; 
+  ServerSessionPool getServerSessionPool() throws JMSException;
 
- 
-    /** Closes the connection consumer.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a 
-      * connection consumer outside the Java virtual machine, clients should 
-      * close these resources when
-      * they are not needed. Relying on garbage collection to eventually 
-      * reclaim these resources may not be timely enough.
-      *  
-      * @exception JMSException if the JMS provider fails to release resources 
-      *                         on behalf of the connection consumer or fails
-      *                         to close the connection consumer.
-      */
+  /** Closes the connection consumer.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a 
+    * connection consumer outside the Java virtual machine, clients should 
+    * close these resources when
+    * they are not needed. Relying on garbage collection to eventually 
+    * reclaim these resources may not be timely enough.
+    *  
+    * @exception JMSException if the JMS provider fails to release resources 
+    *                         on behalf of the connection consumer or fails
+    *                         to close the connection consumer.
+    */
 
-    void 
-    close() throws JMSException; 
+  void close() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java
index 9916d5c3d6..8936d5e705 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionFactory.java
@@ -1,126 +1,123 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A <CODE>ConnectionFactory</CODE> object encapsulates a set of connection 
-  * configuration 
-  * parameters that has been defined by an administrator. A client uses 
-  * it to create a connection with a JMS provider.
-  *
-  * <P>A <CODE>ConnectionFactory</CODE> object is a JMS administered object and
-  *  supports concurrent use.
-  *
-  * <P>JMS administered objects are objects containing configuration 
-  * information that are created by an administrator and later used by 
-  * JMS clients. They make it practical to administer the JMS API in the 
-  * enterprise.
-  *
-  * <P>Although the interfaces for administered objects do not explicitly 
-  * depend on the Java Naming and Directory Interface (JNDI) API, the JMS API 
-  * establishes the convention that JMS clients find administered objects by 
-  * looking them up in a JNDI namespace.
-  *
-  * <P>An administrator can place an administered object anywhere in a 
-  * namespace. The JMS API does not define a naming policy.
-  *
-  * <P>It is expected that JMS providers will provide the tools an
-  * administrator needs to create and configure administered objects in a 
-  * JNDI namespace. JMS provider implementations of administered objects 
-  * should be both <CODE>javax.jndi.Referenceable</CODE> and 
-  * <CODE>java.io.Serializable</CODE> so that they can be stored in all 
-  * JNDI naming contexts. In addition, it is recommended that these 
-  * implementations follow the JavaBeans<SUP><FONT SIZE="-2">TM</FONT></SUP> 
-  * design patterns.
-  *
-  * <P>This strategy provides several benefits:
-  *
-  * <UL>
-  *   <LI>It hides provider-specific details from JMS clients.
-  *   <LI>It abstracts administrative information into objects in the Java 
-  *       programming language ("Java objects")
-  *       that are easily organized and administered from a common 
-  *       management console.
-  *   <LI>Since there will be JNDI providers for all popular naming 
-  *       services, this means that JMS providers can deliver one implementation 
-  *       of administered objects that will run everywhere.
-  * </UL>
-  *
-  * <P>An administered object should not hold on to any remote resources. 
-  * Its lookup should not use remote resources other than those used by the
-  * JNDI API itself.
-  *
-  * <P>Clients should think of administered objects as local Java objects. 
-  * Looking them up should not have any hidden side effects or use surprising 
-  * amounts of local resources.
+/** A <CODE>ConnectionFactory</CODE> object encapsulates a set of connection
+ * configuration
+ * parameters that has been defined by an administrator. A client uses
+ * it to create a connection with a JMS provider.
+ *
+ * <P>A <CODE>ConnectionFactory</CODE> object is a JMS administered object and
+ *  supports concurrent use.
+ *
+ * <P>JMS administered objects are objects containing configuration
+ * information that are created by an administrator and later used by
+ * JMS clients. They make it practical to administer the JMS API in the
+ * enterprise.
+ *
+ * <P>Although the interfaces for administered objects do not explicitly
+ * depend on the Java Naming and Directory Interface (JNDI) API, the JMS API
+ * establishes the convention that JMS clients find administered objects by
+ * looking them up in a JNDI namespace.
+ *
+ * <P>An administrator can place an administered object anywhere in a
+ * namespace. The JMS API does not define a naming policy.
+ *
+ * <P>It is expected that JMS providers will provide the tools an
+ * administrator needs to create and configure administered objects in a
+ * JNDI namespace. JMS provider implementations of administered objects
+ * should be both <CODE>javax.jndi.Referenceable</CODE> and
+ * <CODE>java.io.Serializable</CODE> so that they can be stored in all
+ * JNDI naming contexts. In addition, it is recommended that these
+ * implementations follow the JavaBeans<SUP><FONT SIZE="-2">TM</FONT></SUP>
+ * design patterns.
+ *
+ * <P>This strategy provides several benefits:
+ *
+ * <UL>
+ *   <LI>It hides provider-specific details from JMS clients.
+ *   <LI>It abstracts administrative information into objects in the Java
+ *       programming language ("Java objects")
+ *       that are easily organized and administered from a common
+ *       management console.
+ *   <LI>Since there will be JNDI providers for all popular naming
+ *       services, this means that JMS providers can deliver one implementation
+ *       of administered objects that will run everywhere.
+ * </UL>
+ *
+ * <P>An administered object should not hold on to any remote resources.
+ * Its lookup should not use remote resources other than those used by the
+ * JNDI API itself.
+ *
+ * <P>Clients should think of administered objects as local Java objects.
+ * Looking them up should not have any hidden side effects or use surprising
+ * amounts of local resources.
+ *
+ * @version     1.1 - February 1, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Connection
+ * @see         javax.jms.QueueConnectionFactory
+ * @see         javax.jms.TopicConnectionFactory
+ */
+
+public interface ConnectionFactory
+{
+  /** Creates a connection with the default user identity.
+  * The connection is created in stopped mode. No messages 
+  * will be delivered until the <code>Connection.start</code> method
+  * is explicitly called.
   *
-  * @version     1.1 - February 1, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
+  * @return a newly created connection
   *
-  * @see         javax.jms.Connection
-  * @see         javax.jms.QueueConnectionFactory
-  * @see         javax.jms.TopicConnectionFactory
+  * @exception JMSException if the JMS provider fails to create the
+  *                         connection due to some internal error.
+  * @exception JMSSecurityException  if client authentication fails due to 
+  *                         an invalid user name or password.
+  * @since 1.1 
   */
 
-public interface ConnectionFactory {
-        /** Creates a connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created connection
-      *
-      * @exception JMSException if the JMS provider fails to create the
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-       * @since 1.1 
-     */ 
-
-    Connection
-    createConnection() throws JMSException;
-
+  Connection createConnection() throws JMSException;
 
-    /** Creates a connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created  connection
-      *
-      * @exception JMSException if the JMS provider fails to create the 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      * @since 1.1  
-      */ 
+  /** Creates a connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created  connection
+    *
+    * @exception JMSException if the JMS provider fails to create the 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    * @since 1.1  
+    */
 
-    Connection
-    createConnection(String userName, String password) 
-					     throws JMSException;
+  Connection createConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java
index 8fb3d50964..183c2e0801 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ConnectionMetaData.java
@@ -1,133 +1,118 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.util.Enumeration;
 
-/** A <CODE>ConnectionMetaData</CODE> object provides information describing the 
-  * <CODE>Connection</CODE> object.
-  *
-  * @version     1.0 - 13 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  */
-
-public interface ConnectionMetaData {
-
-    /** Gets the JMS API version.
-      *
-      * @return the JMS API version
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    String 
-    getJMSVersion() throws JMSException;
-
-
-    /** Gets the JMS major version number.
-      *  
-      * @return the JMS API major version number
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    int 
-    getJMSMajorVersion() throws JMSException; 
- 
-
-    /** Gets the JMS minor version number.
-      *  
-      * @return the JMS API minor version number
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    int  
-    getJMSMinorVersion() throws JMSException;
-
-
-    /** Gets the JMS provider name.
-      *
-      * @return the JMS provider name
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */ 
-
-    String 
-    getJMSProviderName() throws JMSException;
-
-
-    /** Gets the JMS provider version.
-      *
-      * @return the JMS provider version
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */ 
-
-    String 
-    getProviderVersion() throws JMSException;
-
-
-    /** Gets the JMS provider major version number.
-      *  
-      * @return the JMS provider major version number
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    int
-    getProviderMajorVersion() throws JMSException; 
-
- 
-    /** Gets the JMS provider minor version number.
-      *  
-      * @return the JMS provider minor version number
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    int  
-    getProviderMinorVersion() throws JMSException;
-
- 
-    /** Gets an enumeration of the JMSX property names.
-      *  
-      * @return an Enumeration of JMSX property names
-      *  
-      * @exception JMSException if the JMS provider fails to retrieve the
-      *                         metadata due to some internal error.
-      */
-
-    Enumeration
-    getJMSXPropertyNames() throws JMSException;
+/** A <CODE>ConnectionMetaData</CODE> object provides information describing the
+ * <CODE>Connection</CODE> object.
+ *
+ * @version     1.0 - 13 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ */
+
+public interface ConnectionMetaData
+{
+
+  /** Gets the JMS API version.
+    *
+    * @return the JMS API version
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  String getJMSVersion() throws JMSException;
+
+  /** Gets the JMS major version number.
+    *  
+    * @return the JMS API major version number
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  int getJMSMajorVersion() throws JMSException;
+
+  /** Gets the JMS minor version number.
+    *  
+    * @return the JMS API minor version number
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  int getJMSMinorVersion() throws JMSException;
+
+  /** Gets the JMS provider name.
+    *
+    * @return the JMS provider name
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  String getJMSProviderName() throws JMSException;
+
+  /** Gets the JMS provider version.
+    *
+    * @return the JMS provider version
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  String getProviderVersion() throws JMSException;
+
+  /** Gets the JMS provider major version number.
+    *  
+    * @return the JMS provider major version number
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  int getProviderMajorVersion() throws JMSException;
+
+  /** Gets the JMS provider minor version number.
+    *  
+    * @return the JMS provider minor version number
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  int getProviderMinorVersion() throws JMSException;
+
+  /** Gets an enumeration of the JMSX property names.
+    *  
+    * @return an Enumeration of JMSX property names
+    *  
+    * @exception JMSException if the JMS provider fails to retrieve the
+    *                         metadata due to some internal error.
+    */
+
+  Enumeration getJMSXPropertyNames() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java
index b5cab804c1..a110311baa 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/DeliveryMode.java
@@ -1,79 +1,79 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** The delivery modes supported by the JMS API are <CODE>PERSISTENT</CODE> and
-  * <CODE>NON_PERSISTENT</CODE>.
-  *
-  * <P>A client marks a message as persistent if it feels that the 
-  * application will have problems if the message is lost in transit.
-  * A client marks a message as non-persistent if an occasional
-  * lost message is tolerable. Clients use delivery mode to tell a
-  * JMS provider how to balance message transport reliability with throughput.
-  *
-  * <P>Delivery mode covers only the transport of the message to its 
-  * destination. Retention of a message at the destination until
-  * its receipt is acknowledged is not guaranteed by a <CODE>PERSISTENT</CODE> 
-  * delivery mode. Clients should assume that message retention 
-  * policies are set administratively. Message retention policy
-  * governs the reliability of message delivery from destination
-  * to message consumer. For example, if a client's message storage 
-  * space is exhausted, some messages may be dropped in accordance with 
-  * a site-specific message retention policy.
-  *
-  * <P>A message is guaranteed to be delivered once and only once
-  * by a JMS provider if the delivery mode of the message is 
-  * <CODE>PERSISTENT</CODE> 
-  * and if the destination has a sufficient message retention policy.
-  *
-  *
-  *
-  * @version     1.0 - 7 August 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  */
+ * <CODE>NON_PERSISTENT</CODE>.
+ *
+ * <P>A client marks a message as persistent if it feels that the
+ * application will have problems if the message is lost in transit.
+ * A client marks a message as non-persistent if an occasional
+ * lost message is tolerable. Clients use delivery mode to tell a
+ * JMS provider how to balance message transport reliability with throughput.
+ *
+ * <P>Delivery mode covers only the transport of the message to its
+ * destination. Retention of a message at the destination until
+ * its receipt is acknowledged is not guaranteed by a <CODE>PERSISTENT</CODE>
+ * delivery mode. Clients should assume that message retention
+ * policies are set administratively. Message retention policy
+ * governs the reliability of message delivery from destination
+ * to message consumer. For example, if a client's message storage
+ * space is exhausted, some messages may be dropped in accordance with
+ * a site-specific message retention policy.
+ *
+ * <P>A message is guaranteed to be delivered once and only once
+ * by a JMS provider if the delivery mode of the message is
+ * <CODE>PERSISTENT</CODE>
+ * and if the destination has a sufficient message retention policy.
+ *
+ *
+ *
+ * @version     1.0 - 7 August 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ */
 
-public interface DeliveryMode {
+public interface DeliveryMode
+{
 
-    /** This is the lowest-overhead delivery mode because it does not require 
-      * that the message be logged to stable storage. The level of JMS provider
-      * failure that causes a <CODE>NON_PERSISTENT</CODE> message to be lost is 
-      * not defined.
-      *
-      * <P>A JMS provider must deliver a <CODE>NON_PERSISTENT</CODE> message 
-      * with an 
-      * at-most-once guarantee. This means that it may lose the message, but it 
-      * must not deliver it twice.
-      */
+  /** This is the lowest-overhead delivery mode because it does not require 
+    * that the message be logged to stable storage. The level of JMS provider
+    * failure that causes a <CODE>NON_PERSISTENT</CODE> message to be lost is 
+    * not defined.
+    *
+    * <P>A JMS provider must deliver a <CODE>NON_PERSISTENT</CODE> message 
+    * with an 
+    * at-most-once guarantee. This means that it may lose the message, but it 
+    * must not deliver it twice.
+    */
 
-    static final int NON_PERSISTENT = 1;
+  static final int NON_PERSISTENT = 1;
 
-    /** This delivery mode instructs the JMS provider to log the message to stable 
-      * storage as part of the client's send operation. Only a hard media 
-      * failure should cause a <CODE>PERSISTENT</CODE> message to be lost.
-      */
+  /** This delivery mode instructs the JMS provider to log the message to stable 
+    * storage as part of the client's send operation. Only a hard media 
+    * failure should cause a <CODE>PERSISTENT</CODE> message to be lost.
+    */
 
-    static final int PERSISTENT = 2;
+  static final int PERSISTENT = 2;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Destination.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Destination.java
index a7bec1ae86..39eb480c1b 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Destination.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Destination.java
@@ -1,97 +1,97 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>Destination</CODE> object encapsulates a provider-specific 
-  * address.
-  * The JMS API does not define a standard address syntax. Although a standard
-  * address syntax was considered, it was decided that the differences in 
-  * address semantics between existing message-oriented middleware (MOM) 
-  * products were too wide to bridge with a single syntax. 
-  *
-  * <P>Since <CODE>Destination</CODE> is an administered object, it may 
-  * contain 
-  * provider-specific configuration information in addition to its address.
-  *
-  * <P>The JMS API also supports a client's use of provider-specific address 
-  * names.
-  *
-  * <P><CODE>Destination</CODE> objects support concurrent use.
-  *
-  * <P>A <CODE>Destination</CODE> object is a JMS administered object.
-  *
-  * <P>JMS administered objects are objects containing configuration 
-  * information that are created by an administrator and later used by 
-  * JMS clients. They make it practical to administer the JMS API in the 
-  * enterprise.
-  *
-  * <P>Although the interfaces for administered objects do not explicitly 
-  * depend on the Java Naming and Directory Interface (JNDI) API, the JMS API 
-  * establishes the convention that JMS clients find administered objects by
-  * looking them up in a JNDI namespace.
-  *
-  * <P>An administrator can place an administered object anywhere in a 
-  * namespace. The JMS API does not define a naming policy.
-  *
-  * <P>It is expected that JMS providers will provide the tools an
-  * administrator needs to create and configure administered objects in a
-  * JNDI namespace. JMS provider implementations of administered objects
-  * should implement the <CODE>javax.naming.Referenceable</CODE> and
-  * <CODE>java.io.Serializable</CODE> interfaces so that they can be stored in 
-  * all JNDI naming contexts. In addition, it is recommended that these
-  * implementations follow the JavaBeans<SUP><FONT SIZE="-2">TM</FONT></SUP> 
-  * design patterns.
-  *
-  * <P>This strategy provides several benefits:
-  *
-  * <UL>
-  *   <LI>It hides provider-specific details from JMS clients.
-  *   <LI>It abstracts JMS administrative information into objects in the Java 
-  *       programming language ("Java objects") 
-  *       that are easily organized and administered from a common 
-  *       management console.
-  *   <LI>Since there will be JNDI providers for all popular naming 
-  *       services, JMS providers can deliver one implementation
-  *       of administered objects that will run everywhere.
-  * </UL>
-  *
-  * <P>An administered object should not hold on to any remote resources. 
-  * Its lookup should not use remote resources other than those used by the
-  * JNDI API itself.
-  *
-  * <P>Clients should think of administered objects as local Java objects. 
-  * Looking them up should not have any hidden side effects or use surprising 
-  * amounts of local resources.
-  *
-  * @version     1.0 - 3 August 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.Queue
-  * @see         javax.jms.Topic
-  */
+/** A <CODE>Destination</CODE> object encapsulates a provider-specific
+ * address.
+ * The JMS API does not define a standard address syntax. Although a standard
+ * address syntax was considered, it was decided that the differences in
+ * address semantics between existing message-oriented middleware (MOM)
+ * products were too wide to bridge with a single syntax.
+ *
+ * <P>Since <CODE>Destination</CODE> is an administered object, it may
+ * contain
+ * provider-specific configuration information in addition to its address.
+ *
+ * <P>The JMS API also supports a client's use of provider-specific address
+ * names.
+ *
+ * <P><CODE>Destination</CODE> objects support concurrent use.
+ *
+ * <P>A <CODE>Destination</CODE> object is a JMS administered object.
+ *
+ * <P>JMS administered objects are objects containing configuration
+ * information that are created by an administrator and later used by
+ * JMS clients. They make it practical to administer the JMS API in the
+ * enterprise.
+ *
+ * <P>Although the interfaces for administered objects do not explicitly
+ * depend on the Java Naming and Directory Interface (JNDI) API, the JMS API
+ * establishes the convention that JMS clients find administered objects by
+ * looking them up in a JNDI namespace.
+ *
+ * <P>An administrator can place an administered object anywhere in a
+ * namespace. The JMS API does not define a naming policy.
+ *
+ * <P>It is expected that JMS providers will provide the tools an
+ * administrator needs to create and configure administered objects in a
+ * JNDI namespace. JMS provider implementations of administered objects
+ * should implement the <CODE>javax.naming.Referenceable</CODE> and
+ * <CODE>java.io.Serializable</CODE> interfaces so that they can be stored in
+ * all JNDI naming contexts. In addition, it is recommended that these
+ * implementations follow the JavaBeans<SUP><FONT SIZE="-2">TM</FONT></SUP>
+ * design patterns.
+ *
+ * <P>This strategy provides several benefits:
+ *
+ * <UL>
+ *   <LI>It hides provider-specific details from JMS clients.
+ *   <LI>It abstracts JMS administrative information into objects in the Java
+ *       programming language ("Java objects")
+ *       that are easily organized and administered from a common
+ *       management console.
+ *   <LI>Since there will be JNDI providers for all popular naming
+ *       services, JMS providers can deliver one implementation
+ *       of administered objects that will run everywhere.
+ * </UL>
+ *
+ * <P>An administered object should not hold on to any remote resources.
+ * Its lookup should not use remote resources other than those used by the
+ * JNDI API itself.
+ *
+ * <P>Clients should think of administered objects as local Java objects.
+ * Looking them up should not have any hidden side effects or use surprising
+ * amounts of local resources.
+ *
+ * @version     1.0 - 3 August 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.Queue
+ * @see         javax.jms.Topic
+ */
 
-public interface Destination {
+public interface Destination
+{
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ExceptionListener.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ExceptionListener.java
index 24904bb097..f08dbef80e 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ExceptionListener.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ExceptionListener.java
@@ -1,57 +1,55 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-
 /** If a JMS provider detects a serious problem with a <CODE>Connection</CODE>
-  * object, it informs the <CODE>Connection</CODE> object's 
-  * <CODE>ExceptionListener</CODE>, if one has been registered. 
-  * It does this by calling the listener's <CODE>onException</CODE> method, 
-  * passing it a <CODE>JMSException</CODE> argument describing the problem.
-  *
-  * <P>An exception listener allows a client to be notified of a problem 
-  * asynchronously. Some connections only consume messages, so they would have no
-  * other way to learn that their connection has failed.
-  *
-  * <P>A JMS provider should attempt to resolve connection problems 
-  * itself before it notifies the client of them.
-  *
-  * @version     1.0 - 9 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see javax.jms.Connection#setExceptionListener(ExceptionListener)
-  */
+ * object, it informs the <CODE>Connection</CODE> object's
+ * <CODE>ExceptionListener</CODE>, if one has been registered.
+ * It does this by calling the listener's <CODE>onException</CODE> method,
+ * passing it a <CODE>JMSException</CODE> argument describing the problem.
+ *
+ * <P>An exception listener allows a client to be notified of a problem
+ * asynchronously. Some connections only consume messages, so they would have no
+ * other way to learn that their connection has failed.
+ *
+ * <P>A JMS provider should attempt to resolve connection problems
+ * itself before it notifies the client of them.
+ *
+ * @version     1.0 - 9 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see javax.jms.Connection#setExceptionListener(ExceptionListener)
+ */
 
-public interface ExceptionListener {
+public interface ExceptionListener
+{
 
-    /** Notifies user of a JMS exception.
-      *
-      * @param exception the JMS exception
-      */
+  /** Notifies user of a JMS exception.
+    *
+    * @param exception the JMS exception
+    */
 
-    void 
-    onException(JMSException exception);
+  void onException(JMSException exception);
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/IllegalStateException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/IllegalStateException.java
index 5c80831a90..cce8f931ad 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/IllegalStateException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/IllegalStateException.java
@@ -3,16 +3,15 @@
  * Use is subject to license terms.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception is thrown when a method is 
- *     invoked at an illegal or inappropriate time or if the provider is 
- *     not in an appropriate state for the requested operation. For example, 
- *     this exception must be thrown if <CODE>Session.commit</CODE> is 
+ * <P> This exception is thrown when a method is
+ *     invoked at an illegal or inappropriate time or if the provider is
+ *     not in an appropriate state for the requested operation. For example,
+ *     this exception must be thrown if <CODE>Session.commit</CODE> is
  *     called on a non-transacted session. This exception is also called when
- *     a domain inappropriate method is called, such as calling 
+ *     a domain inappropriate method is called, such as calling
  *     <CODE>TopicSession.CreateQueueBrowser</CODE>.
  *
  * @version     April 9, 2002
@@ -20,7 +19,10 @@ package javax.jms;
  * @author      Kate Stout
  **/
 
-public class IllegalStateException extends JMSException {
+public class IllegalStateException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
   /** Constructs an <CODE>IllegalStateException</CODE> with the specified reason
    *  and error code.
@@ -28,20 +30,20 @@ public class IllegalStateException extends JMSException {
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  IllegalStateException(String reason, String errorCode) {
+  public IllegalStateException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs an <CODE>IllegalStateException</CODE> with the specified 
+  /** Constructs an <CODE>IllegalStateException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  IllegalStateException(String reason) {
+  public IllegalStateException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidClientIDException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidClientIDException.java
index 0c4aae3f7e..dd1a4d45ae 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidClientIDException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidClientIDException.java
@@ -1,59 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a 
- *     client attempts to set a connection's client ID to a value that 
+ * <P> This exception must be thrown when a
+ *     client attempts to set a connection's client ID to a value that
  *     is rejected by a provider.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class InvalidClientIDException extends JMSException {
+public class InvalidClientIDException extends JMSException
+{
 
-  /** Constructs an <CODE>InvalidClientIDException</CODE> with the specified 
+  private static final long serialVersionUID = 1L;
+
+  /** Constructs an <CODE>InvalidClientIDException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  InvalidClientIDException(String reason, String errorCode) {
+  public InvalidClientIDException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs an <CODE>InvalidClientIDException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidClientIDException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  InvalidClientIDException(String reason) {
+  public InvalidClientIDException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidDestinationException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidDestinationException.java
index 410b5b1339..8356c341b2 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidDestinationException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidDestinationException.java
@@ -1,60 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a 
- *     destination either is not understood by a provider or is no 
+ * <P> This exception must be thrown when a
+ *     destination either is not understood by a provider or is no
  *     longer valid.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class InvalidDestinationException extends JMSException {
+public class InvalidDestinationException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs an <CODE>InvalidDestinationException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidDestinationException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  InvalidDestinationException(String reason, String errorCode) {
+  public InvalidDestinationException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs an <CODE>InvalidDestinationException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidDestinationException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  InvalidDestinationException(String reason) {
+  public InvalidDestinationException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidSelectorException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidSelectorException.java
index 3f55c62c6d..2143d542b1 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidSelectorException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/InvalidSelectorException.java
@@ -1,60 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a 
- *     JMS client attempts to give a provider a message selector with 
+ * <P> This exception must be thrown when a
+ *     JMS client attempts to give a provider a message selector with
  *     invalid syntax.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class InvalidSelectorException extends JMSException {
+public class InvalidSelectorException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs an <CODE>InvalidSelectorException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidSelectorException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  InvalidSelectorException(String reason, String errorCode) {
+  public InvalidSelectorException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs an <CODE>InvalidSelectorException</CODE> with the specified 
+  /** Constructs an <CODE>InvalidSelectorException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  InvalidSelectorException(String reason) {
+  public InvalidSelectorException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/JMSException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/JMSException.java
index 38230dbabf..c082156297 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/JMSException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/JMSException.java
@@ -1,27 +1,26 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
@@ -29,12 +28,12 @@ package javax.jms;
  *
  * <P>It provides the following information:
  * <UL>
- *   <LI> A provider-specific string describing the error. This string is 
+ *   <LI> A provider-specific string describing the error. This string is
  *        the standard exception message and is available via the
  *        <CODE>getMessage</CODE> method.
- *   <LI> A provider-specific string error code 
- *   <LI> A reference to another exception. Often a JMS API exception will 
- *        be the result of a lower-level problem. If appropriate, this 
+ *   <LI> A provider-specific string error code
+ *   <LI> A reference to another exception. Often a JMS API exception will
+ *        be the result of a lower-level problem. If appropriate, this
  *        lower-level exception can be linked to the JMS API exception.
  * </UL>
  * @version     1.0 - 5 Oct 1998
@@ -42,26 +41,28 @@ package javax.jms;
  * @author      Rich Burridge
  **/
 
-public class JMSException extends Exception {
+public class JMSException extends Exception
+{
+
+  private static final long serialVersionUID = 1L;
 
   /** Vendor-specific error code.
-  **/
+   **/
   private String errorCode;
 
   /** <CODE>Exception</CODE> reference.
-  **/
+   **/
   private Exception linkedException;
 
-
-  /** Constructs a <CODE>JMSException</CODE> with the specified reason and 
+  /** Constructs a <CODE>JMSException</CODE> with the specified reason and
    *  error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
    **/
-  public 
-  JMSException(String reason, String errorCode) {
+  public JMSException(String reason, String errorCode)
+  {
     super(reason);
     this.errorCode = errorCode;
     linkedException = null;
@@ -72,39 +73,39 @@ public class JMSException extends Exception {
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  JMSException(String reason) {
+  public JMSException(String reason)
+  {
     super(reason);
-    this.errorCode = null;
+    errorCode = null;
     linkedException = null;
   }
 
   /** Gets the vendor-specific error code.
    *  @return   a string specifying the vendor-specific
    *                        error code
-  **/
-  public 
-  String getErrorCode() {
-    return this.errorCode;
+   **/
+  public String getErrorCode()
+  {
+    return errorCode;
   }
 
   /**
    * Gets the exception linked to this one.
    *
    * @return the linked <CODE>Exception</CODE>, null if none
-  **/
-  public 
-  Exception getLinkedException() {
-    return (linkedException);
+   **/
+  public Exception getLinkedException()
+  {
+    return linkedException;
   }
 
   /**
    * Adds a linked <CODE>Exception</CODE>.
    *
    * @param ex       the linked <CODE>Exception</CODE>
-  **/
-  public 
-  synchronized void setLinkedException(Exception ex) {
-      linkedException = ex;
+   **/
+  public synchronized void setLinkedException(Exception ex)
+  {
+    linkedException = ex;
   }
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/JMSSecurityException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/JMSSecurityException.java
index 61377aca20..3d21e7e4e1 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/JMSSecurityException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/JMSSecurityException.java
@@ -1,60 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a provider rejects a user 
- *     name/password submitted by a client. It may also be thrown for any case 
+ * <P> This exception must be thrown when a provider rejects a user
+ *     name/password submitted by a client. It may also be thrown for any case
  *     where a security restriction prevents a method from completing.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class JMSSecurityException extends JMSException {
+public class JMSSecurityException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>JMSSecurityException</CODE> with the specified 
+  /** Constructs a <CODE>JMSSecurityException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  JMSSecurityException(String reason, String errorCode) {
+  public JMSSecurityException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>JMSSecurityException</CODE> with the specified 
+  /** Constructs a <CODE>JMSSecurityException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  JMSSecurityException(String reason) {
+  public JMSSecurityException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java
index faada144d1..defd0a5bce 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MapMessage.java
@@ -1,529 +1,466 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.util.Enumeration;
 
 /** A <CODE>MapMessage</CODE> object is used to send a set of name-value pairs.
-  * The names are <CODE>String</CODE> objects, and the values are primitive 
-  * data types in the Java programming language. The names must have a value that
-  * is not null, and not an empty string. The entries can be accessed 
-  * sequentially or randomly by name. The order of the entries is undefined. 
-  * <CODE>MapMessage</CODE> inherits from the <CODE>Message</CODE> interface
-  * and adds a message body that contains a Map.
-  *
-  * <P>The primitive types can be read or written explicitly using methods
-  * for each type. They may also be read or written generically as objects.
-  * For instance, a call to <CODE>MapMessage.setInt("foo", 6)</CODE> is 
-  * equivalent to <CODE>MapMessage.setObject("foo", new Integer(6))</CODE>.
-  * Both forms are provided, because the explicit form is convenient for
-  * static programming, and the object form is needed when types are not known
-  * at compile time.
-  *
-  * <P>When a client receives a <CODE>MapMessage</CODE>, it is in read-only 
-  * mode. If a client attempts to write to the message at this point, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown. If 
-  * <CODE>clearBody</CODE> is called, the message can now be both read from and 
-  * written to.
-  *
-  * <P><CODE>MapMessage</CODE> objects support the following conversion table. 
-  * The marked cases must be supported. The unmarked cases must throw a 
-  * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions 
-  * may throw a runtime exception if the primitive's <CODE>valueOf()</CODE> 
-  * method does not accept it as a valid <CODE>String</CODE> representation of 
-  * the primitive.
-  *
-  * <P>A value written as the row type can be read as the column type.
-  *
-  * <PRE>
-  * |        | boolean byte short char int long float double String byte[]
-  * |----------------------------------------------------------------------
-  * |boolean |    X                                            X
-  * |byte    |          X     X         X   X                  X
-  * |short   |                X         X   X                  X
-  * |char    |                     X                           X
-  * |int     |                          X   X                  X
-  * |long    |                              X                  X
-  * |float   |                                    X     X      X
-  * |double  |                                          X      X
-  * |String  |    X     X     X         X   X     X     X      X
-  * |byte[]  |                                                        X
-  * |----------------------------------------------------------------------
-  * </PRE>
-  *
-  * <P>Attempting to read a null value as a primitive type must be treated
-  * as calling the primitive's corresponding <code>valueOf(String)</code> 
-  * conversion method with a null value. Since <code>char</code> does not 
-  * support a <code>String</code> conversion, attempting to read a null value 
-  * as a <code>char</code> must throw a <code>NullPointerException</code>.
-  *
-  * @version     1.1 February 2, 002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.Session#createMapMessage()
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.StreamMessage
-  * @see         javax.jms.TextMessage
-  */
- 
-public interface MapMessage extends Message { 
-
-
-    /** Returns the <CODE>boolean</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>boolean</CODE>
-      *
-      * @return the <CODE>boolean</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */
-
-    boolean 
-    getBoolean(String name) throws JMSException;
-
-
-    /** Returns the <CODE>byte</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>byte</CODE>
-      *
-      * @return the <CODE>byte</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    byte 
-    getByte(String name) throws JMSException;
-
-
-    /** Returns the <CODE>short</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>short</CODE>
-      *
-      * @return the <CODE>short</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    short 
-    getShort(String name) throws JMSException;
-
-
-    /** Returns the Unicode character value with the specified name.
-      *
-      * @param name the name of the Unicode character
-      *
-      * @return the Unicode character value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.     
-      */ 
-
-    char 
-    getChar(String name) throws JMSException;
-
-
-    /** Returns the <CODE>int</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>int</CODE>
-      *
-      * @return the <CODE>int</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    int 
-    getInt(String name) throws JMSException;
-
-
-    /** Returns the <CODE>long</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>long</CODE>
-      *
-      * @return the <CODE>long</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    long 
-    getLong(String name) throws JMSException;
-
-
-    /** Returns the <CODE>float</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>float</CODE>
-      *
-      * @return the <CODE>float</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.     
-      */ 
-
-    float 
-    getFloat(String name) throws JMSException;
-
-
-    /** Returns the <CODE>double</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>double</CODE>
-      *
-      * @return the <CODE>double</CODE> value with the specified name
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    double 
-    getDouble(String name) throws JMSException;
-
-
-    /** Returns the <CODE>String</CODE> value with the specified name.
-      *
-      * @param name the name of the <CODE>String</CODE>
-      *
-      * @return the <CODE>String</CODE> value with the specified name; if there 
-      * is no item by this name, a null value is returned
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    String 
-    getString(String name) throws JMSException;
-
-
-    /** Returns the byte array value with the specified name.
-      *
-      * @param name the name of the byte array
-      *
-      * @return a copy of the byte array value with the specified name; if there
-      * is no
-      * item by this name, a null value is returned.
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.      
-      */ 
-
-    byte[] 
-    getBytes(String name) throws JMSException;
-
-
-    /** Returns the value of the object with the specified name.
-      *
-      * <P>This method can be used to return, in objectified format,
-      * an object in the Java programming language ("Java object") that had 
-      * been stored in the Map with the equivalent
-      * <CODE>setObject</CODE> method call, or its equivalent primitive
-      * <CODE>set<I>type</I></CODE> method.
-      *
-      * <P>Note that byte values are returned as <CODE>byte[]</CODE>, not 
-      * <CODE>Byte[]</CODE>.
-      *
-      * @param name the name of the Java object
-      *
-      * @return a copy of the Java object value with the specified name, in 
-      * objectified format (for example, if the object was set as an 
-      * <CODE>int</CODE>, an <CODE>Integer</CODE> is returned); if there is no 
-      * item by this name, a null value is returned
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      */ 
-
-    Object 
-    getObject(String name) throws JMSException;
-
-
-
-    /** Returns an <CODE>Enumeration</CODE> of all the names in the 
-      * <CODE>MapMessage</CODE> object.
-      *
-      * @return an enumeration of all the names in this <CODE>MapMessage</CODE>
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      */
-
-    Enumeration
-    getMapNames() throws JMSException;
-
-
-    /** Sets a <CODE>boolean</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>boolean</CODE>
-      * @param value the <CODE>boolean</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */
-
-    void 
-    setBoolean(String name, boolean value) throws JMSException;
-
-
-    /** Sets a <CODE>byte</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>byte</CODE>
-      * @param value the <CODE>byte</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
+ * The names are <CODE>String</CODE> objects, and the values are primitive
+ * data types in the Java programming language. The names must have a value that
+ * is not null, and not an empty string. The entries can be accessed
+ * sequentially or randomly by name. The order of the entries is undefined.
+ * <CODE>MapMessage</CODE> inherits from the <CODE>Message</CODE> interface
+ * and adds a message body that contains a Map.
+ *
+ * <P>The primitive types can be read or written explicitly using methods
+ * for each type. They may also be read or written generically as objects.
+ * For instance, a call to <CODE>MapMessage.setInt("foo", 6)</CODE> is
+ * equivalent to <CODE>MapMessage.setObject("foo", new Integer(6))</CODE>.
+ * Both forms are provided, because the explicit form is convenient for
+ * static programming, and the object form is needed when types are not known
+ * at compile time.
+ *
+ * <P>When a client receives a <CODE>MapMessage</CODE>, it is in read-only
+ * mode. If a client attempts to write to the message at this point, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown. If
+ * <CODE>clearBody</CODE> is called, the message can now be both read from and
+ * written to.
+ *
+ * <P><CODE>MapMessage</CODE> objects support the following conversion table.
+ * The marked cases must be supported. The unmarked cases must throw a
+ * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions
+ * may throw a runtime exception if the primitive's <CODE>valueOf()</CODE>
+ * method does not accept it as a valid <CODE>String</CODE> representation of
+ * the primitive.
+ *
+ * <P>A value written as the row type can be read as the column type.
+ *
+ * <PRE>
+ * |        | boolean byte short char int long float double String byte[]
+ * |----------------------------------------------------------------------
+ * |boolean |    X                                            X
+ * |byte    |          X     X         X   X                  X
+ * |short   |                X         X   X                  X
+ * |char    |                     X                           X
+ * |int     |                          X   X                  X
+ * |long    |                              X                  X
+ * |float   |                                    X     X      X
+ * |double  |                                          X      X
+ * |String  |    X     X     X         X   X     X     X      X
+ * |byte[]  |                                                        X
+ * |----------------------------------------------------------------------
+ * </PRE>
+ *
+ * <P>Attempting to read a null value as a primitive type must be treated
+ * as calling the primitive's corresponding <code>valueOf(String)</code>
+ * conversion method with a null value. Since <code>char</code> does not
+ * support a <code>String</code> conversion, attempting to read a null value
+ * as a <code>char</code> must throw a <code>NullPointerException</code>.
+ *
+ * @version     1.1 February 2, 002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.Session#createMapMessage()
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.StreamMessage
+ * @see         javax.jms.TextMessage
+ */
+
+public interface MapMessage extends Message
+{
+
+  /** Returns the <CODE>boolean</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>boolean</CODE>
+    *
+    * @return the <CODE>boolean</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  boolean getBoolean(String name) throws JMSException;
+
+  /** Returns the <CODE>byte</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>byte</CODE>
+    *
+    * @return the <CODE>byte</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  byte getByte(String name) throws JMSException;
+
+  /** Returns the <CODE>short</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>short</CODE>
+    *
+    * @return the <CODE>short</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  short getShort(String name) throws JMSException;
+
+  /** Returns the Unicode character value with the specified name.
+    *
+    * @param name the name of the Unicode character
+    *
+    * @return the Unicode character value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.     
+    */
+
+  char getChar(String name) throws JMSException;
+
+  /** Returns the <CODE>int</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>int</CODE>
+    *
+    * @return the <CODE>int</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  int getInt(String name) throws JMSException;
+
+  /** Returns the <CODE>long</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>long</CODE>
+    *
+    * @return the <CODE>long</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  long getLong(String name) throws JMSException;
+
+  /** Returns the <CODE>float</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>float</CODE>
+    *
+    * @return the <CODE>float</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.     
+    */
+
+  float getFloat(String name) throws JMSException;
+
+  /** Returns the <CODE>double</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>double</CODE>
+    *
+    * @return the <CODE>double</CODE> value with the specified name
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  double getDouble(String name) throws JMSException;
+
+  /** Returns the <CODE>String</CODE> value with the specified name.
+    *
+    * @param name the name of the <CODE>String</CODE>
+    *
+    * @return the <CODE>String</CODE> value with the specified name; if there 
+    * is no item by this name, a null value is returned
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  String getString(String name) throws JMSException;
+
+  /** Returns the byte array value with the specified name.
+    *
+    * @param name the name of the byte array
+    *
+    * @return a copy of the byte array value with the specified name; if there
+    * is no
+    * item by this name, a null value is returned.
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.      
+    */
+
+  byte[] getBytes(String name) throws JMSException;
+
+  /** Returns the value of the object with the specified name.
+    *
+    * <P>This method can be used to return, in objectified format,
+    * an object in the Java programming language ("Java object") that had 
+    * been stored in the Map with the equivalent
+    * <CODE>setObject</CODE> method call, or its equivalent primitive
+    * <CODE>set<I>type</I></CODE> method.
+    *
+    * <P>Note that byte values are returned as <CODE>byte[]</CODE>, not 
+    * <CODE>Byte[]</CODE>.
+    *
+    * @param name the name of the Java object
+    *
+    * @return a copy of the Java object value with the specified name, in 
+    * objectified format (for example, if the object was set as an 
+    * <CODE>int</CODE>, an <CODE>Integer</CODE> is returned); if there is no 
+    * item by this name, a null value is returned
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    */
+
+  Object getObject(String name) throws JMSException;
+
+  /** Returns an <CODE>Enumeration</CODE> of all the names in the 
+    * <CODE>MapMessage</CODE> object.
+    *
+    * @return an enumeration of all the names in this <CODE>MapMessage</CODE>
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    */
+
+  Enumeration getMapNames() throws JMSException;
+
+  /** Sets a <CODE>boolean</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>boolean</CODE>
+    * @param value the <CODE>boolean</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setBoolean(String name, boolean value) throws JMSException;
+
+  /** Sets a <CODE>byte</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>byte</CODE>
+    * @param value the <CODE>byte</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+   * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setByte(String name, byte value) throws JMSException;
+
+  /** Sets a <CODE>short</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>short</CODE>
+    * @param value the <CODE>short</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+     * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setShort(String name, short value) throws JMSException;
+
+  /** Sets a Unicode character value with the specified name into the Map.
+    *
+    * @param name the name of the Unicode character
+    * @param value the Unicode character value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+     * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setChar(String name, char value) throws JMSException;
+
+  /** Sets an <CODE>int</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>int</CODE>
+    * @param value the <CODE>int</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setInt(String name, int value) throws JMSException;
+
+  /** Sets a <CODE>long</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>long</CODE>
+    * @param value the <CODE>long</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setLong(String name, long value) throws JMSException;
+
+  /** Sets a <CODE>float</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>float</CODE>
+    * @param value the <CODE>float</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+     * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setFloat(String name, float value) throws JMSException;
+
+  /** Sets a <CODE>double</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>double</CODE>
+    * @param value the <CODE>double</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setDouble(String name, double value) throws JMSException;
+
+  /** Sets a <CODE>String</CODE> value with the specified name into the Map.
+    *
+    * @param name the name of the <CODE>String</CODE>
+    * @param value the <CODE>String</CODE> value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setString(String name, String value) throws JMSException;
+
+  /** Sets a byte array value with the specified name into the Map.
+    *
+    * @param name the name of the byte array
+    * @param value the byte array value to set in the Map; the array
+    *              is copied so that the value for <CODE>name</CODE> will
+    *              not be altered by future modifications
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception NullPointerException if the name is null, or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setBytes(String name, byte[] value) throws JMSException;
+
+  /** Sets a portion of the byte array value with the specified name into the 
+    * Map.
+    *  
+    * @param name the name of the byte array
+    * @param value the byte array value to set in the Map
+    * @param offset the initial offset within the byte array
+    * @param length the number of bytes to use
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setByte(String name, byte value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>short</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>short</CODE>
-      * @param value the <CODE>short</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-       * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setShort(String name, short value) 
-			throws JMSException;
-
-
-    /** Sets a Unicode character value with the specified name into the Map.
-      *
-      * @param name the name of the Unicode character
-      * @param value the Unicode character value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-       * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setChar(String name, char value) 
-			throws JMSException;
-
-
-    /** Sets an <CODE>int</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>int</CODE>
-      * @param value the <CODE>int</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setInt(String name, int value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>long</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>long</CODE>
-      * @param value the <CODE>long</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setLong(String name, long value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>float</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>float</CODE>
-      * @param value the <CODE>float</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-       * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setFloat(String name, float value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>double</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>double</CODE>
-      * @param value the <CODE>double</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setDouble(String name, double value) 
-			throws JMSException;
-
-
-    /** Sets a <CODE>String</CODE> value with the specified name into the Map.
-      *
-      * @param name the name of the <CODE>String</CODE>
-      * @param value the <CODE>String</CODE> value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setString(String name, String value) 
-			throws JMSException;
-
-
-    /** Sets a byte array value with the specified name into the Map.
-      *
-      * @param name the name of the byte array
-      * @param value the byte array value to set in the Map; the array
-      *              is copied so that the value for <CODE>name</CODE> will
-      *              not be altered by future modifications
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception NullPointerException if the name is null, or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void
-    setBytes(String name, byte[] value) 
-			throws JMSException;
-
-
-    /** Sets a portion of the byte array value with the specified name into the 
-      * Map.
-      *  
-      * @param name the name of the byte array
-      * @param value the byte array value to set in the Map
-      * @param offset the initial offset within the byte array
-      * @param length the number of bytes to use
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-       * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
- 
-    void
-    setBytes(String name, byte[] value, 
-		 int offset, int length) 
-			throws JMSException;
-
-
-    /** Sets an object value with the specified name into the Map.
-      *
-      * <P>This method works only for the objectified primitive
-      * object types (<code>Integer</code>, <code>Double</code>, 
-      * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
-      * arrays.
-      *
-      * @param name the name of the Java object
-      * @param value the Java object value to set in the Map
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageFormatException if the object is invalid.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    setObject(String name, Object value) 
-			throws JMSException;
-
-
-    /** Indicates whether an item exists in this <CODE>MapMessage</CODE> object.
-      *
-      * @param name the name of the item to test
-      *
-      * @return true if the item exists
-      *
-      * @exception JMSException if the JMS provider fails to determine if the 
-      *                         item exists due to some internal error.
-      */ 
- 
-    boolean
-    itemExists(String name) throws JMSException;
+    *                          an empty string.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setBytes(String name, byte[] value, int offset, int length) throws JMSException;
+
+  /** Sets an object value with the specified name into the Map.
+    *
+    * <P>This method works only for the objectified primitive
+    * object types (<code>Integer</code>, <code>Double</code>, 
+    * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
+    * arrays.
+    *
+    * @param name the name of the Java object
+    * @param value the Java object value to set in the Map
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageFormatException if the object is invalid.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void setObject(String name, Object value) throws JMSException;
+
+  /** Indicates whether an item exists in this <CODE>MapMessage</CODE> object.
+    *
+    * @param name the name of the item to test
+    *
+    * @return true if the item exists
+    *
+    * @exception JMSException if the JMS provider fails to determine if the 
+    *                         item exists due to some internal error.
+    */
+
+  boolean itemExists(String name) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Message.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Message.java
index e3148ee859..06f496571d 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Message.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Message.java
@@ -1,1511 +1,1411 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.util.Enumeration;
-import java.util.Properties;
-
-/** The <CODE>Message</CODE> interface is the root interface of all JMS 
-  * messages. It defines the message header and the <CODE>acknowledge</CODE> 
-  * method used for all messages.
-  *
-  * <P>Most message-oriented middleware (MOM) products treat messages as 
-  * lightweight entities that consist
-  * of a header and a payload. The header contains fields used for message
-  * routing and identification; the payload contains the application data
-  * being sent.
-  *
-  * <P>Within this general form, the definition of a message varies
-  * significantly across products. It would be quite difficult for the JMS API
-  * to support all of these message models.
-  *
-  * <P>With this in mind, the JMS message model has the following goals:
-  * <UL>
-  *   <LI>Provide a single, unified message API
-  *   <LI>Provide an API suitable for creating messages that match the
-  *       format used by provider-native messaging applications
-  *   <LI>Support the development of heterogeneous applications that span
-  *       operating systems, machine architectures, and computer languages
-  *   <LI>Support messages containing objects in the Java programming language
-  *       ("Java objects")
-  *   <LI>Support messages containing Extensible Markup Language (XML) pages
-  * </UL>
-  *
-  * <P>JMS messages are composed of the following parts:
-  * <UL>
-  *   <LI>Header - All messages support the same set of header fields. 
-  *       Header fields contain values used by both clients and providers to 
-  *       identify and route messages.
-  *   <LI>Properties - Each message contains a built-in facility for supporting
-  *       application-defined property values. Properties provide an efficient 
-  *       mechanism for supporting application-defined message filtering.
-  *   <LI>Body - The JMS API defines several types of message body, which cover
-  *       the majority of messaging styles currently in use.
-  * </UL>
-  *
-  * <H4>Message Bodies</H4>
-  *
-  * <P>The JMS API defines five types of message body:
-  * <UL>
-  *   <LI>Stream - A <CODE>StreamMessage</CODE> object's message body contains 
-  *       a stream of primitive values in the Java programming 
-  *       language ("Java primitives"). It is filled and read sequentially.
-  *   <LI>Map - A <CODE>MapMessage</CODE> object's message body contains a set 
-  *       of name-value pairs, where names are <CODE>String</CODE> 
-  *       objects, and values are Java primitives. The entries can be accessed 
-  *       sequentially or randomly by name. The order of the entries is 
-  *       undefined.
-  *   <LI>Text - A <CODE>TextMessage</CODE> object's message body contains a 
-  *       <CODE>java.lang.String</CODE> object. This message type can be used
-  *       to transport plain-text messages, and XML messages.
-  *   <LI>Object - An <CODE>ObjectMessage</CODE> object's message body contains 
-  *       a <CODE>Serializable</CODE> Java object.
-  *   <LI>Bytes - A <CODE>BytesMessage</CODE> object's message body contains a 
-  *       stream of uninterpreted bytes. This message type is for 
-  *       literally encoding a body to match an existing message format. In 
-  *       many cases, it is possible to use one of the other body types, 
-  *       which are easier to use. Although the JMS API allows the use of  
-  *       message properties with byte messages, they are typically not used,
-  *       since the inclusion of properties may affect the format.
-  * </UL>
-  *
-  * <H4>Message Headers</H4>
-  *
-  * <P>The <CODE>JMSCorrelationID</CODE> header field is used for linking one 
-  * message with
-  * another. It typically links a reply message with its requesting message.
-  *
-  * <P><CODE>JMSCorrelationID</CODE> can hold a provider-specific message ID,
-  * an application-specific <CODE>String</CODE> object, or a provider-native 
-  * <CODE>byte[]</CODE> value.
-  *
-  * <H4>Message Properties</H4>
-  *
-  * <P>A <CODE>Message</CODE> object contains a built-in facility for supporting
-  * application-defined property values. In effect, this provides a mechanism 
-  * for adding application-specific header fields to a message.
-  *
-  * <P>Properties allow an application, via message selectors, to have a JMS 
-  * provider select, or filter, messages on its behalf using 
-  * application-specific criteria.
-  *
-  * <P>Property names must obey the rules for a message selector identifier. 
-  * Property names must not be null, and must not be empty strings. If a property
-  * name is set and it is either null or an empty string, an 
-  * <CODE>IllegalArgumentException</CODE> must be thrown.
-  *
-  * <P>Property values can be <CODE>boolean</CODE>, <CODE>byte</CODE>, 
-  * <CODE>short</CODE>, <CODE>int</CODE>, <CODE>long</CODE>, <CODE>float</CODE>,
-  * <CODE>double</CODE>, and <CODE>String</CODE>.
-  *
-  * <P>Property values are set prior to sending a message. When a client 
-  * receives a message, its properties are in read-only mode. If a 
-  * client attempts to set properties at this point, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown. If 
-  * <CODE>clearProperties</CODE> is called, the properties can now be both
-  * read from and written to. Note that header fields are distinct from 
-  * properties. Header fields are never in read-only mode. 
-  *
-  * <P>A property value may duplicate a value in a message's body, or it may 
-  * not. Although JMS does not define a policy for what should or should not 
-  * be made a property, application developers should note that JMS providers 
-  * will likely handle data in a message's body more efficiently than data in 
-  * a message's properties. For best performance, applications should use
-  * message properties only when they need to customize a message's header. 
-  * The primary reason for doing this is to support customized message 
-  * selection.
-  *
-  * <P>Message properties support the following conversion table. The marked 
-  * cases must be supported. The unmarked cases must throw a 
-  * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions 
-  * may throw a runtime exception if the
-  * primitive's <CODE>valueOf</CODE> method does not accept the 
-  * <CODE>String</CODE> as a valid representation of the primitive.
-  *
-  * <P>A value written as the row type can be read as the column type.
-  *
-  * <PRE>
-  * |        | boolean byte short int long float double String 
-  * |----------------------------------------------------------
-  * |boolean |    X                                       X
-  * |byte    |          X     X    X   X                  X 
-  * |short   |                X    X   X                  X 
-  * |int     |                     X   X                  X 
-  * |long    |                         X                  X 
-  * |float   |                               X     X      X 
-  * |double  |                                     X      X 
-  * |String  |    X     X     X    X   X     X     X      X 
-  * |----------------------------------------------------------
-  * </PRE>
-  *
-  * <P>In addition to the type-specific set/get methods for properties, JMS 
-  * provides the <CODE>setObjectProperty</CODE> and 
-  * <CODE>getObjectProperty</CODE> methods. These support the same set of 
-  * property types using the objectified primitive values. Their purpose is 
-  * to allow the decision of property type to made at execution time rather 
-  * than at compile time. They support the same property value conversions.
-  *
-  * <P>The <CODE>setObjectProperty</CODE> method accepts values of class 
-  * <CODE>Boolean</CODE>, <CODE>Byte</CODE>, <CODE>Short</CODE>, 
-  * <CODE>Integer</CODE>, <CODE>Long</CODE>, <CODE>Float</CODE>, 
-  * <CODE>Double</CODE>, and <CODE>String</CODE>. An attempt 
-  * to use any other class must throw a <CODE>JMSException</CODE>.
-  *
-  * <P>The <CODE>getObjectProperty</CODE> method only returns values of class 
-  * <CODE>Boolean</CODE>, <CODE>Byte</CODE>, <CODE>Short</CODE>, 
-  * <CODE>Integer</CODE>, <CODE>Long</CODE>, <CODE>Float</CODE>, 
-  * <CODE>Double</CODE>, and <CODE>String</CODE>.
-  *
-  * <P>The order of property values is not defined. To iterate through a 
-  * message's property values, use <CODE>getPropertyNames</CODE> to retrieve 
-  * a property name enumeration and then use the various property get methods 
-  * to retrieve their values.
-  *
-  * <P>A message's properties are deleted by the <CODE>clearProperties</CODE>
-  * method. This leaves the message with an empty set of properties.
-  *
-  * <P>Getting a property value for a name which has not been set returns a 
-  * null value. Only the <CODE>getStringProperty</CODE> and 
-  * <CODE>getObjectProperty</CODE> methods can return a null value. 
-  * Attempting to read a null value as a primitive type must be treated as 
-  * calling the primitive's corresponding <CODE>valueOf(String)</CODE> 
-  * conversion method with a null value.
-  *
-  * <P>The JMS API reserves the <CODE>JMSX</CODE> property name prefix for JMS 
-  * defined properties.
-  * The full set of these properties is defined in the Java Message Service
-  * specification. New JMS defined properties may be added in later versions 
-  * of the JMS API.  Support for these properties is optional. The 
-  * <CODE>String[] ConnectionMetaData.getJMSXPropertyNames</CODE> method 
-  * returns the names of the JMSX properties supported by a connection.
-  *
-  * <P>JMSX properties may be referenced in message selectors whether or not
-  * they are supported by a connection. If they are not present in a
-  * message, they are treated like any other absent property.
-  *
-  * <P>JMSX properties defined in the specification as "set by provider on 
-  * send" are available to both the producer and the consumers of the message. 
-  * JMSX properties defined in the specification as "set by provider on 
-  * receive" are available only to the consumers.
-  *
-  * <P><CODE>JMSXGroupID</CODE> and <CODE>JMSXGroupSeq</CODE> are standard 
-  * properties that clients 
-  * should use if they want to group messages. All providers must support them.
-  * Unless specifically noted, the values and semantics of the JMSX properties 
-  * are undefined.
-  *
-  * <P>The JMS API reserves the <CODE>JMS_<I>vendor_name</I></CODE> property 
-  * name prefix for provider-specific properties. Each provider defines its own 
-  * value for <CODE><I>vendor_name</I></CODE>. This is the mechanism a JMS 
-  * provider uses to make its special per-message services available to a JMS 
-  * client.
-  *
-  * <P>The purpose of provider-specific properties is to provide special 
-  * features needed to integrate JMS clients with provider-native clients in a 
-  * single JMS application. They should not be used for messaging between JMS 
-  * clients.
-  *
-  * <H4>Provider Implementations of JMS Message Interfaces</H4>
-  *
-  * <P>The JMS API provides a set of message interfaces that define the JMS 
-  * message 
-  * model. It does not provide implementations of these interfaces.
-  *
-  * <P>Each JMS provider supplies a set of message factories with its 
-  * <CODE>Session</CODE> object for creating instances of messages. This allows 
-  * a provider to use message implementations tailored to its specific needs.
-  *
-  * <P>A provider must be prepared to accept message implementations that are 
-  * not its own. They may not be handled as efficiently as its own 
-  * implementation; however, they must be handled.
-  *
-  * <P>Note the following exception case when a provider is handling a foreign 
-  * message implementation. If the foreign message implementation contains a 
-  * <CODE>JMSReplyTo</CODE> header field that is set to a foreign destination 
-  * implementation, the provider is not required to handle or preserve the 
-  * value of this header field. 
-  *
-  * <H4>Message Selectors</H4>
-  *
-  * <P>A JMS message selector allows a client to specify, by
-  * header field references and property references, the
-  * messages it is interested in. Only messages whose header 
-  * and property values
-  * match the 
-  * selector are delivered. What it means for a message not to be delivered
-  * depends on the <CODE>MessageConsumer</CODE> being used (see 
-  * {@link javax.jms.QueueReceiver QueueReceiver} and 
-  * {@link javax.jms.TopicSubscriber TopicSubscriber}).
-  *
-  * <P>Message selectors cannot reference message body values.
-  *
-  * <P>A message selector matches a message if the selector evaluates to 
-  * true when the message's header field values and property values are 
-  * substituted for their corresponding identifiers in the selector.
-  *
-  * <P>A message selector is a <CODE>String</CODE> whose syntax is based on a 
-  * subset of 
-  * the SQL92 conditional expression syntax. If the value of a message selector 
-  * is an empty string, the value is treated as a null and indicates that there 
-  * is no message selector for the message consumer. 
-  *
-  * <P>The order of evaluation of a message selector is from left to right 
-  * within precedence level. Parentheses can be used to change this order.
-  *
-  * <P>Predefined selector literals and operator names are shown here in 
-  * uppercase; however, they are case insensitive.
-  *
-  * <P>A selector can contain:
-  *
-  * <UL>
-  *   <LI>Literals:
-  *   <UL>
-  *     <LI>A string literal is enclosed in single quotes, with a single quote 
-  *         represented by doubled single quote; for example, 
-  *         <CODE>'literal'</CODE> and <CODE>'literal''s'</CODE>. Like 
-  *         string literals in the Java programming language, these use the 
-  *         Unicode character encoding.
-  *     <LI>An exact numeric literal is a numeric value without a decimal 
-  *         point, such as <CODE>57</CODE>, <CODE>-957</CODE>, and  
-  *         <CODE>+62</CODE>; numbers in the range of <CODE>long</CODE> are 
-  *         supported. Exact numeric literals use the integer literal 
-  *         syntax of the Java programming language.
-  *     <LI>An approximate numeric literal is a numeric value in scientific 
-  *         notation, such as <CODE>7E3</CODE> and <CODE>-57.9E2</CODE>, or a 
-  *         numeric value with a decimal, such as <CODE>7.</CODE>, 
-  *         <CODE>-95.7</CODE>, and <CODE>+6.2</CODE>; numbers in the range of 
-  *         <CODE>double</CODE> are supported. Approximate literals use the 
-  *         floating-point literal syntax of the Java programming language.
-  *     <LI>The boolean literals <CODE>TRUE</CODE> and <CODE>FALSE</CODE>.
-  *   </UL>
-  *   <LI>Identifiers:
-  *   <UL>
-  *     <LI>An identifier is an unlimited-length sequence of letters 
-  *         and digits, the first of which must be a letter. A letter is any 
-  *         character for which the method <CODE>Character.isJavaLetter</CODE>
-  *         returns true. This includes <CODE>'_'</CODE> and <CODE>'$'</CODE>.
-  *         A letter or digit is any character for which the method 
-  *         <CODE>Character.isJavaLetterOrDigit</CODE> returns true.
-  *     <LI>Identifiers cannot be the names <CODE>NULL</CODE>, 
-  *         <CODE>TRUE</CODE>, and <CODE>FALSE</CODE>.
-  *     <LI>Identifiers cannot be <CODE>NOT</CODE>, <CODE>AND</CODE>, 
-  *         <CODE>OR</CODE>, <CODE>BETWEEN</CODE>, <CODE>LIKE</CODE>, 
-  *         <CODE>IN</CODE>, <CODE>IS</CODE>, or <CODE>ESCAPE</CODE>.
-  *     <LI>Identifiers are either header field references or property 
-  *         references.  The type of a property value in a message selector 
-  *         corresponds to the type used to set the property. If a property 
-  *         that does not exist in a message is referenced, its value is 
-  *         <CODE>NULL</CODE>.
-  *     <LI>The conversions that apply to the get methods for properties do not
-  *         apply when a property is used in a message selector expression.
-  *         For example, suppose you set a property as a string value, as in the
-  *         following:
-  *         <PRE>myMessage.setStringProperty("NumberOfOrders", "2");</PRE>
-  *         The following expression in a message selector would evaluate to 
-  *         false, because a string cannot be used in an arithmetic expression:
-  *         <PRE>"NumberOfOrders > 1"</PRE>
-  *     <LI>Identifiers are case-sensitive.
-  *     <LI>Message header field references are restricted to 
-  *         <CODE>JMSDeliveryMode</CODE>, <CODE>JMSPriority</CODE>, 
-  *         <CODE>JMSMessageID</CODE>, <CODE>JMSTimestamp</CODE>, 
-  *         <CODE>JMSCorrelationID</CODE>, and <CODE>JMSType</CODE>. 
-  *         <CODE>JMSMessageID</CODE>, <CODE>JMSCorrelationID</CODE>, and 
-  *         <CODE>JMSType</CODE> values may be null and if so are treated as a 
-  *         <CODE>NULL</CODE> value.
-  *     <LI>Any name beginning with <CODE>'JMSX'</CODE> is a JMS defined  
-  *         property name.
-  *     <LI>Any name beginning with <CODE>'JMS_'</CODE> is a provider-specific 
-  *         property name.
-  *     <LI>Any name that does not begin with <CODE>'JMS'</CODE> is an 
-  *         application-specific property name.
-  *   </UL>
-  *   <LI>White space is the same as that defined for the Java programming
-  *       language: space, horizontal tab, form feed, and line terminator.
-  *   <LI>Expressions: 
-  *   <UL>
-  *     <LI>A selector is a conditional expression; a selector that evaluates 
-  *         to <CODE>true</CODE> matches; a selector that evaluates to 
-  *         <CODE>false</CODE> or unknown does not match.
-  *     <LI>Arithmetic expressions are composed of themselves, arithmetic 
-  *         operations, identifiers (whose value is treated as a numeric 
-  *         literal), and numeric literals.
-  *     <LI>Conditional expressions are composed of themselves, comparison 
-  *         operations, and logical operations.
-  *   </UL>
-  *   <LI>Standard bracketing <CODE>()</CODE> for ordering expression evaluation
-  *      is supported.
-  *   <LI>Logical operators in precedence order: <CODE>NOT</CODE>, 
-  *       <CODE>AND</CODE>, <CODE>OR</CODE>
-  *   <LI>Comparison operators: <CODE>=</CODE>, <CODE>></CODE>, <CODE>>=</CODE>,
-  *       <CODE><</CODE>, <CODE><=</CODE>, <CODE><></CODE> (not equal)
-  *   <UL>
-  *     <LI>Only like type values can be compared. One exception is that it 
-  *         is valid to compare exact numeric values and approximate numeric 
-  *         values; the type conversion required is defined by the rules of 
-  *         numeric promotion in the Java programming language. If the 
-  *         comparison of non-like type values is attempted, the value of the 
-  *         operation is false. If either of the type values evaluates to 
-  *         <CODE>NULL</CODE>, the value of the expression is unknown.   
-  *     <LI>String and boolean comparison is restricted to <CODE>=</CODE> and 
-  *         <CODE><></CODE>. Two strings are equal 
-  *         if and only if they contain the same sequence of characters.
-  *   </UL>
-  *   <LI>Arithmetic operators in precedence order:
-  *   <UL>
-  *     <LI><CODE>+</CODE>, <CODE>-</CODE> (unary)
-  *     <LI><CODE>*</CODE>, <CODE>/</CODE> (multiplication and division)
-  *     <LI><CODE>+</CODE>, <CODE>-</CODE> (addition and subtraction)
-  *     <LI>Arithmetic operations must use numeric promotion in the Java 
-  *         programming language.
-  *   </UL>
-  *   <LI><CODE><I>arithmetic-expr1</I> [NOT] BETWEEN <I>arithmetic-expr2</I> 
-  *       AND <I>arithmetic-expr3</I></CODE> (comparison operator)
-  *   <UL>
-  *     <LI><CODE>"age&nbsp;BETWEEN&nbsp;15&nbsp;AND&nbsp;19"</CODE> is 
-  *         equivalent to 
-  *         <CODE>"age&nbsp;>=&nbsp;15&nbsp;AND&nbsp;age&nbsp;<=&nbsp;19"</CODE>
-  *     <LI><CODE>"age&nbsp;NOT&nbsp;BETWEEN&nbsp;15&nbsp;AND&nbsp;19"</CODE> 
-  *         is equivalent to 
-  *         <CODE>"age&nbsp;<&nbsp;15&nbsp;OR&nbsp;age&nbsp;>&nbsp;19"</CODE>
-  *   </UL>
-  *   <LI><CODE><I>identifier</I> [NOT] IN (<I>string-literal1</I>, 
-  *       <I>string-literal2</I>,...)</CODE> (comparison operator where 
-  *       <CODE><I>identifier</I></CODE> has a <CODE>String</CODE> or 
-  *       <CODE>NULL</CODE> value)
-  *   <UL>
-  *     <LI><CODE>"Country&nbsp;IN&nbsp;('&nbsp;UK',&nbsp;'US',&nbsp;'France')"</CODE>
-  *         is true for 
-  *         <CODE>'UK'</CODE> and false for <CODE>'Peru'</CODE>; it is 
-  *         equivalent to the expression 
-  *         <CODE>"(Country&nbsp;=&nbsp;'&nbsp;UK')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;US')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;France')"</CODE>
-  *     <LI><CODE>"Country&nbsp;NOT&nbsp;IN&nbsp;('&nbsp;UK',&nbsp;'US',&nbsp;'France')"</CODE> 
-  *         is false for <CODE>'UK'</CODE> and true for <CODE>'Peru'</CODE>; it 
-  *         is equivalent to the expression 
-  *         <CODE>"NOT&nbsp;((Country&nbsp;=&nbsp;'&nbsp;UK')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;US')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;France'))"</CODE>
-  *     <LI>If identifier of an <CODE>IN</CODE> or <CODE>NOT IN</CODE> 
-  *         operation is <CODE>NULL</CODE>, the value of the operation is 
-  *         unknown.
-  *   </UL>
-  *   <LI><CODE><I>identifier</I> [NOT] LIKE <I>pattern-value</I> [ESCAPE 
-  *       <I>escape-character</I>]</CODE> (comparison operator, where 
-  *       <CODE><I>identifier</I></CODE> has a <CODE>String</CODE> value; 
-  *       <CODE><I>pattern-value</I></CODE> is a string literal where 
-  *       <CODE>'_'</CODE> stands for any single character; <CODE>'%'</CODE> 
-  *       stands for any sequence of characters, including the empty sequence; 
-  *       and all other characters stand for themselves. The optional 
-  *       <CODE><I>escape-character</I></CODE> is a single-character string 
-  *       literal whose character is used to escape the special meaning of the 
-  *       <CODE>'_'</CODE> and <CODE>'%'</CODE> in 
-  *       <CODE><I>pattern-value</I></CODE>.)
-  *   <UL>
-  *     <LI><CODE>"phone&nbsp;LIKE&nbsp;'12%3'"</CODE> is true for 
-  *         <CODE>'123'</CODE> or <CODE>'12993'</CODE> and false for 
-  *         <CODE>'1234'</CODE>
-  *     <LI><CODE>"word&nbsp;LIKE&nbsp;'l_se'"</CODE> is true for 
-  *         <CODE>'lose'</CODE> and false for <CODE>'loose'</CODE>
-  *     <LI><CODE>"underscored&nbsp;LIKE&nbsp;'\_%'&nbsp;ESCAPE&nbsp;'\'"</CODE>
-  *          is true for <CODE>'_foo'</CODE> and false for <CODE>'bar'</CODE>
-  *     <LI><CODE>"phone&nbsp;NOT&nbsp;LIKE&nbsp;'12%3'"</CODE> is false for 
-  *         <CODE>'123'</CODE> or <CODE>'12993'</CODE> and true for 
-  *         <CODE>'1234'</CODE>
-  *     <LI>If <CODE><I>identifier</I></CODE> of a <CODE>LIKE</CODE> or 
-  *         <CODE>NOT LIKE</CODE> operation is <CODE>NULL</CODE>, the value 
-  *         of the operation is unknown.
-  *   </UL>
-  *   <LI><CODE><I>identifier</I> IS NULL</CODE> (comparison operator that tests
-  *       for a null header field value or a missing property value)
-  *   <UL>
-  *     <LI><CODE>"prop_name&nbsp;IS&nbsp;NULL"</CODE>
-  *   </UL>
-  *   <LI><CODE><I>identifier</I> IS NOT NULL</CODE> (comparison operator that
-  *       tests for the existence of a non-null header field value or a property
-  *       value)
-  *   <UL>
-  *     <LI><CODE>"prop_name&nbsp;IS&nbsp;NOT&nbsp;NULL"</CODE>
-  *   </UL>
-  *
-  * <P>JMS providers are required to verify the syntactic correctness of a 
-  *    message selector at the time it is presented. A method that provides a 
-  *  syntactically incorrect selector must result in a <CODE>JMSException</CODE>.
-  * JMS providers may also optionally provide some semantic checking at the time
-  * the selector is presented. Not all semantic checking can be performed at
-  * the time a message selector is presented, because property types are not known.
-  * 
-  * <P>The following message selector selects messages with a message type 
-  * of car and color of blue and weight greater than 2500 pounds:
-  *
-  * <PRE>"JMSType&nbsp;=&nbsp;'car'&nbsp;AND&nbsp;color&nbsp;=&nbsp;'blue'&nbsp;AND&nbsp;weight&nbsp;>&nbsp;2500"</PRE>
-  *
-  * <H4>Null Values</H4>
-  *
-  * <P>As noted above, property values may be <CODE>NULL</CODE>. The evaluation 
-  * of selector expressions containing <CODE>NULL</CODE> values is defined by 
-  * SQL92 <CODE>NULL</CODE> semantics. A brief description of these semantics 
-  * is provided here.
-  *
-  * <P>SQL treats a <CODE>NULL</CODE> value as unknown. Comparison or arithmetic
-  * with an unknown value always yields an unknown value.
-  *
-  * <P>The <CODE>IS NULL</CODE> and <CODE>IS NOT NULL</CODE> operators convert 
-  * an unknown value into the respective <CODE>TRUE</CODE> and 
-  * <CODE>FALSE</CODE> values.
-  *
-  * <P>The boolean operators use three-valued logic as defined by the 
-  * following tables:
-  *
-  * <P><B>The definition of the <CODE>AND</CODE> operator</B>
-  *
-  * <PRE>
-  * | AND  |   T   |   F   |   U
-  * +------+-------+-------+-------
-  * |  T   |   T   |   F   |   U
-  * |  F   |   F   |   F   |   F
-  * |  U   |   U   |   F   |   U
-  * +------+-------+-------+-------
-  * </PRE>
-  *
-  * <P><B>The definition of the <CODE>OR</CODE> operator</B>
-  *
-  * <PRE>
-  * | OR   |   T   |   F   |   U
-  * +------+-------+-------+--------
-  * |  T   |   T   |   T   |   T
-  * |  F   |   T   |   F   |   U
-  * |  U   |   T   |   U   |   U
-  * +------+-------+-------+------- 
-  * </PRE> 
-  *
-  * <P><B>The definition of the <CODE>NOT</CODE> operator</B>
-  *
-  * <PRE>
-  * | NOT
-  * +------+------
-  * |  T   |   F
-  * |  F   |   T
-  * |  U   |   U
-  * +------+-------
-  * </PRE>
-  *
-  * <H4>Special Notes</H4>
-  *
-  * <P>When used in a message selector, the <CODE>JMSDeliveryMode</CODE> header 
-  *    field is treated as having the values <CODE>'PERSISTENT'</CODE> and 
-  *    <CODE>'NON_PERSISTENT'</CODE>.
-  *
-  * <P>Date and time values should use the standard <CODE>long</CODE> 
-  *    millisecond value. When a date or time literal is included in a message 
-  *    selector, it should be an integer literal for a millisecond value. The 
-  *    standard way to produce millisecond values is to use 
-  *    <CODE>java.util.Calendar</CODE>.
-  *
-  * <P>Although SQL supports fixed decimal comparison and arithmetic, JMS 
-  *    message selectors do not. This is the reason for restricting exact 
-  *    numeric literals to those without a decimal (and the addition of 
-  *    numerics with a decimal as an alternate representation for 
-  *    approximate numeric values).
-  *
-  * <P>SQL comments are not supported.
-  *
-  * @version     1.1 April 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.MessageConsumer#receive()
-  * @see         javax.jms.MessageConsumer#receive(long)
-  * @see         javax.jms.MessageConsumer#receiveNoWait()
-  * @see         javax.jms.MessageListener#onMessage(Message)
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.StreamMessage
-  * @see         javax.jms.TextMessage
-  */
-
-public interface Message {
-
-    /** The message producer's default delivery mode is <CODE>PERSISTENT</CODE>.
-     *
-     *  @see DeliveryMode#PERSISTENT
-     */
-    static final int DEFAULT_DELIVERY_MODE = DeliveryMode.PERSISTENT;
-
-    /** The message producer's default priority is 4. 
-     */
-    static final int DEFAULT_PRIORITY = 4;
-
-    /** The message producer's default time to live is unlimited; the message 
-     *  never expires. 
-     */
-    static final long DEFAULT_TIME_TO_LIVE = 0;
-
-
-    /** Gets the message ID.
-      *
-      * <P>The <CODE>JMSMessageID</CODE> header field contains a value that 
-      * uniquely identifies each message sent by a provider.
-      *  
-      * <P>When a message is sent, <CODE>JMSMessageID</CODE> can be ignored. 
-      * When the <CODE>send</CODE> or <CODE>publish</CODE> method returns, it 
-      * contains a provider-assigned value.
-      *
-      * <P>A <CODE>JMSMessageID</CODE> is a <CODE>String</CODE> value that 
-      * should function as a 
-      * unique key for identifying messages in a historical repository. 
-      * The exact scope of uniqueness is provider-defined. It should at 
-      * least cover all messages for a specific installation of a 
-      * provider, where an installation is some connected set of message 
-      * routers.
-      *
-      * <P>All <CODE>JMSMessageID</CODE> values must start with the prefix 
-      * <CODE>'ID:'</CODE>. 
-      * Uniqueness of message ID values across different providers is 
-      * not required.
-      *
-      * <P>Since message IDs take some effort to create and increase a
-      * message's size, some JMS providers may be able to optimize message
-      * overhead if they are given a hint that the message ID is not used by
-      * an application. By calling the 
-      * <CODE>MessageProducer.setDisableMessageID</CODE> method, a JMS client 
-      * enables this potential optimization for all messages sent by that 
-      * message producer. If the JMS provider accepts this
-      * hint, these messages must have the message ID set to null; if the 
-      * provider ignores the hint, the message ID must be set to its normal 
-      * unique value.
-      *
-      * @return the message ID
-      *
-      * @exception JMSException if the JMS provider fails to get the message ID 
-      *                         due to some internal error.
-      * @see javax.jms.Message#setJMSMessageID(String)
-      * @see javax.jms.MessageProducer#setDisableMessageID(boolean)
-      */ 
- 
-    String
-    getJMSMessageID() throws JMSException;
-
-
-    /** Sets the message ID.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method
-      * can be used to change the value for a message that has been received.
-      *
-      * @param id the ID of the message
-      *
-      * @exception JMSException if the JMS provider fails to set the message ID 
-      *                         due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSMessageID()
-      */ 
-
-    void
-    setJMSMessageID(String id) throws JMSException;
-
-
-    /** Gets the message timestamp.
-      *  
-      * <P>The <CODE>JMSTimestamp</CODE> header field contains the time a 
-      * message was 
-      * handed off to a provider to be sent. It is not the time the 
-      * message was actually transmitted, because the actual send may occur 
-      * later due to transactions or other client-side queueing of messages.
-      *
-      * <P>When a message is sent, <CODE>JMSTimestamp</CODE> is ignored. When 
-      * the <CODE>send</CODE> or <CODE>publish</CODE>
-      * method returns, it contains a time value somewhere in the interval 
-      * between the call and the return. The value is in the format of a normal 
-      * millis time value in the Java programming language.
-      *
-      * <P>Since timestamps take some effort to create and increase a 
-      * message's size, some JMS providers may be able to optimize message 
-      * overhead if they are given a hint that the timestamp is not used by an 
-      * application. By calling the
-      * <CODE>MessageProducer.setDisableMessageTimestamp</CODE> method, a JMS 
-      * client enables this potential optimization for all messages sent by 
-      * that message producer. If the JMS provider accepts this
-      * hint, these messages must have the timestamp set to zero; if the 
-      * provider ignores the hint, the timestamp must be set to its normal 
-      * value.
-      *
-      * @return the message timestamp
-      *
-      * @exception JMSException if the JMS provider fails to get the timestamp
-      *                         due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSTimestamp(long)
-      * @see javax.jms.MessageProducer#setDisableMessageTimestamp(boolean)
-      */
-
-    long
-    getJMSTimestamp() throws JMSException;
-
-
-    /** Sets the message timestamp.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method
-      * can be used to change the value for a message that has been received.
-      *
-      * @param timestamp the timestamp for this message
-      *  
-      * @exception JMSException if the JMS provider fails to set the timestamp
-      *                         due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSTimestamp()
-      */
-
-    void
-    setJMSTimestamp(long timestamp) throws JMSException;
-
-
-    /** Gets the correlation ID as an array of bytes for the message.
-      *  
-      * <P>The use of a <CODE>byte[]</CODE> value for 
-      * <CODE>JMSCorrelationID</CODE> is non-portable.
-      *
-      * @return the correlation ID of a message as an array of bytes
-      *
-      * @exception JMSException if the JMS provider fails to get the correlation
-      *                         ID due to some internal error.
-      *  
-      * @see javax.jms.Message#setJMSCorrelationID(String)
-      * @see javax.jms.Message#getJMSCorrelationID()
-      * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
-      */
-
-    byte []
-    getJMSCorrelationIDAsBytes() throws JMSException;
-
-
-    /** Sets the correlation ID as an array of bytes for the message.
-      * 
-      * <P>The array is copied before the method returns, so
-      * future modifications to the array will not alter this message header.
-      *  
-      * <P>If a provider supports the native concept of correlation ID, a 
-      * JMS client may need to assign specific <CODE>JMSCorrelationID</CODE> 
-      * values to match those expected by native messaging clients. 
-      * JMS providers without native correlation ID values are not required to 
-      * support this method and its corresponding get method; their 
-      * implementation may throw a
-      * <CODE>java.lang.UnsupportedOperationException</CODE>. 
-      *
-      * <P>The use of a <CODE>byte[]</CODE> value for 
-      * <CODE>JMSCorrelationID</CODE> is non-portable.
-      *
-      * @param correlationID the correlation ID value as an array of bytes
-      *  
-      * @exception JMSException if the JMS provider fails to set the correlation
-      *                         ID due to some internal error.
-      *  
-      * @see javax.jms.Message#setJMSCorrelationID(String)
-      * @see javax.jms.Message#getJMSCorrelationID()
-      * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
-      */
-
-    void
-    setJMSCorrelationIDAsBytes(byte[] correlationID) throws JMSException;
-
-
-    /** Sets the correlation ID for the message.
-      *  
-      * <P>A client can use the <CODE>JMSCorrelationID</CODE> header field to 
-      * link one message with another. A typical use is to link a response 
-      * message with its request message.
-      *  
-      * <P><CODE>JMSCorrelationID</CODE> can hold one of the following:
-      *    <UL>
-      *      <LI>A provider-specific message ID
-      *      <LI>An application-specific <CODE>String</CODE>
-      *      <LI>A provider-native <CODE>byte[]</CODE> value
-      *    </UL>
-      *  
-      * <P>Since each message sent by a JMS provider is assigned a message ID
-      * value, it is convenient to link messages via message ID. All message ID
-      * values must start with the <CODE>'ID:'</CODE> prefix.
-      *  
-      * <P>In some cases, an application (made up of several clients) needs to
-      * use an application-specific value for linking messages. For instance,
-      * an application may use <CODE>JMSCorrelationID</CODE> to hold a value 
-      * referencing some external information. Application-specified values 
-      * must not start with the <CODE>'ID:'</CODE> prefix; this is reserved for 
-      * provider-generated message ID values.
-      *  
-      * <P>If a provider supports the native concept of correlation ID, a JMS
-      * client may need to assign specific <CODE>JMSCorrelationID</CODE> values 
-      * to match those expected by clients that do not use the JMS API. A 
-      * <CODE>byte[]</CODE> value is used for this
-      * purpose. JMS providers without native correlation ID values are not
-      * required to support <CODE>byte[]</CODE> values. The use of a 
-      * <CODE>byte[]</CODE> value for <CODE>JMSCorrelationID</CODE> is 
-      * non-portable.
-      *  
-      * @param correlationID the message ID of a message being referred to
-      *  
-      * @exception JMSException if the JMS provider fails to set the correlation
-      *                         ID due to some internal error.
-      *  
-      * @see javax.jms.Message#getJMSCorrelationID()
-      * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
-      * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
-      */ 
-
-    void
-    setJMSCorrelationID(String correlationID) throws JMSException;
-
-
-    /** Gets the correlation ID for the message.
-      *  
-      * <P>This method is used to return correlation ID values that are 
-      * either provider-specific message IDs or application-specific 
-      * <CODE>String</CODE> values.
-      *
-      * @return the correlation ID of a message as a <CODE>String</CODE>
-      *
-      * @exception JMSException if the JMS provider fails to get the correlation
-      *                         ID due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSCorrelationID(String)
-      * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
-      * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
-      */ 
- 
-    String
-    getJMSCorrelationID() throws JMSException;
-
-
-    /** Gets the <CODE>Destination</CODE> object to which a reply to this 
-      * message should be sent.
-      *  
-      * @return <CODE>Destination</CODE> to which to send a response to this 
-      *         message
-      *
-      * @exception JMSException if the JMS provider fails to get the  
-      *                         <CODE>JMSReplyTo</CODE> destination due to some 
-      *                         internal error.
-      *
-      * @see javax.jms.Message#setJMSReplyTo(Destination)
-      */ 
- 
-    Destination
-    getJMSReplyTo() throws JMSException;
-
-
-    /** Sets the <CODE>Destination</CODE> object to which a reply to this 
-      * message should be sent.
-      *  
-      * <P>The <CODE>JMSReplyTo</CODE> header field contains the destination 
-      * where a reply 
-      * to the current message should be sent. If it is null, no reply is 
-      * expected. The destination may be either a <CODE>Queue</CODE> object or
-      * a <CODE>Topic</CODE> object.
-      *
-      * <P>Messages sent with a null <CODE>JMSReplyTo</CODE> value may be a 
-      * notification of some event, or they may just be some data the sender 
-      * thinks is of interest.
-      *
-      * <P>Messages with a <CODE>JMSReplyTo</CODE> value typically expect a 
-      * response. A response is optional; it is up to the client to decide.  
-      * These messages are called requests. A message sent in response to a 
-      * request is called a reply.
-      *
-      * <P>In some cases a client may wish to match a request it sent earlier 
-      * with a reply it has just received. The client can use the 
-      * <CODE>JMSCorrelationID</CODE> header field for this purpose.
-      *
-      * @param replyTo <CODE>Destination</CODE> to which to send a response to 
-      *                this message
-      *
-      * @exception JMSException if the JMS provider fails to set the  
-      *                         <CODE>JMSReplyTo</CODE> destination due to some 
-      *                         internal error.
-      *
-      * @see javax.jms.Message#getJMSReplyTo()
-      */ 
-
-    void
-    setJMSReplyTo(Destination replyTo) throws JMSException;
-
-
-    /** Gets the <CODE>Destination</CODE> object for this message.
-      *  
-      * <P>The <CODE>JMSDestination</CODE> header field contains the 
-      * destination to which the message is being sent.
-      *  
-      * <P>When a message is sent, this field is ignored. After completion
-      * of the <CODE>send</CODE> or <CODE>publish</CODE> method, the field 
-      * holds the destination specified by the method.
-      *  
-      * <P>When a message is received, its <CODE>JMSDestination</CODE> value 
-      * must be equivalent to the value assigned when it was sent.
-      *
-      * @return the destination of this message
-      *  
-      * @exception JMSException if the JMS provider fails to get the destination
-      *                         due to some internal error.
-      *  
-      * @see javax.jms.Message#setJMSDestination(Destination)
-      */ 
-
-    Destination
-    getJMSDestination() throws JMSException;
-
-
-    /** Sets the <CODE>Destination</CODE> object for this message.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method 
-      * can be used to change the value for a message that has been received.
-      *
-      * @param destination the destination for this message
-      *  
-      * @exception JMSException if the JMS provider fails to set the destination
-      *                         due to some internal error.
-      *  
-      * @see javax.jms.Message#getJMSDestination()
-      */ 
-
-    void
-    setJMSDestination(Destination destination) throws JMSException;
-
-
-    /** Gets the <CODE>DeliveryMode</CODE> value specified for this message.
-      *  
-      * @return the delivery mode for this message
-      *  
-      * @exception JMSException if the JMS provider fails to get the 
-      *                         delivery mode due to some internal error.
-      *  
-      * @see javax.jms.Message#setJMSDeliveryMode(int)
-      * @see javax.jms.DeliveryMode
-      */ 
- 
-    int
-    getJMSDeliveryMode() throws JMSException;
- 
- 
-    /** Sets the <CODE>DeliveryMode</CODE> value for this message.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method 
-      * can be used to change the value for a message that has been received.
-      *
-      * @param deliveryMode the delivery mode for this message
-      *  
-      * @exception JMSException if the JMS provider fails to set the 
-      *                         delivery mode due to some internal error.
-      *  
-      * @see javax.jms.Message#getJMSDeliveryMode()
-      * @see javax.jms.DeliveryMode
-      */ 
- 
-    void 
-    setJMSDeliveryMode(int deliveryMode) throws JMSException;
-
-
-    /** Gets an indication of whether this message is being redelivered.
-      *
-      * <P>If a client receives a message with the <CODE>JMSRedelivered</CODE> 
-      * field set,
-      * it is likely, but not guaranteed, that this message was delivered
-      * earlier but that its receipt was not acknowledged
-      * at that time.
-      *
-      * @return true if this message is being redelivered
-      *  
-      * @exception JMSException if the JMS provider fails to get the redelivered
-      *                         state due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSRedelivered(boolean)
-      */ 
- 
-    boolean
-    getJMSRedelivered() throws JMSException;
- 
- 
-    /** Specifies whether this message is being redelivered.
-      *  
-      * <P>This field is set at the time the message is delivered. This
-      * method can be used to change the value for a message that has
-      * been received.
-      *
-      * @param redelivered an indication of whether this message is being
-      * redelivered
-      *  
-      * @exception JMSException if the JMS provider fails to set the redelivered
-      *                         state due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSRedelivered()
-      */ 
- 
-    void
-    setJMSRedelivered(boolean redelivered) throws JMSException;
-
-
-    /** Gets the message type identifier supplied by the client when the
-      * message was sent.
-      *
-      * @return the message type
-      *  
-      * @exception JMSException if the JMS provider fails to get the message 
-      *                         type due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSType(String)
-      */
-       
-    String
-    getJMSType() throws JMSException;
-
-
-    /** Sets the message type.
-      *
-      * <P>Some JMS providers use a message repository that contains the 
-      * definitions of messages sent by applications. The <CODE>JMSType</CODE> 
-      * header field may reference a message's definition in the provider's
-      * repository.
-      *
-      * <P>The JMS API does not define a standard message definition repository,
-      * nor does it define a naming policy for the definitions it contains. 
-      *
-      * <P>Some messaging systems require that a message type definition for 
-      * each application message be created and that each message specify its 
-      * type. In order to work with such JMS providers, JMS clients should 
-      * assign a value to <CODE>JMSType</CODE>, whether the application makes 
-      * use of it or not. This ensures that the field is properly set for those 
-      * providers that require it.
-      *
-      * <P>To ensure portability, JMS clients should use symbolic values for 
-      * <CODE>JMSType</CODE> that can be configured at installation time to the 
-      * values defined in the current provider's message repository. If string 
-      * literals are used, they may not be valid type names for some JMS 
-      * providers.
-      *
-      * @param type the message type
-      *  
-      * @exception JMSException if the JMS provider fails to set the message 
-      *                         type due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSType()
-      */
-
-    void 
-    setJMSType(String type) throws JMSException;
-
-
-    /** Gets the message's expiration value.
-      *  
-      * <P>When a message is sent, the <CODE>JMSExpiration</CODE> header field 
-      * is left unassigned. After completion of the <CODE>send</CODE> or 
-      * <CODE>publish</CODE> method, it holds the expiration time of the
-      * message. This is the sum of the time-to-live value specified by the
-      * client and the GMT at the time of the <CODE>send</CODE> or 
-      * <CODE>publish</CODE>.
-      *
-      * <P>If the time-to-live is specified as zero, <CODE>JMSExpiration</CODE> 
-      * is set to zero to indicate that the message does not expire.
-      *
-      * <P>When a message's expiration time is reached, a provider should
-      * discard it. The JMS API does not define any form of notification of 
-      * message expiration.
-      *
-      * <P>Clients should not receive messages that have expired; however,
-      * the JMS API does not guarantee that this will not happen.
-      *
-      * @return the time the message expires, which is the sum of the
-      * time-to-live value specified by the client and the GMT at the
-      * time of the send
-      *  
-      * @exception JMSException if the JMS provider fails to get the message 
-      *                         expiration due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSExpiration(long)
-      */ 
- 
-    long
-    getJMSExpiration() throws JMSException;
- 
- 
-    /** Sets the message's expiration value.
-      *
-      * <P>JMS providers set this field when a message is sent. This method 
-      * can be used to change the value for a message that has been received.
-      *  
-      * @param expiration the message's expiration time
-      *  
-      * @exception JMSException if the JMS provider fails to set the message 
-      *                         expiration due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSExpiration() 
-      */
- 
-    void
-    setJMSExpiration(long expiration) throws JMSException;
-
-
-    /** Gets the message priority level.
-      *  
-      * <P>The JMS API defines ten levels of priority value, with 0 as the 
-      * lowest
-      * priority and 9 as the highest. In addition, clients should consider
-      * priorities 0-4 as gradations of normal priority and priorities 5-9
-      * as gradations of expedited priority.
-      *  
-      * <P>The JMS API does not require that a provider strictly implement 
-      * priority 
-      * ordering of messages; however, it should do its best to deliver 
-      * expedited messages ahead of normal messages.
-      *  
-      * @return the default message priority
-      *  
-      * @exception JMSException if the JMS provider fails to get the message 
-      *                         priority due to some internal error.
-      *
-      * @see javax.jms.Message#setJMSPriority(int) 
-      */ 
-
-    int
-    getJMSPriority() throws JMSException;
-
-
-    /** Sets the priority level for this message.
-      *  
-      * <P>JMS providers set this field when a message is sent. This method 
-      * can be used to change the value for a message that has been received.
-      *
-      * @param priority the priority of this message
-      *  
-      * @exception JMSException if the JMS provider fails to set the message 
-      *                         priority due to some internal error.
-      *
-      * @see javax.jms.Message#getJMSPriority() 
-      */ 
-
-    void
-    setJMSPriority(int priority) throws JMSException;
-
-
-    /** Clears a message's properties.
-      *
-      * <P>The message's header fields and body are not cleared.
-      *
-      * @exception JMSException if the JMS provider fails to clear the message 
-      *                         properties due to some internal error.
-      */ 
-
-    void
-    clearProperties() throws JMSException;
-
-
-    /** Indicates whether a property value exists.
-      *
-      * @param name the name of the property to test
-      *
-      * @return true if the property exists
-      *  
-      * @exception JMSException if the JMS provider fails to determine if the 
-      *                         property exists due to some internal error.
-      */
-
-    boolean
-    propertyExists(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>boolean</CODE> property with the  
-      * specified name.
-      *  
-      * @param name the name of the <CODE>boolean</CODE> property
-      *  
-      * @return the <CODE>boolean</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid. 
-      */ 
-
-    boolean
-    getBooleanProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>byte</CODE> property with the specified 
-      * name.
-      *  
-      * @param name the name of the <CODE>byte</CODE> property
-      *  
-      * @return the <CODE>byte</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid. 
-      */ 
-
-    byte
-    getByteProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>short</CODE> property with the specified 
-      * name.
-      *
-      * @param name the name of the <CODE>short</CODE> property
-      *
-      * @return the <CODE>short</CODE> property value for the specified name
-      *
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */
-   
-    short
-    getShortProperty(String name) throws JMSException;
- 
- 
-    /** Returns the value of the <CODE>int</CODE> property with the specified 
-      * name.
-      *  
-      * @param name the name of the <CODE>int</CODE> property
-      *  
-      * @return the <CODE>int</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    int
-    getIntProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>long</CODE> property with the specified 
-      * name.
-      *  
-      * @param name the name of the <CODE>long</CODE> property
-      *  
-      * @return the <CODE>long</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    long
-    getLongProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>float</CODE> property with the specified 
-      * name.
-      *  
-      * @param name the name of the <CODE>float</CODE> property
-      *  
-      * @return the <CODE>float</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    float
-    getFloatProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>double</CODE> property with the specified
-      * name.
-      *  
-      * @param name the name of the <CODE>double</CODE> property
-      *  
-      * @return the <CODE>double</CODE> property value for the specified name
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    double
-    getDoubleProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the <CODE>String</CODE> property with the specified
-      * name.
-      *  
-      * @param name the name of the <CODE>String</CODE> property
-      *  
-      * @return the <CODE>String</CODE> property value for the specified name;
-      * if there is no property by this name, a null value is returned
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      * @exception MessageFormatException if this type conversion is invalid.
-      */ 
-
-    String
-    getStringProperty(String name) throws JMSException;
-
-
-    /** Returns the value of the Java object property with the specified name.
-      *  
-      * <P>This method can be used to return, in objectified format,
-      * an object that has been stored as a property in the message with the 
-      * equivalent <CODE>setObjectProperty</CODE> method call, or its equivalent
-      * primitive <CODE>set<I>type</I>Property</CODE> method.
-      *  
-      * @param name the name of the Java object property
-      *  
-      * @return the Java object property value with the specified name, in 
-      * objectified format (for example, if the property was set as an 
-      * <CODE>int</CODE>, an <CODE>Integer</CODE> is 
-      * returned); if there is no property by this name, a null value 
-      * is returned
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                         value due to some internal error.
-      */ 
-
-    Object
-    getObjectProperty(String name) throws JMSException;
-
-
-    /** Returns an <CODE>Enumeration</CODE> of all the property names.
-      *
-      * <P>Note that JMS standard header fields are not considered
-      * properties and are not returned in this enumeration.
-      *  
-      * @return an enumeration of all the names of property values
-      *  
-      * @exception JMSException if the JMS provider fails to get the property
-      *                          names due to some internal error.
-      */ 
-     
-    Enumeration
-    getPropertyNames() throws JMSException;
-
-
-    /** Sets a <CODE>boolean</CODE> property value with the specified name into 
-      * the message.
-      *
-      * @param name the name of the <CODE>boolean</CODE> property
-      * @param value the <CODE>boolean</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setBooleanProperty(String name, boolean value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>byte</CODE> property value with the specified name into 
-      * the message.
-      *  
-      * @param name the name of the <CODE>byte</CODE> property
-      * @param value the <CODE>byte</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setByteProperty(String name, byte value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>short</CODE> property value with the specified name into
-      * the message.
-      *  
-      * @param name the name of the <CODE>short</CODE> property
-      * @param value the <CODE>short</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setShortProperty(String name, short value)
-                        throws JMSException;
-
-
-    /** Sets an <CODE>int</CODE> property value with the specified name into
-      * the message.
-      *  
-      * @param name the name of the <CODE>int</CODE> property
-      * @param value the <CODE>int</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setIntProperty(String name, int value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>long</CODE> property value with the specified name into 
-      * the message.
-      *  
-      * @param name the name of the <CODE>long</CODE> property
-      * @param value the <CODE>long</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setLongProperty(String name, long value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>float</CODE> property value with the specified name into 
-      * the message.
-      *  
-      * @param name the name of the <CODE>float</CODE> property
-      * @param value the <CODE>float</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setFloatProperty(String name, float value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>double</CODE> property value with the specified name into 
-      * the message.
-      *  
-      * @param name the name of the <CODE>double</CODE> property
-      * @param value the <CODE>double</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setDoubleProperty(String name, double value)
-                        throws JMSException;
-
-
-    /** Sets a <CODE>String</CODE> property value with the specified name into 
-      * the message.
-      *
-      * @param name the name of the <CODE>String</CODE> property
-      * @param value the <CODE>String</CODE> property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setStringProperty(String name, String value)
-                        throws JMSException;
-
-
-    /** Sets a Java object property value with the specified name into the 
-      * message.
-      *  
-      * <P>Note that this method works only for the objectified primitive
-      * object types (<CODE>Integer</CODE>, <CODE>Double</CODE>, 
-      * <CODE>Long</CODE> ...) and <CODE>String</CODE> objects.
-      *  
-      * @param name the name of the Java object property
-      * @param value the Java object property value to set
-      *  
-      * @exception JMSException if the JMS provider fails to set the property
-      *                          due to some internal error.
-      * @exception IllegalArgumentException if the name is null or if the name is
-      *                          an empty string.
-      * @exception MessageFormatException if the object is invalid
-      * @exception MessageNotWriteableException if properties are read-only
-      */ 
-
-    void
-    setObjectProperty(String name, Object value)
-                        throws JMSException;
-
-
-    /** Acknowledges all consumed messages of the session of this consumed 
-      * message.
-      *  
-      * <P>All consumed JMS messages support the <CODE>acknowledge</CODE> 
-      * method for use when a client has specified that its JMS session's 
-      * consumed messages are to be explicitly acknowledged.  By invoking 
-      * <CODE>acknowledge</CODE> on a consumed message, a client acknowledges 
-      * all messages consumed by the session that the message was delivered to.
-      * 
-      * <P>Calls to <CODE>acknowledge</CODE> are ignored for both transacted 
-      * sessions and sessions specified to use implicit acknowledgement modes.
-      *
-      * <P>A client may individually acknowledge each message as it is consumed,
-      * or it may choose to acknowledge messages as an application-defined group 
-      * (which is done by calling acknowledge on the last received message of the group,
-      *  thereby acknowledging all messages consumed by the session.)
-      *
-      * <P>Messages that have been received but not acknowledged may be 
-      * redelivered.
-      *
-      * @exception JMSException if the JMS provider fails to acknowledge the
-      *                         messages due to some internal error.
-      * @exception IllegalStateException if this method is called on a closed
-      *                         session.
-      *
-      * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
-      */ 
-
-    void
-    acknowledge() throws JMSException;
-
-
-    /** Clears out the message body. Clearing a message's body does not clear 
-      * its header values or property entries.
-      *
-      * <P>If this message body was read-only, calling this method leaves
-      * the message body in the same state as an empty body in a newly
-      * created message.
-      *
-      * @exception JMSException if the JMS provider fails to clear the message
-      *                         body due to some internal error.
-      */
-
-    void
-    clearBody() throws JMSException;
+
+/** The <CODE>Message</CODE> interface is the root interface of all JMS
+ * messages. It defines the message header and the <CODE>acknowledge</CODE>
+ * method used for all messages.
+ *
+ * <P>Most message-oriented middleware (MOM) products treat messages as
+ * lightweight entities that consist
+ * of a header and a payload. The header contains fields used for message
+ * routing and identification; the payload contains the application data
+ * being sent.
+ *
+ * <P>Within this general form, the definition of a message varies
+ * significantly across products. It would be quite difficult for the JMS API
+ * to support all of these message models.
+ *
+ * <P>With this in mind, the JMS message model has the following goals:
+ * <UL>
+ *   <LI>Provide a single, unified message API
+ *   <LI>Provide an API suitable for creating messages that match the
+ *       format used by provider-native messaging applications
+ *   <LI>Support the development of heterogeneous applications that span
+ *       operating systems, machine architectures, and computer languages
+ *   <LI>Support messages containing objects in the Java programming language
+ *       ("Java objects")
+ *   <LI>Support messages containing Extensible Markup Language (XML) pages
+ * </UL>
+ *
+ * <P>JMS messages are composed of the following parts:
+ * <UL>
+ *   <LI>Header - All messages support the same set of header fields.
+ *       Header fields contain values used by both clients and providers to
+ *       identify and route messages.
+ *   <LI>Properties - Each message contains a built-in facility for supporting
+ *       application-defined property values. Properties provide an efficient
+ *       mechanism for supporting application-defined message filtering.
+ *   <LI>Body - The JMS API defines several types of message body, which cover
+ *       the majority of messaging styles currently in use.
+ * </UL>
+ *
+ * <H4>Message Bodies</H4>
+ *
+ * <P>The JMS API defines five types of message body:
+ * <UL>
+ *   <LI>Stream - A <CODE>StreamMessage</CODE> object's message body contains
+ *       a stream of primitive values in the Java programming
+ *       language ("Java primitives"). It is filled and read sequentially.
+ *   <LI>Map - A <CODE>MapMessage</CODE> object's message body contains a set
+ *       of name-value pairs, where names are <CODE>String</CODE>
+ *       objects, and values are Java primitives. The entries can be accessed
+ *       sequentially or randomly by name. The order of the entries is
+ *       undefined.
+ *   <LI>Text - A <CODE>TextMessage</CODE> object's message body contains a
+ *       <CODE>java.lang.String</CODE> object. This message type can be used
+ *       to transport plain-text messages, and XML messages.
+ *   <LI>Object - An <CODE>ObjectMessage</CODE> object's message body contains
+ *       a <CODE>Serializable</CODE> Java object.
+ *   <LI>Bytes - A <CODE>BytesMessage</CODE> object's message body contains a
+ *       stream of uninterpreted bytes. This message type is for
+ *       literally encoding a body to match an existing message format. In
+ *       many cases, it is possible to use one of the other body types,
+ *       which are easier to use. Although the JMS API allows the use of
+ *       message properties with byte messages, they are typically not used,
+ *       since the inclusion of properties may affect the format.
+ * </UL>
+ *
+ * <H4>Message Headers</H4>
+ *
+ * <P>The <CODE>JMSCorrelationID</CODE> header field is used for linking one
+ * message with
+ * another. It typically links a reply message with its requesting message.
+ *
+ * <P><CODE>JMSCorrelationID</CODE> can hold a provider-specific message ID,
+ * an application-specific <CODE>String</CODE> object, or a provider-native
+ * <CODE>byte[]</CODE> value.
+ *
+ * <H4>Message Properties</H4>
+ *
+ * <P>A <CODE>Message</CODE> object contains a built-in facility for supporting
+ * application-defined property values. In effect, this provides a mechanism
+ * for adding application-specific header fields to a message.
+ *
+ * <P>Properties allow an application, via message selectors, to have a JMS
+ * provider select, or filter, messages on its behalf using
+ * application-specific criteria.
+ *
+ * <P>Property names must obey the rules for a message selector identifier.
+ * Property names must not be null, and must not be empty strings. If a property
+ * name is set and it is either null or an empty string, an
+ * <CODE>IllegalArgumentException</CODE> must be thrown.
+ *
+ * <P>Property values can be <CODE>boolean</CODE>, <CODE>byte</CODE>,
+ * <CODE>short</CODE>, <CODE>int</CODE>, <CODE>long</CODE>, <CODE>float</CODE>,
+ * <CODE>double</CODE>, and <CODE>String</CODE>.
+ *
+ * <P>Property values are set prior to sending a message. When a client
+ * receives a message, its properties are in read-only mode. If a
+ * client attempts to set properties at this point, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown. If
+ * <CODE>clearProperties</CODE> is called, the properties can now be both
+ * read from and written to. Note that header fields are distinct from
+ * properties. Header fields are never in read-only mode.
+ *
+ * <P>A property value may duplicate a value in a message's body, or it may
+ * not. Although JMS does not define a policy for what should or should not
+ * be made a property, application developers should note that JMS providers
+ * will likely handle data in a message's body more efficiently than data in
+ * a message's properties. For best performance, applications should use
+ * message properties only when they need to customize a message's header.
+ * The primary reason for doing this is to support customized message
+ * selection.
+ *
+ * <P>Message properties support the following conversion table. The marked
+ * cases must be supported. The unmarked cases must throw a
+ * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions
+ * may throw a runtime exception if the
+ * primitive's <CODE>valueOf</CODE> method does not accept the
+ * <CODE>String</CODE> as a valid representation of the primitive.
+ *
+ * <P>A value written as the row type can be read as the column type.
+ *
+ * <PRE>
+ * |        | boolean byte short int long float double String
+ * |----------------------------------------------------------
+ * |boolean |    X                                       X
+ * |byte    |          X     X    X   X                  X
+ * |short   |                X    X   X                  X
+ * |int     |                     X   X                  X
+ * |long    |                         X                  X
+ * |float   |                               X     X      X
+ * |double  |                                     X      X
+ * |String  |    X     X     X    X   X     X     X      X
+ * |----------------------------------------------------------
+ * </PRE>
+ *
+ * <P>In addition to the type-specific set/get methods for properties, JMS
+ * provides the <CODE>setObjectProperty</CODE> and
+ * <CODE>getObjectProperty</CODE> methods. These support the same set of
+ * property types using the objectified primitive values. Their purpose is
+ * to allow the decision of property type to made at execution time rather
+ * than at compile time. They support the same property value conversions.
+ *
+ * <P>The <CODE>setObjectProperty</CODE> method accepts values of class
+ * <CODE>Boolean</CODE>, <CODE>Byte</CODE>, <CODE>Short</CODE>,
+ * <CODE>Integer</CODE>, <CODE>Long</CODE>, <CODE>Float</CODE>,
+ * <CODE>Double</CODE>, and <CODE>String</CODE>. An attempt
+ * to use any other class must throw a <CODE>JMSException</CODE>.
+ *
+ * <P>The <CODE>getObjectProperty</CODE> method only returns values of class
+ * <CODE>Boolean</CODE>, <CODE>Byte</CODE>, <CODE>Short</CODE>,
+ * <CODE>Integer</CODE>, <CODE>Long</CODE>, <CODE>Float</CODE>,
+ * <CODE>Double</CODE>, and <CODE>String</CODE>.
+ *
+ * <P>The order of property values is not defined. To iterate through a
+ * message's property values, use <CODE>getPropertyNames</CODE> to retrieve
+ * a property name enumeration and then use the various property get methods
+ * to retrieve their values.
+ *
+ * <P>A message's properties are deleted by the <CODE>clearProperties</CODE>
+ * method. This leaves the message with an empty set of properties.
+ *
+ * <P>Getting a property value for a name which has not been set returns a
+ * null value. Only the <CODE>getStringProperty</CODE> and
+ * <CODE>getObjectProperty</CODE> methods can return a null value.
+ * Attempting to read a null value as a primitive type must be treated as
+ * calling the primitive's corresponding <CODE>valueOf(String)</CODE>
+ * conversion method with a null value.
+ *
+ * <P>The JMS API reserves the <CODE>JMSX</CODE> property name prefix for JMS
+ * defined properties.
+ * The full set of these properties is defined in the Java Message Service
+ * specification. New JMS defined properties may be added in later versions
+ * of the JMS API.  Support for these properties is optional. The
+ * <CODE>String[] ConnectionMetaData.getJMSXPropertyNames</CODE> method
+ * returns the names of the JMSX properties supported by a connection.
+ *
+ * <P>JMSX properties may be referenced in message selectors whether or not
+ * they are supported by a connection. If they are not present in a
+ * message, they are treated like any other absent property.
+ *
+ * <P>JMSX properties defined in the specification as "set by provider on
+ * send" are available to both the producer and the consumers of the message.
+ * JMSX properties defined in the specification as "set by provider on
+ * receive" are available only to the consumers.
+ *
+ * <P><CODE>JMSXGroupID</CODE> and <CODE>JMSXGroupSeq</CODE> are standard
+ * properties that clients
+ * should use if they want to group messages. All providers must support them.
+ * Unless specifically noted, the values and semantics of the JMSX properties
+ * are undefined.
+ *
+ * <P>The JMS API reserves the <CODE>JMS_<I>vendor_name</I></CODE> property
+ * name prefix for provider-specific properties. Each provider defines its own
+ * value for <CODE><I>vendor_name</I></CODE>. This is the mechanism a JMS
+ * provider uses to make its special per-message services available to a JMS
+ * client.
+ *
+ * <P>The purpose of provider-specific properties is to provide special
+ * features needed to integrate JMS clients with provider-native clients in a
+ * single JMS application. They should not be used for messaging between JMS
+ * clients.
+ *
+ * <H4>Provider Implementations of JMS Message Interfaces</H4>
+ *
+ * <P>The JMS API provides a set of message interfaces that define the JMS
+ * message
+ * model. It does not provide implementations of these interfaces.
+ *
+ * <P>Each JMS provider supplies a set of message factories with its
+ * <CODE>Session</CODE> object for creating instances of messages. This allows
+ * a provider to use message implementations tailored to its specific needs.
+ *
+ * <P>A provider must be prepared to accept message implementations that are
+ * not its own. They may not be handled as efficiently as its own
+ * implementation; however, they must be handled.
+ *
+ * <P>Note the following exception case when a provider is handling a foreign
+ * message implementation. If the foreign message implementation contains a
+ * <CODE>JMSReplyTo</CODE> header field that is set to a foreign destination
+ * implementation, the provider is not required to handle or preserve the
+ * value of this header field.
+ *
+ * <H4>Message Selectors</H4>
+ *
+ * <P>A JMS message selector allows a client to specify, by
+ * header field references and property references, the
+ * messages it is interested in. Only messages whose header
+ * and property values
+ * match the
+ * selector are delivered. What it means for a message not to be delivered
+ * depends on the <CODE>MessageConsumer</CODE> being used (see
+ * {@link javax.jms.QueueReceiver QueueReceiver} and
+ * {@link javax.jms.TopicSubscriber TopicSubscriber}).
+ *
+ * <P>Message selectors cannot reference message body values.
+ *
+ * <P>A message selector matches a message if the selector evaluates to
+ * true when the message's header field values and property values are
+ * substituted for their corresponding identifiers in the selector.
+ *
+ * <P>A message selector is a <CODE>String</CODE> whose syntax is based on a
+ * subset of
+ * the SQL92 conditional expression syntax. If the value of a message selector
+ * is an empty string, the value is treated as a null and indicates that there
+ * is no message selector for the message consumer.
+ *
+ * <P>The order of evaluation of a message selector is from left to right
+ * within precedence level. Parentheses can be used to change this order.
+ *
+ * <P>Predefined selector literals and operator names are shown here in
+ * uppercase; however, they are case insensitive.
+ *
+ * <P>A selector can contain:
+ *
+ * <UL>
+ *   <LI>Literals:
+ *   <UL>
+ *     <LI>A string literal is enclosed in single quotes, with a single quote
+ *         represented by doubled single quote; for example,
+ *         <CODE>'literal'</CODE> and <CODE>'literal''s'</CODE>. Like
+ *         string literals in the Java programming language, these use the
+ *         Unicode character encoding.
+ *     <LI>An exact numeric literal is a numeric value without a decimal
+ *         point, such as <CODE>57</CODE>, <CODE>-957</CODE>, and
+ *         <CODE>+62</CODE>; numbers in the range of <CODE>long</CODE> are
+ *         supported. Exact numeric literals use the integer literal
+ *         syntax of the Java programming language.
+ *     <LI>An approximate numeric literal is a numeric value in scientific
+ *         notation, such as <CODE>7E3</CODE> and <CODE>-57.9E2</CODE>, or a
+ *         numeric value with a decimal, such as <CODE>7.</CODE>,
+ *         <CODE>-95.7</CODE>, and <CODE>+6.2</CODE>; numbers in the range of
+ *         <CODE>double</CODE> are supported. Approximate literals use the
+ *         floating-point literal syntax of the Java programming language.
+ *     <LI>The boolean literals <CODE>TRUE</CODE> and <CODE>FALSE</CODE>.
+ *   </UL>
+ *   <LI>Identifiers:
+ *   <UL>
+ *     <LI>An identifier is an unlimited-length sequence of letters
+ *         and digits, the first of which must be a letter. A letter is any
+ *         character for which the method <CODE>Character.isJavaLetter</CODE>
+ *         returns true. This includes <CODE>'_'</CODE> and <CODE>'$'</CODE>.
+ *         A letter or digit is any character for which the method
+ *         <CODE>Character.isJavaLetterOrDigit</CODE> returns true.
+ *     <LI>Identifiers cannot be the names <CODE>NULL</CODE>,
+ *         <CODE>TRUE</CODE>, and <CODE>FALSE</CODE>.
+ *     <LI>Identifiers cannot be <CODE>NOT</CODE>, <CODE>AND</CODE>,
+ *         <CODE>OR</CODE>, <CODE>BETWEEN</CODE>, <CODE>LIKE</CODE>,
+ *         <CODE>IN</CODE>, <CODE>IS</CODE>, or <CODE>ESCAPE</CODE>.
+ *     <LI>Identifiers are either header field references or property
+ *         references.  The type of a property value in a message selector
+ *         corresponds to the type used to set the property. If a property
+ *         that does not exist in a message is referenced, its value is
+ *         <CODE>NULL</CODE>.
+ *     <LI>The conversions that apply to the get methods for properties do not
+ *         apply when a property is used in a message selector expression.
+ *         For example, suppose you set a property as a string value, as in the
+ *         following:
+ *         <PRE>myMessage.setStringProperty("NumberOfOrders", "2");</PRE>
+ *         The following expression in a message selector would evaluate to
+ *         false, because a string cannot be used in an arithmetic expression:
+ *         <PRE>"NumberOfOrders > 1"</PRE>
+ *     <LI>Identifiers are case-sensitive.
+ *     <LI>Message header field references are restricted to
+ *         <CODE>JMSDeliveryMode</CODE>, <CODE>JMSPriority</CODE>,
+ *         <CODE>JMSMessageID</CODE>, <CODE>JMSTimestamp</CODE>,
+ *         <CODE>JMSCorrelationID</CODE>, and <CODE>JMSType</CODE>.
+ *         <CODE>JMSMessageID</CODE>, <CODE>JMSCorrelationID</CODE>, and
+ *         <CODE>JMSType</CODE> values may be null and if so are treated as a
+ *         <CODE>NULL</CODE> value.
+ *     <LI>Any name beginning with <CODE>'JMSX'</CODE> is a JMS defined
+ *         property name.
+ *     <LI>Any name beginning with <CODE>'JMS_'</CODE> is a provider-specific
+ *         property name.
+ *     <LI>Any name that does not begin with <CODE>'JMS'</CODE> is an
+ *         application-specific property name.
+ *   </UL>
+ *   <LI>White space is the same as that defined for the Java programming
+ *       language: space, horizontal tab, form feed, and line terminator.
+ *   <LI>Expressions:
+ *   <UL>
+ *     <LI>A selector is a conditional expression; a selector that evaluates
+ *         to <CODE>true</CODE> matches; a selector that evaluates to
+ *         <CODE>false</CODE> or unknown does not match.
+ *     <LI>Arithmetic expressions are composed of themselves, arithmetic
+ *         operations, identifiers (whose value is treated as a numeric
+ *         literal), and numeric literals.
+ *     <LI>Conditional expressions are composed of themselves, comparison
+ *         operations, and logical operations.
+ *   </UL>
+ *   <LI>Standard bracketing <CODE>()</CODE> for ordering expression evaluation
+ *      is supported.
+ *   <LI>Logical operators in precedence order: <CODE>NOT</CODE>,
+ *       <CODE>AND</CODE>, <CODE>OR</CODE>
+ *   <LI>Comparison operators: <CODE>=</CODE>, <CODE>></CODE>, <CODE>>=</CODE>,
+ *       <CODE><</CODE>, <CODE><=</CODE>, <CODE><></CODE> (not equal)
+ *   <UL>
+ *     <LI>Only like type values can be compared. One exception is that it
+ *         is valid to compare exact numeric values and approximate numeric
+ *         values; the type conversion required is defined by the rules of
+ *         numeric promotion in the Java programming language. If the
+ *         comparison of non-like type values is attempted, the value of the
+ *         operation is false. If either of the type values evaluates to
+ *         <CODE>NULL</CODE>, the value of the expression is unknown.
+ *     <LI>String and boolean comparison is restricted to <CODE>=</CODE> and
+ *         <CODE><></CODE>. Two strings are equal
+ *         if and only if they contain the same sequence of characters.
+ *   </UL>
+ *   <LI>Arithmetic operators in precedence order:
+ *   <UL>
+ *     <LI><CODE>+</CODE>, <CODE>-</CODE> (unary)
+ *     <LI><CODE>*</CODE>, <CODE>/</CODE> (multiplication and division)
+ *     <LI><CODE>+</CODE>, <CODE>-</CODE> (addition and subtraction)
+ *     <LI>Arithmetic operations must use numeric promotion in the Java
+ *         programming language.
+ *   </UL>
+ *   <LI><CODE><I>arithmetic-expr1</I> [NOT] BETWEEN <I>arithmetic-expr2</I>
+ *       AND <I>arithmetic-expr3</I></CODE> (comparison operator)
+ *   <UL>
+ *     <LI><CODE>"age&nbsp;BETWEEN&nbsp;15&nbsp;AND&nbsp;19"</CODE> is
+ *         equivalent to
+ *         <CODE>"age&nbsp;>=&nbsp;15&nbsp;AND&nbsp;age&nbsp;<=&nbsp;19"</CODE>
+ *     <LI><CODE>"age&nbsp;NOT&nbsp;BETWEEN&nbsp;15&nbsp;AND&nbsp;19"</CODE>
+ *         is equivalent to
+ *         <CODE>"age&nbsp;<&nbsp;15&nbsp;OR&nbsp;age&nbsp;>&nbsp;19"</CODE>
+ *   </UL>
+ *   <LI><CODE><I>identifier</I> [NOT] IN (<I>string-literal1</I>,
+ *       <I>string-literal2</I>,...)</CODE> (comparison operator where
+ *       <CODE><I>identifier</I></CODE> has a <CODE>String</CODE> or
+ *       <CODE>NULL</CODE> value)
+ *   <UL>
+ *     <LI><CODE>"Country&nbsp;IN&nbsp;('&nbsp;UK',&nbsp;'US',&nbsp;'France')"</CODE>
+ *         is true for
+ *         <CODE>'UK'</CODE> and false for <CODE>'Peru'</CODE>; it is
+ *         equivalent to the expression
+ *         <CODE>"(Country&nbsp;=&nbsp;'&nbsp;UK')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;US')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;France')"</CODE>
+ *     <LI><CODE>"Country&nbsp;NOT&nbsp;IN&nbsp;('&nbsp;UK',&nbsp;'US',&nbsp;'France')"</CODE>
+ *         is false for <CODE>'UK'</CODE> and true for <CODE>'Peru'</CODE>; it
+ *         is equivalent to the expression
+ *         <CODE>"NOT&nbsp;((Country&nbsp;=&nbsp;'&nbsp;UK')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;US')&nbsp;OR&nbsp;(Country&nbsp;=&nbsp;'&nbsp;France'))"</CODE>
+ *     <LI>If identifier of an <CODE>IN</CODE> or <CODE>NOT IN</CODE>
+ *         operation is <CODE>NULL</CODE>, the value of the operation is
+ *         unknown.
+ *   </UL>
+ *   <LI><CODE><I>identifier</I> [NOT] LIKE <I>pattern-value</I> [ESCAPE
+ *       <I>escape-character</I>]</CODE> (comparison operator, where
+ *       <CODE><I>identifier</I></CODE> has a <CODE>String</CODE> value;
+ *       <CODE><I>pattern-value</I></CODE> is a string literal where
+ *       <CODE>'_'</CODE> stands for any single character; <CODE>'%'</CODE>
+ *       stands for any sequence of characters, including the empty sequence;
+ *       and all other characters stand for themselves. The optional
+ *       <CODE><I>escape-character</I></CODE> is a single-character string
+ *       literal whose character is used to escape the special meaning of the
+ *       <CODE>'_'</CODE> and <CODE>'%'</CODE> in
+ *       <CODE><I>pattern-value</I></CODE>.)
+ *   <UL>
+ *     <LI><CODE>"phone&nbsp;LIKE&nbsp;'12%3'"</CODE> is true for
+ *         <CODE>'123'</CODE> or <CODE>'12993'</CODE> and false for
+ *         <CODE>'1234'</CODE>
+ *     <LI><CODE>"word&nbsp;LIKE&nbsp;'l_se'"</CODE> is true for
+ *         <CODE>'lose'</CODE> and false for <CODE>'loose'</CODE>
+ *     <LI><CODE>"underscored&nbsp;LIKE&nbsp;'\_%'&nbsp;ESCAPE&nbsp;'\'"</CODE>
+ *          is true for <CODE>'_foo'</CODE> and false for <CODE>'bar'</CODE>
+ *     <LI><CODE>"phone&nbsp;NOT&nbsp;LIKE&nbsp;'12%3'"</CODE> is false for
+ *         <CODE>'123'</CODE> or <CODE>'12993'</CODE> and true for
+ *         <CODE>'1234'</CODE>
+ *     <LI>If <CODE><I>identifier</I></CODE> of a <CODE>LIKE</CODE> or
+ *         <CODE>NOT LIKE</CODE> operation is <CODE>NULL</CODE>, the value
+ *         of the operation is unknown.
+ *   </UL>
+ *   <LI><CODE><I>identifier</I> IS NULL</CODE> (comparison operator that tests
+ *       for a null header field value or a missing property value)
+ *   <UL>
+ *     <LI><CODE>"prop_name&nbsp;IS&nbsp;NULL"</CODE>
+ *   </UL>
+ *   <LI><CODE><I>identifier</I> IS NOT NULL</CODE> (comparison operator that
+ *       tests for the existence of a non-null header field value or a property
+ *       value)
+ *   <UL>
+ *     <LI><CODE>"prop_name&nbsp;IS&nbsp;NOT&nbsp;NULL"</CODE>
+ *   </UL>
+ *
+ * <P>JMS providers are required to verify the syntactic correctness of a
+ *    message selector at the time it is presented. A method that provides a
+ *  syntactically incorrect selector must result in a <CODE>JMSException</CODE>.
+ * JMS providers may also optionally provide some semantic checking at the time
+ * the selector is presented. Not all semantic checking can be performed at
+ * the time a message selector is presented, because property types are not known.
+ *
+ * <P>The following message selector selects messages with a message type
+ * of car and color of blue and weight greater than 2500 pounds:
+ *
+ * <PRE>"JMSType&nbsp;=&nbsp;'car'&nbsp;AND&nbsp;color&nbsp;=&nbsp;'blue'&nbsp;AND&nbsp;weight&nbsp;>&nbsp;2500"</PRE>
+ *
+ * <H4>Null Values</H4>
+ *
+ * <P>As noted above, property values may be <CODE>NULL</CODE>. The evaluation
+ * of selector expressions containing <CODE>NULL</CODE> values is defined by
+ * SQL92 <CODE>NULL</CODE> semantics. A brief description of these semantics
+ * is provided here.
+ *
+ * <P>SQL treats a <CODE>NULL</CODE> value as unknown. Comparison or arithmetic
+ * with an unknown value always yields an unknown value.
+ *
+ * <P>The <CODE>IS NULL</CODE> and <CODE>IS NOT NULL</CODE> operators convert
+ * an unknown value into the respective <CODE>TRUE</CODE> and
+ * <CODE>FALSE</CODE> values.
+ *
+ * <P>The boolean operators use three-valued logic as defined by the
+ * following tables:
+ *
+ * <P><B>The definition of the <CODE>AND</CODE> operator</B>
+ *
+ * <PRE>
+ * | AND  |   T   |   F   |   U
+ * +------+-------+-------+-------
+ * |  T   |   T   |   F   |   U
+ * |  F   |   F   |   F   |   F
+ * |  U   |   U   |   F   |   U
+ * +------+-------+-------+-------
+ * </PRE>
+ *
+ * <P><B>The definition of the <CODE>OR</CODE> operator</B>
+ *
+ * <PRE>
+ * | OR   |   T   |   F   |   U
+ * +------+-------+-------+--------
+ * |  T   |   T   |   T   |   T
+ * |  F   |   T   |   F   |   U
+ * |  U   |   T   |   U   |   U
+ * +------+-------+-------+-------
+ * </PRE>
+ *
+ * <P><B>The definition of the <CODE>NOT</CODE> operator</B>
+ *
+ * <PRE>
+ * | NOT
+ * +------+------
+ * |  T   |   F
+ * |  F   |   T
+ * |  U   |   U
+ * +------+-------
+ * </PRE>
+ *
+ * <H4>Special Notes</H4>
+ *
+ * <P>When used in a message selector, the <CODE>JMSDeliveryMode</CODE> header
+ *    field is treated as having the values <CODE>'PERSISTENT'</CODE> and
+ *    <CODE>'NON_PERSISTENT'</CODE>.
+ *
+ * <P>Date and time values should use the standard <CODE>long</CODE>
+ *    millisecond value. When a date or time literal is included in a message
+ *    selector, it should be an integer literal for a millisecond value. The
+ *    standard way to produce millisecond values is to use
+ *    <CODE>java.util.Calendar</CODE>.
+ *
+ * <P>Although SQL supports fixed decimal comparison and arithmetic, JMS
+ *    message selectors do not. This is the reason for restricting exact
+ *    numeric literals to those without a decimal (and the addition of
+ *    numerics with a decimal as an alternate representation for
+ *    approximate numeric values).
+ *
+ * <P>SQL comments are not supported.
+ *
+ * @version     1.1 April 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.MessageConsumer#receive()
+ * @see         javax.jms.MessageConsumer#receive(long)
+ * @see         javax.jms.MessageConsumer#receiveNoWait()
+ * @see         javax.jms.MessageListener#onMessage(Message)
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.StreamMessage
+ * @see         javax.jms.TextMessage
+ */
+
+public interface Message
+{
+
+  /** The message producer's default delivery mode is <CODE>PERSISTENT</CODE>.
+   *
+   *  @see DeliveryMode#PERSISTENT
+   */
+  static final int DEFAULT_DELIVERY_MODE = DeliveryMode.PERSISTENT;
+
+  /** The message producer's default priority is 4. 
+   */
+  static final int DEFAULT_PRIORITY = 4;
+
+  /** The message producer's default time to live is unlimited; the message 
+   *  never expires. 
+   */
+  static final long DEFAULT_TIME_TO_LIVE = 0;
+
+  /** Gets the message ID.
+    *
+    * <P>The <CODE>JMSMessageID</CODE> header field contains a value that 
+    * uniquely identifies each message sent by a provider.
+    *  
+    * <P>When a message is sent, <CODE>JMSMessageID</CODE> can be ignored. 
+    * When the <CODE>send</CODE> or <CODE>publish</CODE> method returns, it 
+    * contains a provider-assigned value.
+    *
+    * <P>A <CODE>JMSMessageID</CODE> is a <CODE>String</CODE> value that 
+    * should function as a 
+    * unique key for identifying messages in a historical repository. 
+    * The exact scope of uniqueness is provider-defined. It should at 
+    * least cover all messages for a specific installation of a 
+    * provider, where an installation is some connected set of message 
+    * routers.
+    *
+    * <P>All <CODE>JMSMessageID</CODE> values must start with the prefix 
+    * <CODE>'ID:'</CODE>. 
+    * Uniqueness of message ID values across different providers is 
+    * not required.
+    *
+    * <P>Since message IDs take some effort to create and increase a
+    * message's size, some JMS providers may be able to optimize message
+    * overhead if they are given a hint that the message ID is not used by
+    * an application. By calling the 
+    * <CODE>MessageProducer.setDisableMessageID</CODE> method, a JMS client 
+    * enables this potential optimization for all messages sent by that 
+    * message producer. If the JMS provider accepts this
+    * hint, these messages must have the message ID set to null; if the 
+    * provider ignores the hint, the message ID must be set to its normal 
+    * unique value.
+    *
+    * @return the message ID
+    *
+    * @exception JMSException if the JMS provider fails to get the message ID 
+    *                         due to some internal error.
+    * @see javax.jms.Message#setJMSMessageID(String)
+    * @see javax.jms.MessageProducer#setDisableMessageID(boolean)
+    */
+
+  String getJMSMessageID() throws JMSException;
+
+  /** Sets the message ID.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method
+    * can be used to change the value for a message that has been received.
+    *
+    * @param id the ID of the message
+    *
+    * @exception JMSException if the JMS provider fails to set the message ID 
+    *                         due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSMessageID()
+    */
+
+  void setJMSMessageID(String id) throws JMSException;
+
+  /** Gets the message timestamp.
+    *  
+    * <P>The <CODE>JMSTimestamp</CODE> header field contains the time a 
+    * message was 
+    * handed off to a provider to be sent. It is not the time the 
+    * message was actually transmitted, because the actual send may occur 
+    * later due to transactions or other client-side queueing of messages.
+    *
+    * <P>When a message is sent, <CODE>JMSTimestamp</CODE> is ignored. When 
+    * the <CODE>send</CODE> or <CODE>publish</CODE>
+    * method returns, it contains a time value somewhere in the interval 
+    * between the call and the return. The value is in the format of a normal 
+    * millis time value in the Java programming language.
+    *
+    * <P>Since timestamps take some effort to create and increase a 
+    * message's size, some JMS providers may be able to optimize message 
+    * overhead if they are given a hint that the timestamp is not used by an 
+    * application. By calling the
+    * <CODE>MessageProducer.setDisableMessageTimestamp</CODE> method, a JMS 
+    * client enables this potential optimization for all messages sent by 
+    * that message producer. If the JMS provider accepts this
+    * hint, these messages must have the timestamp set to zero; if the 
+    * provider ignores the hint, the timestamp must be set to its normal 
+    * value.
+    *
+    * @return the message timestamp
+    *
+    * @exception JMSException if the JMS provider fails to get the timestamp
+    *                         due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSTimestamp(long)
+    * @see javax.jms.MessageProducer#setDisableMessageTimestamp(boolean)
+    */
+
+  long getJMSTimestamp() throws JMSException;
+
+  /** Sets the message timestamp.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method
+    * can be used to change the value for a message that has been received.
+    *
+    * @param timestamp the timestamp for this message
+    *  
+    * @exception JMSException if the JMS provider fails to set the timestamp
+    *                         due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSTimestamp()
+    */
+
+  void setJMSTimestamp(long timestamp) throws JMSException;
+
+  /** Gets the correlation ID as an array of bytes for the message.
+    *  
+    * <P>The use of a <CODE>byte[]</CODE> value for 
+    * <CODE>JMSCorrelationID</CODE> is non-portable.
+    *
+    * @return the correlation ID of a message as an array of bytes
+    *
+    * @exception JMSException if the JMS provider fails to get the correlation
+    *                         ID due to some internal error.
+    *  
+    * @see javax.jms.Message#setJMSCorrelationID(String)
+    * @see javax.jms.Message#getJMSCorrelationID()
+    * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
+    */
+
+  byte[] getJMSCorrelationIDAsBytes() throws JMSException;
+
+  /** Sets the correlation ID as an array of bytes for the message.
+    * 
+    * <P>The array is copied before the method returns, so
+    * future modifications to the array will not alter this message header.
+    *  
+    * <P>If a provider supports the native concept of correlation ID, a 
+    * JMS client may need to assign specific <CODE>JMSCorrelationID</CODE> 
+    * values to match those expected by native messaging clients. 
+    * JMS providers without native correlation ID values are not required to 
+    * support this method and its corresponding get method; their 
+    * implementation may throw a
+    * <CODE>java.lang.UnsupportedOperationException</CODE>. 
+    *
+    * <P>The use of a <CODE>byte[]</CODE> value for 
+    * <CODE>JMSCorrelationID</CODE> is non-portable.
+    *
+    * @param correlationID the correlation ID value as an array of bytes
+    *  
+    * @exception JMSException if the JMS provider fails to set the correlation
+    *                         ID due to some internal error.
+    *  
+    * @see javax.jms.Message#setJMSCorrelationID(String)
+    * @see javax.jms.Message#getJMSCorrelationID()
+    * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
+    */
+
+  void setJMSCorrelationIDAsBytes(byte[] correlationID) throws JMSException;
+
+  /** Sets the correlation ID for the message.
+    *  
+    * <P>A client can use the <CODE>JMSCorrelationID</CODE> header field to 
+    * link one message with another. A typical use is to link a response 
+    * message with its request message.
+    *  
+    * <P><CODE>JMSCorrelationID</CODE> can hold one of the following:
+    *    <UL>
+    *      <LI>A provider-specific message ID
+    *      <LI>An application-specific <CODE>String</CODE>
+    *      <LI>A provider-native <CODE>byte[]</CODE> value
+    *    </UL>
+    *  
+    * <P>Since each message sent by a JMS provider is assigned a message ID
+    * value, it is convenient to link messages via message ID. All message ID
+    * values must start with the <CODE>'ID:'</CODE> prefix.
+    *  
+    * <P>In some cases, an application (made up of several clients) needs to
+    * use an application-specific value for linking messages. For instance,
+    * an application may use <CODE>JMSCorrelationID</CODE> to hold a value 
+    * referencing some external information. Application-specified values 
+    * must not start with the <CODE>'ID:'</CODE> prefix; this is reserved for 
+    * provider-generated message ID values.
+    *  
+    * <P>If a provider supports the native concept of correlation ID, a JMS
+    * client may need to assign specific <CODE>JMSCorrelationID</CODE> values 
+    * to match those expected by clients that do not use the JMS API. A 
+    * <CODE>byte[]</CODE> value is used for this
+    * purpose. JMS providers without native correlation ID values are not
+    * required to support <CODE>byte[]</CODE> values. The use of a 
+    * <CODE>byte[]</CODE> value for <CODE>JMSCorrelationID</CODE> is 
+    * non-portable.
+    *  
+    * @param correlationID the message ID of a message being referred to
+    *  
+    * @exception JMSException if the JMS provider fails to set the correlation
+    *                         ID due to some internal error.
+    *  
+    * @see javax.jms.Message#getJMSCorrelationID()
+    * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
+    * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
+    */
+
+  void setJMSCorrelationID(String correlationID) throws JMSException;
+
+  /** Gets the correlation ID for the message.
+    *  
+    * <P>This method is used to return correlation ID values that are 
+    * either provider-specific message IDs or application-specific 
+    * <CODE>String</CODE> values.
+    *
+    * @return the correlation ID of a message as a <CODE>String</CODE>
+    *
+    * @exception JMSException if the JMS provider fails to get the correlation
+    *                         ID due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSCorrelationID(String)
+    * @see javax.jms.Message#getJMSCorrelationIDAsBytes()
+    * @see javax.jms.Message#setJMSCorrelationIDAsBytes(byte[])
+    */
+
+  String getJMSCorrelationID() throws JMSException;
+
+  /** Gets the <CODE>Destination</CODE> object to which a reply to this 
+    * message should be sent.
+    *  
+    * @return <CODE>Destination</CODE> to which to send a response to this 
+    *         message
+    *
+    * @exception JMSException if the JMS provider fails to get the  
+    *                         <CODE>JMSReplyTo</CODE> destination due to some 
+    *                         internal error.
+    *
+    * @see javax.jms.Message#setJMSReplyTo(Destination)
+    */
+
+  Destination getJMSReplyTo() throws JMSException;
+
+  /** Sets the <CODE>Destination</CODE> object to which a reply to this 
+    * message should be sent.
+    *  
+    * <P>The <CODE>JMSReplyTo</CODE> header field contains the destination 
+    * where a reply 
+    * to the current message should be sent. If it is null, no reply is 
+    * expected. The destination may be either a <CODE>Queue</CODE> object or
+    * a <CODE>Topic</CODE> object.
+    *
+    * <P>Messages sent with a null <CODE>JMSReplyTo</CODE> value may be a 
+    * notification of some event, or they may just be some data the sender 
+    * thinks is of interest.
+    *
+    * <P>Messages with a <CODE>JMSReplyTo</CODE> value typically expect a 
+    * response. A response is optional; it is up to the client to decide.  
+    * These messages are called requests. A message sent in response to a 
+    * request is called a reply.
+    *
+    * <P>In some cases a client may wish to match a request it sent earlier 
+    * with a reply it has just received. The client can use the 
+    * <CODE>JMSCorrelationID</CODE> header field for this purpose.
+    *
+    * @param replyTo <CODE>Destination</CODE> to which to send a response to 
+    *                this message
+    *
+    * @exception JMSException if the JMS provider fails to set the  
+    *                         <CODE>JMSReplyTo</CODE> destination due to some 
+    *                         internal error.
+    *
+    * @see javax.jms.Message#getJMSReplyTo()
+    */
+
+  void setJMSReplyTo(Destination replyTo) throws JMSException;
+
+  /** Gets the <CODE>Destination</CODE> object for this message.
+    *  
+    * <P>The <CODE>JMSDestination</CODE> header field contains the 
+    * destination to which the message is being sent.
+    *  
+    * <P>When a message is sent, this field is ignored. After completion
+    * of the <CODE>send</CODE> or <CODE>publish</CODE> method, the field 
+    * holds the destination specified by the method.
+    *  
+    * <P>When a message is received, its <CODE>JMSDestination</CODE> value 
+    * must be equivalent to the value assigned when it was sent.
+    *
+    * @return the destination of this message
+    *  
+    * @exception JMSException if the JMS provider fails to get the destination
+    *                         due to some internal error.
+    *  
+    * @see javax.jms.Message#setJMSDestination(Destination)
+    */
+
+  Destination getJMSDestination() throws JMSException;
+
+  /** Sets the <CODE>Destination</CODE> object for this message.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method 
+    * can be used to change the value for a message that has been received.
+    *
+    * @param destination the destination for this message
+    *  
+    * @exception JMSException if the JMS provider fails to set the destination
+    *                         due to some internal error.
+    *  
+    * @see javax.jms.Message#getJMSDestination()
+    */
+
+  void setJMSDestination(Destination destination) throws JMSException;
+
+  /** Gets the <CODE>DeliveryMode</CODE> value specified for this message.
+    *  
+    * @return the delivery mode for this message
+    *  
+    * @exception JMSException if the JMS provider fails to get the 
+    *                         delivery mode due to some internal error.
+    *  
+    * @see javax.jms.Message#setJMSDeliveryMode(int)
+    * @see javax.jms.DeliveryMode
+    */
+
+  int getJMSDeliveryMode() throws JMSException;
+
+  /** Sets the <CODE>DeliveryMode</CODE> value for this message.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method 
+    * can be used to change the value for a message that has been received.
+    *
+    * @param deliveryMode the delivery mode for this message
+    *  
+    * @exception JMSException if the JMS provider fails to set the 
+    *                         delivery mode due to some internal error.
+    *  
+    * @see javax.jms.Message#getJMSDeliveryMode()
+    * @see javax.jms.DeliveryMode
+    */
+
+  void setJMSDeliveryMode(int deliveryMode) throws JMSException;
+
+  /** Gets an indication of whether this message is being redelivered.
+    *
+    * <P>If a client receives a message with the <CODE>JMSRedelivered</CODE> 
+    * field set,
+    * it is likely, but not guaranteed, that this message was delivered
+    * earlier but that its receipt was not acknowledged
+    * at that time.
+    *
+    * @return true if this message is being redelivered
+    *  
+    * @exception JMSException if the JMS provider fails to get the redelivered
+    *                         state due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSRedelivered(boolean)
+    */
+
+  boolean getJMSRedelivered() throws JMSException;
+
+  /** Specifies whether this message is being redelivered.
+    *  
+    * <P>This field is set at the time the message is delivered. This
+    * method can be used to change the value for a message that has
+    * been received.
+    *
+    * @param redelivered an indication of whether this message is being
+    * redelivered
+    *  
+    * @exception JMSException if the JMS provider fails to set the redelivered
+    *                         state due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSRedelivered()
+    */
+
+  void setJMSRedelivered(boolean redelivered) throws JMSException;
+
+  /** Gets the message type identifier supplied by the client when the
+    * message was sent.
+    *
+    * @return the message type
+    *  
+    * @exception JMSException if the JMS provider fails to get the message 
+    *                         type due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSType(String)
+    */
+
+  String getJMSType() throws JMSException;
+
+  /** Sets the message type.
+    *
+    * <P>Some JMS providers use a message repository that contains the 
+    * definitions of messages sent by applications. The <CODE>JMSType</CODE> 
+    * header field may reference a message's definition in the provider's
+    * repository.
+    *
+    * <P>The JMS API does not define a standard message definition repository,
+    * nor does it define a naming policy for the definitions it contains. 
+    *
+    * <P>Some messaging systems require that a message type definition for 
+    * each application message be created and that each message specify its 
+    * type. In order to work with such JMS providers, JMS clients should 
+    * assign a value to <CODE>JMSType</CODE>, whether the application makes 
+    * use of it or not. This ensures that the field is properly set for those 
+    * providers that require it.
+    *
+    * <P>To ensure portability, JMS clients should use symbolic values for 
+    * <CODE>JMSType</CODE> that can be configured at installation time to the 
+    * values defined in the current provider's message repository. If string 
+    * literals are used, they may not be valid type names for some JMS 
+    * providers.
+    *
+    * @param type the message type
+    *  
+    * @exception JMSException if the JMS provider fails to set the message 
+    *                         type due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSType()
+    */
+
+  void setJMSType(String type) throws JMSException;
+
+  /** Gets the message's expiration value.
+    *  
+    * <P>When a message is sent, the <CODE>JMSExpiration</CODE> header field 
+    * is left unassigned. After completion of the <CODE>send</CODE> or 
+    * <CODE>publish</CODE> method, it holds the expiration time of the
+    * message. This is the sum of the time-to-live value specified by the
+    * client and the GMT at the time of the <CODE>send</CODE> or 
+    * <CODE>publish</CODE>.
+    *
+    * <P>If the time-to-live is specified as zero, <CODE>JMSExpiration</CODE> 
+    * is set to zero to indicate that the message does not expire.
+    *
+    * <P>When a message's expiration time is reached, a provider should
+    * discard it. The JMS API does not define any form of notification of 
+    * message expiration.
+    *
+    * <P>Clients should not receive messages that have expired; however,
+    * the JMS API does not guarantee that this will not happen.
+    *
+    * @return the time the message expires, which is the sum of the
+    * time-to-live value specified by the client and the GMT at the
+    * time of the send
+    *  
+    * @exception JMSException if the JMS provider fails to get the message 
+    *                         expiration due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSExpiration(long)
+    */
+
+  long getJMSExpiration() throws JMSException;
+
+  /** Sets the message's expiration value.
+    *
+    * <P>JMS providers set this field when a message is sent. This method 
+    * can be used to change the value for a message that has been received.
+    *  
+    * @param expiration the message's expiration time
+    *  
+    * @exception JMSException if the JMS provider fails to set the message 
+    *                         expiration due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSExpiration() 
+    */
+
+  void setJMSExpiration(long expiration) throws JMSException;
+
+  /** Gets the message priority level.
+    *  
+    * <P>The JMS API defines ten levels of priority value, with 0 as the 
+    * lowest
+    * priority and 9 as the highest. In addition, clients should consider
+    * priorities 0-4 as gradations of normal priority and priorities 5-9
+    * as gradations of expedited priority.
+    *  
+    * <P>The JMS API does not require that a provider strictly implement 
+    * priority 
+    * ordering of messages; however, it should do its best to deliver 
+    * expedited messages ahead of normal messages.
+    *  
+    * @return the default message priority
+    *  
+    * @exception JMSException if the JMS provider fails to get the message 
+    *                         priority due to some internal error.
+    *
+    * @see javax.jms.Message#setJMSPriority(int) 
+    */
+
+  int getJMSPriority() throws JMSException;
+
+  /** Sets the priority level for this message.
+    *  
+    * <P>JMS providers set this field when a message is sent. This method 
+    * can be used to change the value for a message that has been received.
+    *
+    * @param priority the priority of this message
+    *  
+    * @exception JMSException if the JMS provider fails to set the message 
+    *                         priority due to some internal error.
+    *
+    * @see javax.jms.Message#getJMSPriority() 
+    */
+
+  void setJMSPriority(int priority) throws JMSException;
+
+  /** Clears a message's properties.
+    *
+    * <P>The message's header fields and body are not cleared.
+    *
+    * @exception JMSException if the JMS provider fails to clear the message 
+    *                         properties due to some internal error.
+    */
+
+  void clearProperties() throws JMSException;
+
+  /** Indicates whether a property value exists.
+    *
+    * @param name the name of the property to test
+    *
+    * @return true if the property exists
+    *  
+    * @exception JMSException if the JMS provider fails to determine if the 
+    *                         property exists due to some internal error.
+    */
+
+  boolean propertyExists(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>boolean</CODE> property with the  
+    * specified name.
+    *  
+    * @param name the name of the <CODE>boolean</CODE> property
+    *  
+    * @return the <CODE>boolean</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid. 
+    */
+
+  boolean getBooleanProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>byte</CODE> property with the specified 
+    * name.
+    *  
+    * @param name the name of the <CODE>byte</CODE> property
+    *  
+    * @return the <CODE>byte</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid. 
+    */
+
+  byte getByteProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>short</CODE> property with the specified 
+    * name.
+    *
+    * @param name the name of the <CODE>short</CODE> property
+    *
+    * @return the <CODE>short</CODE> property value for the specified name
+    *
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  short getShortProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>int</CODE> property with the specified 
+    * name.
+    *  
+    * @param name the name of the <CODE>int</CODE> property
+    *  
+    * @return the <CODE>int</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  int getIntProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>long</CODE> property with the specified 
+    * name.
+    *  
+    * @param name the name of the <CODE>long</CODE> property
+    *  
+    * @return the <CODE>long</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  long getLongProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>float</CODE> property with the specified 
+    * name.
+    *  
+    * @param name the name of the <CODE>float</CODE> property
+    *  
+    * @return the <CODE>float</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  float getFloatProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>double</CODE> property with the specified
+    * name.
+    *  
+    * @param name the name of the <CODE>double</CODE> property
+    *  
+    * @return the <CODE>double</CODE> property value for the specified name
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  double getDoubleProperty(String name) throws JMSException;
+
+  /** Returns the value of the <CODE>String</CODE> property with the specified
+    * name.
+    *  
+    * @param name the name of the <CODE>String</CODE> property
+    *  
+    * @return the <CODE>String</CODE> property value for the specified name;
+    * if there is no property by this name, a null value is returned
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    * @exception MessageFormatException if this type conversion is invalid.
+    */
+
+  String getStringProperty(String name) throws JMSException;
+
+  /** Returns the value of the Java object property with the specified name.
+    *  
+    * <P>This method can be used to return, in objectified format,
+    * an object that has been stored as a property in the message with the 
+    * equivalent <CODE>setObjectProperty</CODE> method call, or its equivalent
+    * primitive <CODE>set<I>type</I>Property</CODE> method.
+    *  
+    * @param name the name of the Java object property
+    *  
+    * @return the Java object property value with the specified name, in 
+    * objectified format (for example, if the property was set as an 
+    * <CODE>int</CODE>, an <CODE>Integer</CODE> is 
+    * returned); if there is no property by this name, a null value 
+    * is returned
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                         value due to some internal error.
+    */
+
+  Object getObjectProperty(String name) throws JMSException;
+
+  /** Returns an <CODE>Enumeration</CODE> of all the property names.
+    *
+    * <P>Note that JMS standard header fields are not considered
+    * properties and are not returned in this enumeration.
+    *  
+    * @return an enumeration of all the names of property values
+    *  
+    * @exception JMSException if the JMS provider fails to get the property
+    *                          names due to some internal error.
+    */
+
+  Enumeration getPropertyNames() throws JMSException;
+
+  /** Sets a <CODE>boolean</CODE> property value with the specified name into 
+    * the message.
+    *
+    * @param name the name of the <CODE>boolean</CODE> property
+    * @param value the <CODE>boolean</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setBooleanProperty(String name, boolean value) throws JMSException;
+
+  /** Sets a <CODE>byte</CODE> property value with the specified name into 
+    * the message.
+    *  
+    * @param name the name of the <CODE>byte</CODE> property
+    * @param value the <CODE>byte</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setByteProperty(String name, byte value) throws JMSException;
+
+  /** Sets a <CODE>short</CODE> property value with the specified name into
+    * the message.
+    *  
+    * @param name the name of the <CODE>short</CODE> property
+    * @param value the <CODE>short</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setShortProperty(String name, short value) throws JMSException;
+
+  /** Sets an <CODE>int</CODE> property value with the specified name into
+    * the message.
+    *  
+    * @param name the name of the <CODE>int</CODE> property
+    * @param value the <CODE>int</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setIntProperty(String name, int value) throws JMSException;
+
+  /** Sets a <CODE>long</CODE> property value with the specified name into 
+    * the message.
+    *  
+    * @param name the name of the <CODE>long</CODE> property
+    * @param value the <CODE>long</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setLongProperty(String name, long value) throws JMSException;
+
+  /** Sets a <CODE>float</CODE> property value with the specified name into 
+    * the message.
+    *  
+    * @param name the name of the <CODE>float</CODE> property
+    * @param value the <CODE>float</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setFloatProperty(String name, float value) throws JMSException;
+
+  /** Sets a <CODE>double</CODE> property value with the specified name into 
+    * the message.
+    *  
+    * @param name the name of the <CODE>double</CODE> property
+    * @param value the <CODE>double</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setDoubleProperty(String name, double value) throws JMSException;
+
+  /** Sets a <CODE>String</CODE> property value with the specified name into 
+    * the message.
+    *
+    * @param name the name of the <CODE>String</CODE> property
+    * @param value the <CODE>String</CODE> property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setStringProperty(String name, String value) throws JMSException;
+
+  /** Sets a Java object property value with the specified name into the 
+    * message.
+    *  
+    * <P>Note that this method works only for the objectified primitive
+    * object types (<CODE>Integer</CODE>, <CODE>Double</CODE>, 
+    * <CODE>Long</CODE> ...) and <CODE>String</CODE> objects.
+    *  
+    * @param name the name of the Java object property
+    * @param value the Java object property value to set
+    *  
+    * @exception JMSException if the JMS provider fails to set the property
+    *                          due to some internal error.
+    * @exception IllegalArgumentException if the name is null or if the name is
+    *                          an empty string.
+    * @exception MessageFormatException if the object is invalid
+    * @exception MessageNotWriteableException if properties are read-only
+    */
+
+  void setObjectProperty(String name, Object value) throws JMSException;
+
+  /** Acknowledges all consumed messages of the session of this consumed 
+    * message.
+    *  
+    * <P>All consumed JMS messages support the <CODE>acknowledge</CODE> 
+    * method for use when a client has specified that its JMS session's 
+    * consumed messages are to be explicitly acknowledged.  By invoking 
+    * <CODE>acknowledge</CODE> on a consumed message, a client acknowledges 
+    * all messages consumed by the session that the message was delivered to.
+    * 
+    * <P>Calls to <CODE>acknowledge</CODE> are ignored for both transacted 
+    * sessions and sessions specified to use implicit acknowledgement modes.
+    *
+    * <P>A client may individually acknowledge each message as it is consumed,
+    * or it may choose to acknowledge messages as an application-defined group 
+    * (which is done by calling acknowledge on the last received message of the group,
+    *  thereby acknowledging all messages consumed by the session.)
+    *
+    * <P>Messages that have been received but not acknowledged may be 
+    * redelivered.
+    *
+    * @exception JMSException if the JMS provider fails to acknowledge the
+    *                         messages due to some internal error.
+    * @exception IllegalStateException if this method is called on a closed
+    *                         session.
+    *
+    * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
+    */
+
+  void acknowledge() throws JMSException;
+
+  /** Clears out the message body. Clearing a message's body does not clear 
+    * its header values or property entries.
+    *
+    * <P>If this message body was read-only, calling this method leaves
+    * the message body in the same state as an empty body in a newly
+    * created message.
+    *
+    * @exception JMSException if the JMS provider fails to clear the message
+    *                         body due to some internal error.
+    */
+
+  void clearBody() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java
index f6e7664b6e..9dec6829b4 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageConsumer.java
@@ -1,191 +1,179 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A client uses a <CODE>MessageConsumer</CODE> object to receive messages 
-  * from a destination.  A <CODE>MessageConsumer</CODE> object is created by 
-  * passing a <CODE>Destination</CODE> object to a message-consumer creation
-  * method supplied by a session.
-  *
-  * <P><CODE>MessageConsumer</CODE> is the parent interface for all message 
-  * consumers.
-  *
-  * <P>A message consumer can be created with a message selector. A message
-  * selector allows 
-  * the client to restrict the messages delivered to the message consumer to 
-  * those that match the selector.
-  *
-  * <P>A client may either synchronously receive a message consumer's messages 
-  * or have the consumer asynchronously deliver them as they arrive.
-  *
-  * <P>For synchronous receipt, a client can request the next message from a 
-  * message consumer using one of its <CODE>receive</CODE> methods. There are 
-  * several variations of <CODE>receive</CODE> that allow a 
-  * client to poll or wait for the next message.
-  *
-  * <P>For asynchronous delivery, a client can register a 
-  * <CODE>MessageListener</CODE> object with a message consumer. 
-  * As messages arrive at the message consumer, it delivers them by calling the 
-  * <CODE>MessageListener</CODE>'s <CODE>onMessage</CODE> method.
-  *
-  * <P>It is a client programming error for a <CODE>MessageListener</CODE> to 
-  * throw an exception.
-  *
-  * @version     1.0 - 13 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.QueueReceiver
-  * @see         javax.jms.TopicSubscriber
-  * @see         javax.jms.Session
-  */
-
-public interface MessageConsumer {
-
-    /** Gets this message consumer's message selector expression.
-      *  
-      * @return this message consumer's message selector, or null if no
-      *         message selector exists for the message consumer (that is, if 
-      *         the message selector was not set or was set to null or the 
-      *         empty string)
-      *  
-      * @exception JMSException if the JMS provider fails to get the message
-      *                         selector due to some internal error.
-      */ 
-
-    String
-    getMessageSelector() throws JMSException;
-
-
-    /** Gets the message consumer's <CODE>MessageListener</CODE>.
-      *  
-      * @return the listener for the message consumer, or null if no listener
-      * is set
-      *  
-      * @exception JMSException if the JMS provider fails to get the message
-      *                         listener due to some internal error.
-      * @see javax.jms.MessageConsumer#setMessageListener
-      */ 
-
-    MessageListener
-    getMessageListener() throws JMSException;
-
-
-    /** Sets the message consumer's <CODE>MessageListener</CODE>.
-      * 
-      * <P>Setting the message listener to null is the equivalent of 
-      * unsetting the message listener for the message consumer.
-      *
-      * <P>The effect of calling <CODE>MessageConsumer.setMessageListener</CODE>
-      * while messages are being consumed by an existing listener
-      * or the consumer is being used to consume messages synchronously
-      * is undefined.
-      *  
-      * @param listener the listener to which the messages are to be 
-      *                 delivered
-      *  
-      * @exception JMSException if the JMS provider fails to set the message
-      *                         listener due to some internal error.
-      * @see javax.jms.MessageConsumer#getMessageListener
-      */ 
-
-    void
-    setMessageListener(MessageListener listener) throws JMSException;
-
-
-    /** Receives the next message produced for this message consumer.
-      *  
-      * <P>This call blocks indefinitely until a message is produced
-      * or until this message consumer is closed.
-      *
-      * <P>If this <CODE>receive</CODE> is done within a transaction, the 
-      * consumer retains the message until the transaction commits.
-      *  
-      * @return the next message produced for this message consumer, or 
-      * null if this message consumer is concurrently closed
-      *  
-      * @exception JMSException if the JMS provider fails to receive the next
-      *                         message due to some internal error.
-      * 
-      */ 
- 
-    Message
-    receive() throws JMSException;
-
-
-    /** Receives the next message that arrives within the specified
-      * timeout interval.
-      *  
-      * <P>This call blocks until a message arrives, the
-      * timeout expires, or this message consumer is closed.
-      * A <CODE>timeout</CODE> of zero never expires, and the call blocks 
-      * indefinitely.
-      *
-      * @param timeout the timeout value (in milliseconds)
-      *
-      * @return the next message produced for this message consumer, or 
-      * null if the timeout expires or this message consumer is concurrently 
-      * closed
-      *
-      * @exception JMSException if the JMS provider fails to receive the next
-      *                         message due to some internal error.
-      */ 
-
-    Message
-    receive(long timeout) throws JMSException;
-
-
-    /** Receives the next message if one is immediately available.
-      *
-      * @return the next message produced for this message consumer, or 
-      * null if one is not available
-      *  
-      * @exception JMSException if the JMS provider fails to receive the next
-      *                         message due to some internal error.
-      */ 
-
-    Message
-    receiveNoWait() throws JMSException;
-
-
-    /** Closes the message consumer.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a
-      * <CODE>MessageConsumer</CODE> outside the Java virtual machine, clients 
-      * should close them when they
-      * are not needed. Relying on garbage collection to eventually reclaim
-      * these resources may not be timely enough.
-      *
-      * <P>This call blocks until a <CODE>receive</CODE> or message listener in 
-      * progress has completed. A blocked message consumer <CODE>receive</CODE> 
-      * call 
-      * returns null when this message consumer is closed.
-      *  
-      * @exception JMSException if the JMS provider fails to close the consumer
-      *                         due to some internal error.
-      */ 
-
-    void
-    close() throws JMSException;
+/** A client uses a <CODE>MessageConsumer</CODE> object to receive messages
+ * from a destination.  A <CODE>MessageConsumer</CODE> object is created by
+ * passing a <CODE>Destination</CODE> object to a message-consumer creation
+ * method supplied by a session.
+ *
+ * <P><CODE>MessageConsumer</CODE> is the parent interface for all message
+ * consumers.
+ *
+ * <P>A message consumer can be created with a message selector. A message
+ * selector allows
+ * the client to restrict the messages delivered to the message consumer to
+ * those that match the selector.
+ *
+ * <P>A client may either synchronously receive a message consumer's messages
+ * or have the consumer asynchronously deliver them as they arrive.
+ *
+ * <P>For synchronous receipt, a client can request the next message from a
+ * message consumer using one of its <CODE>receive</CODE> methods. There are
+ * several variations of <CODE>receive</CODE> that allow a
+ * client to poll or wait for the next message.
+ *
+ * <P>For asynchronous delivery, a client can register a
+ * <CODE>MessageListener</CODE> object with a message consumer.
+ * As messages arrive at the message consumer, it delivers them by calling the
+ * <CODE>MessageListener</CODE>'s <CODE>onMessage</CODE> method.
+ *
+ * <P>It is a client programming error for a <CODE>MessageListener</CODE> to
+ * throw an exception.
+ *
+ * @version     1.0 - 13 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.QueueReceiver
+ * @see         javax.jms.TopicSubscriber
+ * @see         javax.jms.Session
+ */
+
+public interface MessageConsumer
+{
+
+  /** Gets this message consumer's message selector expression.
+    *  
+    * @return this message consumer's message selector, or null if no
+    *         message selector exists for the message consumer (that is, if 
+    *         the message selector was not set or was set to null or the 
+    *         empty string)
+    *  
+    * @exception JMSException if the JMS provider fails to get the message
+    *                         selector due to some internal error.
+    */
+
+  String getMessageSelector() throws JMSException;
+
+  /** Gets the message consumer's <CODE>MessageListener</CODE>.
+    *  
+    * @return the listener for the message consumer, or null if no listener
+    * is set
+    *  
+    * @exception JMSException if the JMS provider fails to get the message
+    *                         listener due to some internal error.
+    * @see javax.jms.MessageConsumer#setMessageListener
+    */
+
+  MessageListener getMessageListener() throws JMSException;
+
+  /** Sets the message consumer's <CODE>MessageListener</CODE>.
+    * 
+    * <P>Setting the message listener to null is the equivalent of 
+    * unsetting the message listener for the message consumer.
+    *
+    * <P>The effect of calling <CODE>MessageConsumer.setMessageListener</CODE>
+    * while messages are being consumed by an existing listener
+    * or the consumer is being used to consume messages synchronously
+    * is undefined.
+    *  
+    * @param listener the listener to which the messages are to be 
+    *                 delivered
+    *  
+    * @exception JMSException if the JMS provider fails to set the message
+    *                         listener due to some internal error.
+    * @see javax.jms.MessageConsumer#getMessageListener
+    */
+
+  void setMessageListener(MessageListener listener) throws JMSException;
+
+  /** Receives the next message produced for this message consumer.
+    *  
+    * <P>This call blocks indefinitely until a message is produced
+    * or until this message consumer is closed.
+    *
+    * <P>If this <CODE>receive</CODE> is done within a transaction, the 
+    * consumer retains the message until the transaction commits.
+    *  
+    * @return the next message produced for this message consumer, or 
+    * null if this message consumer is concurrently closed
+    *  
+    * @exception JMSException if the JMS provider fails to receive the next
+    *                         message due to some internal error.
+    * 
+    */
+
+  Message receive() throws JMSException;
+
+  /** Receives the next message that arrives within the specified
+    * timeout interval.
+    *  
+    * <P>This call blocks until a message arrives, the
+    * timeout expires, or this message consumer is closed.
+    * A <CODE>timeout</CODE> of zero never expires, and the call blocks 
+    * indefinitely.
+    *
+    * @param timeout the timeout value (in milliseconds)
+    *
+    * @return the next message produced for this message consumer, or 
+    * null if the timeout expires or this message consumer is concurrently 
+    * closed
+    *
+    * @exception JMSException if the JMS provider fails to receive the next
+    *                         message due to some internal error.
+    */
+
+  Message receive(long timeout) throws JMSException;
+
+  /** Receives the next message if one is immediately available.
+    *
+    * @return the next message produced for this message consumer, or 
+    * null if one is not available
+    *  
+    * @exception JMSException if the JMS provider fails to receive the next
+    *                         message due to some internal error.
+    */
+
+  Message receiveNoWait() throws JMSException;
+
+  /** Closes the message consumer.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a
+    * <CODE>MessageConsumer</CODE> outside the Java virtual machine, clients 
+    * should close them when they
+    * are not needed. Relying on garbage collection to eventually reclaim
+    * these resources may not be timely enough.
+    *
+    * <P>This call blocks until a <CODE>receive</CODE> or message listener in 
+    * progress has completed. A blocked message consumer <CODE>receive</CODE> 
+    * call 
+    * returns null when this message consumer is closed.
+    *  
+    * @exception JMSException if the JMS provider fails to close the consumer
+    *                         due to some internal error.
+    */
+
+  void close() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageEOFException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageEOFException.java
index 1006ebd816..6f078d7f50 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageEOFException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageEOFException.java
@@ -1,60 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when an unexpected 
- *     end of stream has been reached when a <CODE>StreamMessage</CODE> or 
+ * <P> This exception must be thrown when an unexpected
+ *     end of stream has been reached when a <CODE>StreamMessage</CODE> or
  *     <CODE>BytesMessage</CODE> is being read.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class MessageEOFException extends JMSException {
+public class MessageEOFException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>MessageEOFException</CODE> with the specified 
+  /** Constructs a <CODE>MessageEOFException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  MessageEOFException(String reason, String errorCode) {
+  public MessageEOFException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>MessageEOFException</CODE> with the specified 
+  /** Constructs a <CODE>MessageEOFException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  MessageEOFException(String reason) {
+  public MessageEOFException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageFormatException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageFormatException.java
index 50b685cf03..29ea4275e7 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageFormatException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageFormatException.java
@@ -1,68 +1,70 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a JMS client 
- *     attempts to use a data type not supported by a message or attempts to 
- *     read data in a message as the wrong type. It must also be thrown when 
- *     equivalent type errors are made with message property values. For 
- *     example, this exception must be thrown if 
- *     <CODE>StreamMessage.writeObject</CODE> is given an unsupported class or 
- *     if <CODE>StreamMessage.readShort</CODE> is used to read a 
- *     <CODE>boolean</CODE> value. Note that the special case of a failure 
- *     caused by an attempt to read improperly formatted <CODE>String</CODE> 
- *     data as numeric values must throw the 
+ * <P> This exception must be thrown when a JMS client
+ *     attempts to use a data type not supported by a message or attempts to
+ *     read data in a message as the wrong type. It must also be thrown when
+ *     equivalent type errors are made with message property values. For
+ *     example, this exception must be thrown if
+ *     <CODE>StreamMessage.writeObject</CODE> is given an unsupported class or
+ *     if <CODE>StreamMessage.readShort</CODE> is used to read a
+ *     <CODE>boolean</CODE> value. Note that the special case of a failure
+ *     caused by an attempt to read improperly formatted <CODE>String</CODE>
+ *     data as numeric values must throw the
  *     <CODE>java.lang.NumberFormatException</CODE>.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class MessageFormatException extends JMSException {
+public class MessageFormatException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>MessageFormatException</CODE> with the specified 
+  /** Constructs a <CODE>MessageFormatException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  MessageFormatException(String reason, String errorCode) {
+  public MessageFormatException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>MessageFormatException</CODE> with the specified 
+  /** Constructs a <CODE>MessageFormatException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  MessageFormatException(String reason) {
+  public MessageFormatException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageListener.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageListener.java
index a35fa42b4f..45de33ddb2 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageListener.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageListener.java
@@ -1,51 +1,49 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
+/** A <CODE>MessageListener</CODE> object is used to receive asynchronously
+ * delivered messages.
+ *
+ * <P>Each session must insure that it passes messages serially to the
+ * listener. This means that a listener assigned to one or more consumers
+ * of the same session can assume that the <CODE>onMessage</CODE> method
+ * is not called with the next message until the session has completed the
+ * last call.
+ *
+ * @version     1.0 - 13 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ */
 
-/** A <CODE>MessageListener</CODE> object is used to receive asynchronously 
-  * delivered messages.
-  *
-  * <P>Each session must insure that it passes messages serially to the
-  * listener. This means that a listener assigned to one or more consumers
-  * of the same session can assume that the <CODE>onMessage</CODE> method 
-  * is not called with the next message until the session has completed the 
-  * last call.
-  *
-  * @version     1.0 - 13 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  */
-
-public interface MessageListener {
+public interface MessageListener
+{
 
-    /** Passes a message to the listener.
-      *
-      * @param message the message passed to the listener
-      */
+  /** Passes a message to the listener.
+    *
+    * @param message the message passed to the listener
+    */
 
-    void 
-    onMessage(Message message);
+  void onMessage(Message message);
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotReadableException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotReadableException.java
index 95c90b5352..f59631aea3 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotReadableException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotReadableException.java
@@ -1,59 +1,61 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a JMS client attempts to read a 
+ * <P> This exception must be thrown when a JMS client attempts to read a
  *     write-only message.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class MessageNotReadableException extends JMSException {
+public class MessageNotReadableException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>MessageNotReadableException</CODE> with the specified 
+  /** Constructs a <CODE>MessageNotReadableException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  MessageNotReadableException(String reason, String errorCode) {
+  public MessageNotReadableException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>MessageNotReadableException</CODE> with the specified 
+  /** Constructs a <CODE>MessageNotReadableException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  MessageNotReadableException(String reason) {
+  public MessageNotReadableException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotWriteableException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotWriteableException.java
index b8852c9905..f9fbac67c2 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotWriteableException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageNotWriteableException.java
@@ -1,59 +1,61 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a JMS client attempts to write to a 
+ * <P> This exception must be thrown when a JMS client attempts to write to a
  *     read-only message.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class MessageNotWriteableException extends JMSException {
+public class MessageNotWriteableException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>MessageNotWriteableException</CODE> with the specified 
+  /** Constructs a <CODE>MessageNotWriteableException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  MessageNotWriteableException(String reason, String errorCode) {
+  public MessageNotWriteableException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>MessageNotWriteableException</CODE> with the specified 
+  /** Constructs a <CODE>MessageNotWriteableException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  MessageNotWriteableException(String reason) {
+  public MessageNotWriteableException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
index a9658bb771..0e1f68dcd8 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/MessageProducer.java
@@ -1,389 +1,353 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A client uses a <CODE>MessageProducer</CODE> object to send messages to a 
-  * destination. A <CODE>MessageProducer</CODE> object is created by passing a 
-  * <CODE>Destination</CODE> object to a message-producer creation method 
-  * supplied by a session.
-  *
-  * <P><CODE>MessageProducer</CODE> is the parent interface for all message 
-  * producers.
-  *
-  * <P>A client also has the option of creating a message producer without 
-  * supplying a destination. In this case, a destination must be provided with 
-  * every send operation. A typical use for this kind of message producer is
-  * to send replies to requests using the request's <CODE>JMSReplyTo</CODE> 
-  * destination.
-  *
-  * <P>A client can specify a default delivery mode, priority, and time to live 
-  * for messages sent by a message producer. It can also specify the delivery 
-  * mode, priority, and time to live for an individual message.
-  *
-  * <P>A client can specify a time-to-live value in milliseconds for each
-  * message it sends. This value defines a message expiration time that
-  * is the sum of the message's time-to-live and the GMT when it is sent (for
-  * transacted sends, this is the time the client sends the message, not
-  * the time the transaction is committed).
-  *
-  * <P>A JMS provider should do its best to expire messages accurately;
-  * however, the JMS API does not define the accuracy provided.
+/** A client uses a <CODE>MessageProducer</CODE> object to send messages to a
+ * destination. A <CODE>MessageProducer</CODE> object is created by passing a
+ * <CODE>Destination</CODE> object to a message-producer creation method
+ * supplied by a session.
+ *
+ * <P><CODE>MessageProducer</CODE> is the parent interface for all message
+ * producers.
+ *
+ * <P>A client also has the option of creating a message producer without
+ * supplying a destination. In this case, a destination must be provided with
+ * every send operation. A typical use for this kind of message producer is
+ * to send replies to requests using the request's <CODE>JMSReplyTo</CODE>
+ * destination.
+ *
+ * <P>A client can specify a default delivery mode, priority, and time to live
+ * for messages sent by a message producer. It can also specify the delivery
+ * mode, priority, and time to live for an individual message.
+ *
+ * <P>A client can specify a time-to-live value in milliseconds for each
+ * message it sends. This value defines a message expiration time that
+ * is the sum of the message's time-to-live and the GMT when it is sent (for
+ * transacted sends, this is the time the client sends the message, not
+ * the time the transaction is committed).
+ *
+ * <P>A JMS provider should do its best to expire messages accurately;
+ * however, the JMS API does not define the accuracy provided.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.TopicPublisher
+ * @see         javax.jms.QueueSender
+ * @see         javax.jms.Session#createProducer
+ */
+
+public interface MessageProducer
+{
+
+  /** Sets whether message IDs are disabled.
+    *  
+    * <P>Since message IDs take some effort to create and increase a
+    * message's size, some JMS providers may be able to optimize message
+    * overhead if they are given a hint that the message ID is not used by
+    * an application. By calling the <CODE>setDisableMessageID</CODE>  
+    * method on this message producer, a JMS client enables this potential 
+    * optimization for all messages sent by this message producer. If the JMS 
+    * provider accepts this hint, 
+    * these messages must have the message ID set to null; if the provider 
+    * ignores the hint, the message ID must be set to its normal unique value.
+    *
+    * <P>Message IDs are enabled by default.
+    *
+    * @param value indicates if message IDs are disabled
+    *  
+    * @exception JMSException if the JMS provider fails to set message ID to
+    *                         disabled due to some internal error.
+    */
+
+  void setDisableMessageID(boolean value) throws JMSException;
+
+  /** Gets an indication of whether message IDs are disabled.
+    *  
+    * @return an indication of whether message IDs are disabled
+    *  
+    * @exception JMSException if the JMS provider fails to determine if 
+    *                         message IDs are disabled due to some internal 
+    *                         error.
+    */
+
+  boolean getDisableMessageID() throws JMSException;
+
+  /** Sets whether message timestamps are disabled.
+    *  
+    * <P>Since timestamps take some effort to create and increase a 
+    * message's size, some JMS providers may be able to optimize message 
+    * overhead if they are given a hint that the timestamp is not used by an 
+    * application. By calling the <CODE>setDisableMessageTimestamp</CODE> 
+    * method on this message producer, a JMS client enables this potential 
+    * optimization for all messages sent by this message producer.  If the 
+    * JMS provider accepts this hint, 
+    * these messages must have the timestamp set to zero; if the provider 
+    * ignores the hint, the timestamp must be set to its normal value.
+    *  
+    * <P>Message timestamps are enabled by default.
+    *
+    * @param value indicates if message timestamps are disabled
+    *  
+    * @exception JMSException if the JMS provider fails to set timestamps to
+    *                         disabled due to some internal error.
+    */
+
+  void setDisableMessageTimestamp(boolean value) throws JMSException;
+
+  /** Gets an indication of whether message timestamps are disabled.
+    *  
+    * @return an indication of whether message timestamps are disabled
+    *  
+    * @exception JMSException if the JMS provider fails to determine if 
+    *                         timestamps are disabled due to some internal 
+    *                         error.
+    */
+
+  boolean getDisableMessageTimestamp() throws JMSException;
+
+  /** Sets the producer's default delivery mode.
+    *  
+    * <P>Delivery mode is set to <CODE>PERSISTENT</CODE> by default.
+    *
+    * @param deliveryMode the message delivery mode for this message
+    * producer; legal values are <code>DeliveryMode.NON_PERSISTENT</code>
+    * and <code>DeliveryMode.PERSISTENT</code>
+    *  
+    * @exception JMSException if the JMS provider fails to set the delivery 
+    *                         mode due to some internal error.          
+    *
+    * @see javax.jms.MessageProducer#getDeliveryMode
+    * @see javax.jms.DeliveryMode#NON_PERSISTENT
+    * @see javax.jms.DeliveryMode#PERSISTENT
+    * @see javax.jms.Message#DEFAULT_DELIVERY_MODE
+    */
+
+  void setDeliveryMode(int deliveryMode) throws JMSException;
+
+  /** Gets the producer's default delivery mode.
+    *  
+    * @return the message delivery mode for this message producer
+    *  
+    * @exception JMSException if the JMS provider fails to get the delivery 
+    *                         mode due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#setDeliveryMode
+    */
+
+  int getDeliveryMode() throws JMSException;
+
+  /** Sets the producer's default priority.
+    *  
+    * <P>The JMS API defines ten levels of priority value, with 0 as the 
+    * lowest priority and 9 as the highest. Clients should consider priorities
+    * 0-4 as gradations of normal priority and priorities 5-9 as gradations 
+    * of expedited priority. Priority is set to 4 by default.
+    *
+    * @param defaultPriority the message priority for this message producer;
+    *                        must be a value between 0 and 9
+    * 
+    *  
+    * @exception JMSException if the JMS provider fails to set the priority
+    *                         due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#getPriority
+    * @see javax.jms.Message#DEFAULT_PRIORITY
+    */
+
+  void setPriority(int defaultPriority) throws JMSException;
+
+  /** Gets the producer's default priority.
+    *  
+    * @return the message priority for this message producer
+    *  
+    * @exception JMSException if the JMS provider fails to get the priority
+    *                         due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#setPriority
+    */
+
+  int getPriority() throws JMSException;
+
+  /** Sets the default length of time in milliseconds from its dispatch time
+    * that a produced message should be retained by the message system.
+    *
+    * <P>Time to live is set to zero by default.
+    *
+    * @param timeToLive the message time to live in milliseconds; zero is
+    * unlimited
+    *
+    * @exception JMSException if the JMS provider fails to set the time to 
+    *                         live due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#getTimeToLive
+    * @see javax.jms.Message#DEFAULT_TIME_TO_LIVE
+    */
+
+  void setTimeToLive(long timeToLive) throws JMSException;
+
+  /** Gets the default length of time in milliseconds from its dispatch time
+    * that a produced message should be retained by the message system.
+    *
+    * @return the message time to live in milliseconds; zero is unlimited
+    *
+    * @exception JMSException if the JMS provider fails to get the time to 
+    *                         live due to some internal error.
+    *
+    * @see javax.jms.MessageProducer#setTimeToLive
+    */
+
+  long getTimeToLive() throws JMSException;
+
+  /** Gets the destination associated with this <CODE>MessageProducer</CODE>.
+    *  
+    * @return this producer's <CODE>Destination/<CODE>
+    *  
+    * @exception JMSException if the JMS provider fails to get the destination for
+    *                         this <CODE>MessageProducer</CODE>
+    *                         due to some internal error.
+    *@since 1.1 
+    */
+
+  Destination getDestination() throws JMSException;
+
+  /** Closes the message producer.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a
+    * <CODE>MessageProducer</CODE> outside the Java virtual machine, clients 
+    * should close them when they
+    * are not needed. Relying on garbage collection to eventually reclaim
+    * these resources may not be timely enough.
+    *  
+    * @exception JMSException if the JMS provider fails to close the producer
+    *                         due to some internal error.
+    */
+
+  void close() throws JMSException;
+
+  /** Sends a message using the <CODE>MessageProducer</CODE>'s 
+  * default delivery mode, priority, and time to live.
   *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
+  * @param message the message to send 
+  *  
+  * @exception JMSException if the JMS provider fails to send the message 
+  *                         due to some internal error.
+  * @exception MessageFormatException if an invalid message is specified.
+  * @exception InvalidDestinationException if a client uses
+  *                         this method with a <CODE>MessageProducer</CODE> with
+  *                         an invalid destination.
+  * @exception java.lang.UnsupportedOperationException if a client uses this
+  *                         method with a <CODE>MessageProducer</CODE> that did
+  *                         not specify a destination at creation time.
+  * 
+  * @see javax.jms.Session#createProducer 
+  * @see javax.jms.MessageProducer 
   *
-  * @see         javax.jms.TopicPublisher
-  * @see         javax.jms.QueueSender
-  * @see         javax.jms.Session#createProducer
+  * @since 1.1 
   */
 
-public interface MessageProducer {
-
-    /** Sets whether message IDs are disabled.
-      *  
-      * <P>Since message IDs take some effort to create and increase a
-      * message's size, some JMS providers may be able to optimize message
-      * overhead if they are given a hint that the message ID is not used by
-      * an application. By calling the <CODE>setDisableMessageID</CODE>  
-      * method on this message producer, a JMS client enables this potential 
-      * optimization for all messages sent by this message producer. If the JMS 
-      * provider accepts this hint, 
-      * these messages must have the message ID set to null; if the provider 
-      * ignores the hint, the message ID must be set to its normal unique value.
-      *
-      * <P>Message IDs are enabled by default.
-      *
-      * @param value indicates if message IDs are disabled
-      *  
-      * @exception JMSException if the JMS provider fails to set message ID to
-      *                         disabled due to some internal error.
-      */ 
-
-    void
-    setDisableMessageID(boolean value) throws JMSException;
-
-
-    /** Gets an indication of whether message IDs are disabled.
-      *  
-      * @return an indication of whether message IDs are disabled
-      *  
-      * @exception JMSException if the JMS provider fails to determine if 
-      *                         message IDs are disabled due to some internal 
-      *                         error.
-      */ 
-
-    boolean 
-    getDisableMessageID() throws JMSException;
-
-
-    /** Sets whether message timestamps are disabled.
-      *  
-      * <P>Since timestamps take some effort to create and increase a 
-      * message's size, some JMS providers may be able to optimize message 
-      * overhead if they are given a hint that the timestamp is not used by an 
-      * application. By calling the <CODE>setDisableMessageTimestamp</CODE> 
-      * method on this message producer, a JMS client enables this potential 
-      * optimization for all messages sent by this message producer.  If the 
-      * JMS provider accepts this hint, 
-      * these messages must have the timestamp set to zero; if the provider 
-      * ignores the hint, the timestamp must be set to its normal value.
-      *  
-      * <P>Message timestamps are enabled by default.
-      *
-      * @param value indicates if message timestamps are disabled
-      *  
-      * @exception JMSException if the JMS provider fails to set timestamps to
-      *                         disabled due to some internal error.
-      */ 
-
-    void
-    setDisableMessageTimestamp(boolean value) throws JMSException;
-
-
-    /** Gets an indication of whether message timestamps are disabled.
-      *  
-      * @return an indication of whether message timestamps are disabled
-      *  
-      * @exception JMSException if the JMS provider fails to determine if 
-      *                         timestamps are disabled due to some internal 
-      *                         error.
-      */ 
-
-    boolean
-    getDisableMessageTimestamp() throws JMSException;
-
-
-    /** Sets the producer's default delivery mode.
-      *  
-      * <P>Delivery mode is set to <CODE>PERSISTENT</CODE> by default.
-      *
-      * @param deliveryMode the message delivery mode for this message
-      * producer; legal values are <code>DeliveryMode.NON_PERSISTENT</code>
-      * and <code>DeliveryMode.PERSISTENT</code>
-      *  
-      * @exception JMSException if the JMS provider fails to set the delivery 
-      *                         mode due to some internal error.          
-      *
-      * @see javax.jms.MessageProducer#getDeliveryMode
-      * @see javax.jms.DeliveryMode#NON_PERSISTENT
-      * @see javax.jms.DeliveryMode#PERSISTENT
-      * @see javax.jms.Message#DEFAULT_DELIVERY_MODE
-      */ 
-
-    void
-    setDeliveryMode(int deliveryMode) throws JMSException;
-
-
-    /** Gets the producer's default delivery mode.
-      *  
-      * @return the message delivery mode for this message producer
-      *  
-      * @exception JMSException if the JMS provider fails to get the delivery 
-      *                         mode due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#setDeliveryMode
-      */ 
-
-    int 
-    getDeliveryMode() throws JMSException;
-
-
-    /** Sets the producer's default priority.
-      *  
-      * <P>The JMS API defines ten levels of priority value, with 0 as the 
-      * lowest priority and 9 as the highest. Clients should consider priorities
-      * 0-4 as gradations of normal priority and priorities 5-9 as gradations 
-      * of expedited priority. Priority is set to 4 by default.
-      *
-      * @param defaultPriority the message priority for this message producer;
-      *                        must be a value between 0 and 9
-      * 
-      *  
-      * @exception JMSException if the JMS provider fails to set the priority
-      *                         due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#getPriority
-      * @see javax.jms.Message#DEFAULT_PRIORITY
-      */ 
-
-    void
-    setPriority(int defaultPriority) throws JMSException;
-
-
-    /** Gets the producer's default priority.
-      *  
-      * @return the message priority for this message producer
-      *  
-      * @exception JMSException if the JMS provider fails to get the priority
-      *                         due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#setPriority
-      */ 
-
-    int 
-    getPriority() throws JMSException;
-
-
-    /** Sets the default length of time in milliseconds from its dispatch time
-      * that a produced message should be retained by the message system.
-      *
-      * <P>Time to live is set to zero by default.
-      *
-      * @param timeToLive the message time to live in milliseconds; zero is
-      * unlimited
-      *
-      * @exception JMSException if the JMS provider fails to set the time to 
-      *                         live due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#getTimeToLive
-      * @see javax.jms.Message#DEFAULT_TIME_TO_LIVE
-      */
-   
-    void
-    setTimeToLive(long timeToLive) throws JMSException;
-   
-   
-    /** Gets the default length of time in milliseconds from its dispatch time
-      * that a produced message should be retained by the message system.
-      *
-      * @return the message time to live in milliseconds; zero is unlimited
-      *
-      * @exception JMSException if the JMS provider fails to get the time to 
-      *                         live due to some internal error.
-      *
-      * @see javax.jms.MessageProducer#setTimeToLive
-      */ 
- 
-    long
-    getTimeToLive() throws JMSException;
-
-    /** Gets the destination associated with this <CODE>MessageProducer</CODE>.
-      *  
-      * @return this producer's <CODE>Destination/<CODE>
-      *  
-      * @exception JMSException if the JMS provider fails to get the destination for
-      *                         this <CODE>MessageProducer</CODE>
-      *                         due to some internal error.
-      *@since 1.1 
-      */ 
-    
-    Destination 
-    getDestination() throws JMSException;
-    
-    /** Closes the message producer.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a
-      * <CODE>MessageProducer</CODE> outside the Java virtual machine, clients 
-      * should close them when they
-      * are not needed. Relying on garbage collection to eventually reclaim
-      * these resources may not be timely enough.
-      *  
-      * @exception JMSException if the JMS provider fails to close the producer
-      *                         due to some internal error.
-      */ 
-
-    void
-    close() throws JMSException;
-    
-     
-      /** Sends a message using the <CODE>MessageProducer</CODE>'s 
-      * default delivery mode, priority, and time to live.
-      *
-      * @param message the message to send 
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with a <CODE>MessageProducer</CODE> with
-      *                         an invalid destination.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>MessageProducer</CODE> that did
-      *                         not specify a destination at creation time.
-      * 
-      * @see javax.jms.Session#createProducer 
-      * @see javax.jms.MessageProducer 
-      *
-      * @since 1.1 
-      */
-
-    void 
-    send(Message message) throws JMSException;
-    
-      /** Sends a message to the destination, specifying delivery mode, priority, and 
-      * time to live.
-      *
-      * @param message the message to send
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with a <CODE>MessageProducer</CODE> with
-      *                         an invalid destination.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>MessageProducer</CODE> that did
-      *                         not specify a destination at creation time.
-      *
-      * @see javax.jms.Session#createProducer
-      * @since 1.1 
-      */
-
-    void 
-    send(Message message, 
-	 int deliveryMode, 
-	 int priority,
-	 long timeToLive) throws JMSException;
-    
-    
-     /**Sends a message to a destination for an unidentified message producer.
-      * Uses the <CODE>MessageProducer</CODE>'s default delivery mode, priority,
-      * and time to live.
-      *
-      * <P>Typically, a message producer is assigned a destination at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the destination be supplied every time a message is
-      * sent. 
-      *  
-      * @param destination the destination to send this message to
-      * @param message the message to send
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid destination.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>MessageProducer</CODE> that 
-      *                         specified a destination at creation time.
-      * 
-      * @see javax.jms.Session#createProducer
-      * @see javax.jms.MessageProducer
-      * @since 1.1 
-      */ 
- 
-    void
-    send(Destination destination, Message message) throws JMSException;
- 
- 
-    /** Sends a message to a destination for an unidentified message producer, 
-      * specifying delivery mode, priority and time to live.
-      *  
-      * <P>Typically, a message producer is assigned a destination at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the destination be supplied every time a message is
-      * sent. 
-      *  
-      * @param destination the destination to send this message to
-      * @param message the message to send
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid destination.
-      *
-      * @see javax.jms.Session#createProducer
-      * @since 1.1 
-      */ 
-
-    void
-    send(Destination destination, 
-	 Message message, 
-	 int deliveryMode, 
-	 int priority,
-	 long timeToLive) throws JMSException;
+  void send(Message message) throws JMSException;
 
+  /** Sends a message to the destination, specifying delivery mode, priority, and 
+  * time to live.
+  *
+  * @param message the message to send
+  * @param deliveryMode the delivery mode to use
+  * @param priority the priority for this message
+  * @param timeToLive the message's lifetime (in milliseconds)
+  *  
+  * @exception JMSException if the JMS provider fails to send the message 
+  *                         due to some internal error.
+  * @exception MessageFormatException if an invalid message is specified.
+  * @exception InvalidDestinationException if a client uses
+  *                         this method with a <CODE>MessageProducer</CODE> with
+  *                         an invalid destination.
+  * @exception java.lang.UnsupportedOperationException if a client uses this
+  *                         method with a <CODE>MessageProducer</CODE> that did
+  *                         not specify a destination at creation time.
+  *
+  * @see javax.jms.Session#createProducer
+  * @since 1.1 
+  */
 
+  void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
+
+  /**Sends a message to a destination for an unidentified message producer.
+   * Uses the <CODE>MessageProducer</CODE>'s default delivery mode, priority,
+   * and time to live.
+   *
+   * <P>Typically, a message producer is assigned a destination at creation 
+   * time; however, the JMS API also supports unidentified message producers,
+   * which require that the destination be supplied every time a message is
+   * sent. 
+   *  
+   * @param destination the destination to send this message to
+   * @param message the message to send
+   *  
+   * @exception JMSException if the JMS provider fails to send the message 
+   *                         due to some internal error.
+   * @exception MessageFormatException if an invalid message is specified.
+   * @exception InvalidDestinationException if a client uses
+   *                         this method with an invalid destination.
+   * @exception java.lang.UnsupportedOperationException if a client uses this
+   *                         method with a <CODE>MessageProducer</CODE> that 
+   *                         specified a destination at creation time.
+   * 
+   * @see javax.jms.Session#createProducer
+   * @see javax.jms.MessageProducer
+   * @since 1.1 
+   */
+
+  void send(Destination destination, Message message) throws JMSException;
+
+  /** Sends a message to a destination for an unidentified message producer, 
+    * specifying delivery mode, priority and time to live.
+    *  
+    * <P>Typically, a message producer is assigned a destination at creation 
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the destination be supplied every time a message is
+    * sent. 
+    *  
+    * @param destination the destination to send this message to
+    * @param message the message to send
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid destination.
+    *
+    * @see javax.jms.Session#createProducer
+    * @since 1.1 
+    */
+
+  void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive)
+      throws JMSException;
 
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java
index 8c0fff03de..acc91ca7dc 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ObjectMessage.java
@@ -1,90 +1,87 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.io.Serializable;
 
 /** An <CODE>ObjectMessage</CODE> object is used to send a message that contains
-  * a serializable object in the Java programming language ("Java object").
-  * It inherits from the <CODE>Message</CODE> interface and adds a body
-  * containing a single reference to an object. Only <CODE>Serializable</CODE> 
-  * Java objects can be used.
-  *
-  * <P>If a collection of Java objects must be sent, one of the 
-  * <CODE>Collection</CODE> classes provided since JDK 1.2 can be used.
-  *
-  * <P>When a client receives an <CODE>ObjectMessage</CODE>, it is in read-only 
-  * mode. If a client attempts to write to the message at this point, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown. If 
-  * <CODE>clearBody</CODE> is called, the message can now be both read from and 
-  * written to.
-  *
-  * @version     1.0 - 6 August 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.Session#createObjectMessage()
-  * @see         javax.jms.Session#createObjectMessage(Serializable)
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.StreamMessage
-  * @see         javax.jms.TextMessage
-  */
-
-public interface ObjectMessage extends Message {
+ * a serializable object in the Java programming language ("Java object").
+ * It inherits from the <CODE>Message</CODE> interface and adds a body
+ * containing a single reference to an object. Only <CODE>Serializable</CODE>
+ * Java objects can be used.
+ *
+ * <P>If a collection of Java objects must be sent, one of the
+ * <CODE>Collection</CODE> classes provided since JDK 1.2 can be used.
+ *
+ * <P>When a client receives an <CODE>ObjectMessage</CODE>, it is in read-only
+ * mode. If a client attempts to write to the message at this point, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown. If
+ * <CODE>clearBody</CODE> is called, the message can now be both read from and
+ * written to.
+ *
+ * @version     1.0 - 6 August 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.Session#createObjectMessage()
+ * @see         javax.jms.Session#createObjectMessage(Serializable)
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.StreamMessage
+ * @see         javax.jms.TextMessage
+ */
 
-    /** Sets the serializable object containing this message's data.
-      * It is important to note that an <CODE>ObjectMessage</CODE>
-      * contains a snapshot of the object at the time <CODE>setObject()</CODE>
-      * is called; subsequent modifications of the object will have no 
-      * effect on the <CODE>ObjectMessage</CODE> body.
-      *
-      * @param object the message's data
-      *  
-      * @exception JMSException if the JMS provider fails to set the object
-      *                         due to some internal error.
-      * @exception MessageFormatException if object serialization fails.
-      * @exception MessageNotWriteableException if the message is in read-only
-      *                                         mode.
-      */
+public interface ObjectMessage extends Message
+{
 
-    void 
-    setObject(Serializable object) throws JMSException;
+  /** Sets the serializable object containing this message's data.
+    * It is important to note that an <CODE>ObjectMessage</CODE>
+    * contains a snapshot of the object at the time <CODE>setObject()</CODE>
+    * is called; subsequent modifications of the object will have no 
+    * effect on the <CODE>ObjectMessage</CODE> body.
+    *
+    * @param object the message's data
+    *  
+    * @exception JMSException if the JMS provider fails to set the object
+    *                         due to some internal error.
+    * @exception MessageFormatException if object serialization fails.
+    * @exception MessageNotWriteableException if the message is in read-only
+    *                                         mode.
+    */
 
+  void setObject(Serializable object) throws JMSException;
 
-    /** Gets the serializable object containing this message's data. The 
-      * default value is null.
-      *
-      * @return the serializable object containing this message's data
-      *  
-      * @exception JMSException if the JMS provider fails to get the object
-      *                         due to some internal error.
-      * @exception MessageFormatException if object deserialization fails.
-      */
+  /** Gets the serializable object containing this message's data. The 
+    * default value is null.
+    *
+    * @return the serializable object containing this message's data
+    *  
+    * @exception JMSException if the JMS provider fails to get the object
+    *                         due to some internal error.
+    * @exception MessageFormatException if object deserialization fails.
+    */
 
-    Serializable 
-    getObject() throws JMSException;
+  Serializable getObject() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java
index 0a9ec202cd..a2ad1b3c01 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Queue.java
@@ -1,81 +1,77 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
+/** A <CODE>Queue</CODE> object encapsulates a provider-specific queue name.
+ * It is the way a client specifies the identity of a queue to JMS API methods.
+ * For those methods that use a <CODE>Destination</CODE> as a parameter, a
+ * <CODE>Queue</CODE> object used as an argument. For example, a queue can
+ * be used  to create a <CODE>MessageConsumer</CODE> and a
+ * <CODE>MessageProducer</CODE>  by calling:
+ *<UL>
+ *<LI> <CODE>Session.CreateConsumer(Destination destination)</CODE>
+ *<LI> <CODE>Session.CreateProducer(Destination destination)</CODE>
+ *
+ *</UL>
+ *
+ * <P>The actual length of time messages are held by a queue and the
+ * consequences of resource overflow are not defined by the JMS API.
+ *
+ *
+ *
+ * @version     1.1 February 2 - 2000
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see Session#createConsumer(Destination)
+ * @see Session#createProducer(Destination)
+ * @see Session#createQueue(String)
+ * @see QueueSession#createQueue(String)
+ */
+
+public interface Queue extends Destination
+{
 
-/** A <CODE>Queue</CODE> object encapsulates a provider-specific queue name. 
-  * It is the way a client specifies the identity of a queue to JMS API methods.
-  * For those methods that use a <CODE>Destination</CODE> as a parameter, a 
-  * <CODE>Queue</CODE> object used as an argument. For example, a queue can
-  * be used  to create a <CODE>MessageConsumer</CODE> and a 
-  * <CODE>MessageProducer</CODE>  by calling:
-  *<UL>
-  *<LI> <CODE>Session.CreateConsumer(Destination destination)</CODE>
-  *<LI> <CODE>Session.CreateProducer(Destination destination)</CODE>
-  *
-  *</UL>
-  *
-  * <P>The actual length of time messages are held by a queue and the 
-  * consequences of resource overflow are not defined by the JMS API.
-  *
-  *
-  *
-  * @version     1.1 February 2 - 2000
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see Session#createConsumer(Destination)
-  * @see Session#createProducer(Destination)
-  * @see Session#createQueue(String)
-  * @see QueueSession#createQueue(String)
-  */
- 
-public interface Queue extends Destination { 
+  /** Gets the name of this queue.
+    *  
+    * <P>Clients that depend upon the name are not portable.
+    *  
+    * @return the queue name
+    *  
+    * @exception JMSException if the JMS provider implementation of 
+    *                         <CODE>Queue</CODE> fails to return the queue
+    *                         name due to some internal
+    *                         error.
+    */
 
-    /** Gets the name of this queue.
-      *  
-      * <P>Clients that depend upon the name are not portable.
-      *  
-      * @return the queue name
-      *  
-      * @exception JMSException if the JMS provider implementation of 
-      *                         <CODE>Queue</CODE> fails to return the queue
-      *                         name due to some internal
-      *                         error.
-      */ 
- 
-    String
-    getQueueName() throws JMSException;  
+  String getQueueName() throws JMSException;
 
+  /** Returns a string representation of this object.
+    *
+    * @return the provider-specific identity values for this queue
+    */
 
-    /** Returns a string representation of this object.
-      *
-      * @return the provider-specific identity values for this queue
-      */
- 
-    String
-    toString();
+  String toString();
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java
index 0bb06ffb55..bc4ae52065 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueBrowser.java
@@ -1,115 +1,108 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 import java.util.Enumeration;
 
-/** A client uses a <CODE>QueueBrowser</CODE> object to look at messages on a 
-  * queue without removing them.
-  *
-  * <P>The <CODE>getEnumeration</CODE> method returns a 
-  * <CODE>java.util.Enumeration</CODE> that is used to scan 
-  * the queue's messages. It may be an enumeration of the entire content of a 
-  * queue, or it may contain only the messages matching a message selector.
-  *
-  * <P>Messages may be arriving and expiring while the scan is done. The JMS API
-  * does 
-  * not require the content of an enumeration to be a static snapshot of queue 
-  * content. Whether these changes are visible or not depends on the JMS 
-  * provider.
-  *
-  *<P>A <CODE>QueueBrowser</CODE> can be created from either a 
-  * <CODE>Session</CODE> or a <CODE> QueueSession</CODE>. 
-  *
-  * @version     1.1 April 9, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  *  @see         javax.jms.Session#createBrowser
-  * @see         javax.jms.QueueSession#createBrowser
-  * @see         javax.jms.QueueReceiver
-  */
-
-public interface QueueBrowser {
-
-    /** Gets the queue associated with this queue browser.
-      * 
-      * @return the queue
-      *  
-      * @exception JMSException if the JMS provider fails to get the
-      *                         queue associated with this browser
-      *                         due to some internal error.
-      */
-
-    Queue 
-    getQueue() throws JMSException;
-
-
-    /** Gets this queue browser's message selector expression.
-      *  
-      * @return this queue browser's message selector, or null if no
-      *         message selector exists for the message consumer (that is, if 
-      *         the message selector was not set or was set to null or the 
-      *         empty string)
-      *
-      * @exception JMSException if the JMS provider fails to get the
-      *                         message selector for this browser
-      *                         due to some internal error.
-      */
-
-    String
-    getMessageSelector() throws JMSException;
-
-
-    /** Gets an enumeration for browsing the current queue messages in the
-      * order they would be received.
-      *
-      * @return an enumeration for browsing the messages
-      *  
-      * @exception JMSException if the JMS provider fails to get the
-      *                         enumeration for this browser
-      *                         due to some internal error.
-      */
-
-    Enumeration 
-    getEnumeration() throws JMSException;
-
-
-    /** Closes the <CODE>QueueBrowser</CODE>.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a 
-      * QueueBrowser outside the Java virtual machine, clients should close them
-      * when they 
-      * are not needed. Relying on garbage collection to eventually reclaim 
-      * these resources may not be timely enough.
-      *
-      * @exception JMSException if the JMS provider fails to close this
-      *                         browser due to some internal error.
-      */
+/** A client uses a <CODE>QueueBrowser</CODE> object to look at messages on a
+ * queue without removing them.
+ *
+ * <P>The <CODE>getEnumeration</CODE> method returns a
+ * <CODE>java.util.Enumeration</CODE> that is used to scan
+ * the queue's messages. It may be an enumeration of the entire content of a
+ * queue, or it may contain only the messages matching a message selector.
+ *
+ * <P>Messages may be arriving and expiring while the scan is done. The JMS API
+ * does
+ * not require the content of an enumeration to be a static snapshot of queue
+ * content. Whether these changes are visible or not depends on the JMS
+ * provider.
+ *
+ *<P>A <CODE>QueueBrowser</CODE> can be created from either a
+ * <CODE>Session</CODE> or a <CODE> QueueSession</CODE>.
+ *
+ * @version     1.1 April 9, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ *  @see         javax.jms.Session#createBrowser
+ * @see         javax.jms.QueueSession#createBrowser
+ * @see         javax.jms.QueueReceiver
+ */
 
-    void 
-    close() throws JMSException;
+public interface QueueBrowser
+{
+
+  /** Gets the queue associated with this queue browser.
+    * 
+    * @return the queue
+    *  
+    * @exception JMSException if the JMS provider fails to get the
+    *                         queue associated with this browser
+    *                         due to some internal error.
+    */
+
+  Queue getQueue() throws JMSException;
+
+  /** Gets this queue browser's message selector expression.
+    *  
+    * @return this queue browser's message selector, or null if no
+    *         message selector exists for the message consumer (that is, if 
+    *         the message selector was not set or was set to null or the 
+    *         empty string)
+    *
+    * @exception JMSException if the JMS provider fails to get the
+    *                         message selector for this browser
+    *                         due to some internal error.
+    */
+
+  String getMessageSelector() throws JMSException;
+
+  /** Gets an enumeration for browsing the current queue messages in the
+    * order they would be received.
+    *
+    * @return an enumeration for browsing the messages
+    *  
+    * @exception JMSException if the JMS provider fails to get the
+    *                         enumeration for this browser
+    *                         due to some internal error.
+    */
+
+  Enumeration getEnumeration() throws JMSException;
+
+  /** Closes the <CODE>QueueBrowser</CODE>.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a 
+    * QueueBrowser outside the Java virtual machine, clients should close them
+    * when they 
+    * are not needed. Relying on garbage collection to eventually reclaim 
+    * these resources may not be timely enough.
+    *
+    * @exception JMSException if the JMS provider fails to close this
+    *                         browser due to some internal error.
+    */
+
+  void close() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
index ef21a6db56..56cc35040f 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnection.java
@@ -1,118 +1,111 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>QueueConnection</CODE> object is an active connection to a 
-  * point-to-point JMS provider. A client uses a <CODE>QueueConnection</CODE> 
-  * object to create one or more <CODE>QueueSession</CODE> objects
-  * for producing and consuming messages.
-  *
-  *<P>A <CODE>QueueConnection</CODE> can be used to create a
-  * <CODE>QueueSession</CODE>, from which specialized  queue-related objects
-  * can be created.
-  * A more general, and recommended, approach is to use the 
-  * <CODE>Connection</CODE> object.
-  * 
-  *
-  * <P>The <CODE>QueueConnection</CODE> object
-  * should be used to support existing code that has already used it.
-  *
-  * <P>A <CODE>QueueConnection</CODE> cannot be used to create objects 
-  * specific to the   publish/subscribe domain. The
-  * <CODE>createDurableConnectionConsumer</CODE> method inherits
-  * from  <CODE>Connection</CODE>, but must throw an 
-  * <CODE>IllegalStateException</CODE>
-  * if used from <CODE>QueueConnection</CODE>.
-  *
-  * @version     1.1 - April 9, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Connection
-  * @see         javax.jms.ConnectionFactory
-  * @see	 javax.jms.QueueConnectionFactory
-  */
-
-public interface QueueConnection extends Connection {
+/** A <CODE>QueueConnection</CODE> object is an active connection to a
+ * point-to-point JMS provider. A client uses a <CODE>QueueConnection</CODE>
+ * object to create one or more <CODE>QueueSession</CODE> objects
+ * for producing and consuming messages.
+ *
+ *<P>A <CODE>QueueConnection</CODE> can be used to create a
+ * <CODE>QueueSession</CODE>, from which specialized  queue-related objects
+ * can be created.
+ * A more general, and recommended, approach is to use the
+ * <CODE>Connection</CODE> object.
+ *
+ *
+ * <P>The <CODE>QueueConnection</CODE> object
+ * should be used to support existing code that has already used it.
+ *
+ * <P>A <CODE>QueueConnection</CODE> cannot be used to create objects
+ * specific to the   publish/subscribe domain. The
+ * <CODE>createDurableConnectionConsumer</CODE> method inherits
+ * from  <CODE>Connection</CODE>, but must throw an
+ * <CODE>IllegalStateException</CODE>
+ * if used from <CODE>QueueConnection</CODE>.
+ *
+ * @version     1.1 - April 9, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Connection
+ * @see         javax.jms.ConnectionFactory
+ * @see	 javax.jms.QueueConnectionFactory
+ */
 
-    /** Creates a <CODE>QueueSession</CODE> object.
-      *  
-      * @param transacted indicates whether the session is transacted
-      * @param acknowledgeMode indicates whether the consumer or the
-      * client will acknowledge any messages it receives; ignored if the session
-      * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
-      * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
-      * <code>Session.DUPS_OK_ACKNOWLEDGE</code>.
-      *  
-      * @return a newly created queue session
-      *  
-      * @exception JMSException if the <CODE>QueueConnection</CODE> object fails
-      *                         to create a session due to some internal error or
-      *                         lack of support for the specific transaction
-      *                         and acknowledgement mode.
-      *
-      * @see Session#AUTO_ACKNOWLEDGE 
-      * @see Session#CLIENT_ACKNOWLEDGE 
-      * @see Session#DUPS_OK_ACKNOWLEDGE 
-      */ 
+public interface QueueConnection extends Connection
+{
 
-    QueueSession
-    createQueueSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+  /** Creates a <CODE>QueueSession</CODE> object.
+    *  
+    * @param transacted indicates whether the session is transacted
+    * @param acknowledgeMode indicates whether the consumer or the
+    * client will acknowledge any messages it receives; ignored if the session
+    * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
+    * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
+    * <code>Session.DUPS_OK_ACKNOWLEDGE</code>.
+    *  
+    * @return a newly created queue session
+    *  
+    * @exception JMSException if the <CODE>QueueConnection</CODE> object fails
+    *                         to create a session due to some internal error or
+    *                         lack of support for the specific transaction
+    *                         and acknowledgement mode.
+    *
+    * @see Session#AUTO_ACKNOWLEDGE 
+    * @see Session#CLIENT_ACKNOWLEDGE 
+    * @see Session#DUPS_OK_ACKNOWLEDGE 
+    */
 
+  QueueSession createQueueSession(boolean transacted, int acknowledgeMode) throws JMSException;
 
-    /** Creates a connection consumer for this connection (optional operation).
-      * This is an expert facility not used by regular JMS clients.
-      *
-      * @param queue the queue to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the connection consumer
-      *  
-      * @exception JMSException if the <CODE>QueueConnection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      * @see javax.jms.ConnectionConsumer
-      */ 
+  /** Creates a connection consumer for this connection (optional operation).
+    * This is an expert facility not used by regular JMS clients.
+    *
+    * @param queue the queue to access
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param sessionPool the server session pool to associate with this 
+    * connection consumer
+    * @param maxMessages the maximum number of messages that can be
+    * assigned to a server session at one time
+    *
+    * @return the connection consumer
+    *  
+    * @exception JMSException if the <CODE>QueueConnection</CODE> object fails
+    *                         to create a connection consumer due to some
+    *                         internal error or invalid arguments for 
+    *                         <CODE>sessionPool</CODE> and 
+    *                         <CODE>messageSelector</CODE>.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    * @see javax.jms.ConnectionConsumer
+    */
 
-    ConnectionConsumer
-    createConnectionConsumer(Queue queue,
-                             String messageSelector,
-                             ServerSessionPool sessionPool,
-			     int maxMessages)
-			   throws JMSException;
+  ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java
index dd1d570c82..b2ebdee017 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueConnectionFactory.java
@@ -1,87 +1,82 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
-
 package javax.jms;
 
-/** A client uses a <CODE>QueueConnectionFactory</CODE> object to create 
-  * <CODE>QueueConnection</CODE> objects with a point-to-point JMS provider.
-  *
-  * <P><CODE>QueueConnectionFactory</CODE> can be used to create a 
-  * <CODE>QueueConnection</CODE>, from which specialized queue-related objects
-  * can be  created. A more general, and recommended,  approach 
-  * is to use the <CODE>ConnectionFactory</CODE> object.
-  *
-  *<P> The <CODE>QueueConnectionFactory</CODE> object
-  * can be used to support existing code that already uses it.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.ConnectionFactory
-  */
-
-public interface QueueConnectionFactory extends ConnectionFactory {
+/** A client uses a <CODE>QueueConnectionFactory</CODE> object to create
+ * <CODE>QueueConnection</CODE> objects with a point-to-point JMS provider.
+ *
+ * <P><CODE>QueueConnectionFactory</CODE> can be used to create a
+ * <CODE>QueueConnection</CODE>, from which specialized queue-related objects
+ * can be  created. A more general, and recommended,  approach
+ * is to use the <CODE>ConnectionFactory</CODE> object.
+ *
+ *<P> The <CODE>QueueConnectionFactory</CODE> object
+ * can be used to support existing code that already uses it.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.ConnectionFactory
+ */
 
-    /** Creates a queue connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      .
-      *
-      * @return a newly created queue connection
-      *
-      * @exception JMSException if the JMS provider fails to create the queue 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+public interface QueueConnectionFactory extends ConnectionFactory
+{
 
-    QueueConnection
-    createQueueConnection() throws JMSException;
+  /** Creates a queue connection with the default user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *
+    .
+    *
+    * @return a newly created queue connection
+    *
+    * @exception JMSException if the JMS provider fails to create the queue 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
+  QueueConnection createQueueConnection() throws JMSException;
 
-    /** Creates a queue connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created queue connection
-      *
-      * @exception JMSException if the JMS provider fails to create the queue 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+  /** Creates a queue connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created queue connection
+    *
+    * @exception JMSException if the JMS provider fails to create the queue 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
-    QueueConnection
-    createQueueConnection(String userName, String password) 
-					     throws JMSException;
+  QueueConnection createQueueConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java
index 20d3300b82..2ced18ba87 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueReceiver.java
@@ -1,73 +1,71 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
+/** A client uses a <CODE>QueueReceiver</CODE> object to receive messages that
+ * have been delivered to a queue.
+ *
+ * <P>Although it is possible to have multiple <CODE>QueueReceiver</CODE>s
+ * for the same queue, the JMS API does not define how messages are
+ * distributed between the <CODE>QueueReceiver</CODE>s.
+ *
+ * <P>If a <CODE>QueueReceiver</CODE> specifies a message selector, the
+ * messages that are not selected remain on the queue. By definition, a message
+ * selector allows a <CODE>QueueReceiver</CODE> to skip messages. This
+ * means that when the skipped messages are eventually read, the total ordering
+ * of the reads does not retain the partial order defined by each message
+ * producer. Only <CODE>QueueReceiver</CODE>s without a message selector
+ * will read messages in message producer order.
+ *
+ * <P>Creating a <CODE>MessageConsumer</CODE> provides the same features as
+ * creating a <CODE>QueueReceiver</CODE>. A <CODE>MessageConsumer</CODE> object is
+ * recommended for creating new code. The  <CODE>QueueReceiver</CODE> is
+ * provided to support existing code.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session#createConsumer(Destination, String)
+ * @see         javax.jms.Session#createConsumer(Destination)
+ * @see         javax.jms.QueueSession#createReceiver(Queue, String)
+ * @see         javax.jms.QueueSession#createReceiver(Queue)
+ * @see         javax.jms.MessageConsumer
+ */
 
-/** A client uses a <CODE>QueueReceiver</CODE> object to receive messages that 
-  * have been delivered to a queue.
-  *
-  * <P>Although it is possible to have multiple <CODE>QueueReceiver</CODE>s 
-  * for the same queue, the JMS API does not define how messages are 
-  * distributed between the <CODE>QueueReceiver</CODE>s.
-  *
-  * <P>If a <CODE>QueueReceiver</CODE> specifies a message selector, the 
-  * messages that are not selected remain on the queue. By definition, a message
-  * selector allows a <CODE>QueueReceiver</CODE> to skip messages. This 
-  * means that when the skipped messages are eventually read, the total ordering
-  * of the reads does not retain the partial order defined by each message 
-  * producer. Only <CODE>QueueReceiver</CODE>s without a message selector
-  * will read messages in message producer order.
-  *
-  * <P>Creating a <CODE>MessageConsumer</CODE> provides the same features as
-  * creating a <CODE>QueueReceiver</CODE>. A <CODE>MessageConsumer</CODE> object is 
-  * recommended for creating new code. The  <CODE>QueueReceiver</CODE> is
-  * provided to support existing code.
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session#createConsumer(Destination, String)
-  * @see         javax.jms.Session#createConsumer(Destination)
-  * @see         javax.jms.QueueSession#createReceiver(Queue, String)
-  * @see         javax.jms.QueueSession#createReceiver(Queue)
-  * @see         javax.jms.MessageConsumer
-  */
+public interface QueueReceiver extends MessageConsumer
+{
 
-public interface QueueReceiver extends MessageConsumer {
+  /** Gets the <CODE>Queue</CODE> associated with this queue receiver.
+    *  
+    * @return this receiver's <CODE>Queue</CODE> 
+    *  
+    * @exception JMSException if the JMS provider fails to get the queue for
+    *                         this queue receiver
+    *                         due to some internal error.
+    */
 
-    /** Gets the <CODE>Queue</CODE> associated with this queue receiver.
-      *  
-      * @return this receiver's <CODE>Queue</CODE> 
-      *  
-      * @exception JMSException if the JMS provider fails to get the queue for
-      *                         this queue receiver
-      *                         due to some internal error.
-      */ 
- 
-    Queue
-    getQueue() throws JMSException;
+  Queue getQueue() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java
index 68860de448..e0b13ff396 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueRequestor.java
@@ -1,124 +1,125 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** The <CODE>QueueRequestor</CODE> helper class simplifies
-  * making service requests.
-  *
-  * <P>The <CODE>QueueRequestor</CODE> constructor is given a non-transacted 
-  * <CODE>QueueSession</CODE> and a destination <CODE>Queue</CODE>. It creates a
-  * <CODE>TemporaryQueue</CODE> for the responses and provides a 
-  * <CODE>request</CODE> method that sends the request message and waits 
-  * for its reply.
-  *
-  * <P>This is a basic request/reply abstraction that should be sufficient 
-  * for most uses. JMS providers and clients are free to create more 
-  * sophisticated versions.
-  *
-  * @version     1.0 - 8 July 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.TopicRequestor
-  */
+ * making service requests.
+ *
+ * <P>The <CODE>QueueRequestor</CODE> constructor is given a non-transacted
+ * <CODE>QueueSession</CODE> and a destination <CODE>Queue</CODE>. It creates a
+ * <CODE>TemporaryQueue</CODE> for the responses and provides a
+ * <CODE>request</CODE> method that sends the request message and waits
+ * for its reply.
+ *
+ * <P>This is a basic request/reply abstraction that should be sufficient
+ * for most uses. JMS providers and clients are free to create more
+ * sophisticated versions.
+ *
+ * @version     1.0 - 8 July 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.TopicRequestor
+ */
+
+public class QueueRequestor
+{
 
-public class QueueRequestor {
+  QueueSession session; // The queue session the queue belongs to.
 
-    QueueSession   session;     // The queue session the queue belongs to.
-    Queue          queue;       // The queue to perform the request/reply on.
-    TemporaryQueue tempQueue;
-    QueueSender    sender;
-    QueueReceiver  receiver;
+  Queue queue; // The queue to perform the request/reply on.
 
+  TemporaryQueue tempQueue;
 
-    /** Constructor for the <CODE>QueueRequestor</CODE> class.
-      *  
-      * <P>This implementation assumes the session parameter to be non-transacted,
-      * with a delivery mode of either <CODE>AUTO_ACKNOWLEDGE</CODE> or 
-      * <CODE>DUPS_OK_ACKNOWLEDGE</CODE>.
-      *
-      * @param session the <CODE>QueueSession</CODE> the queue belongs to
-      * @param queue the queue to perform the request/reply call on
-      *  
-      * @exception JMSException if the JMS provider fails to create the
-      *                         <CODE>QueueRequestor</CODE> due to some internal
-      *                         error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      */ 
+  QueueSender sender;
 
-    public
-    QueueRequestor(QueueSession session, Queue queue) throws JMSException {
-        this.session = session;
-        this.queue   = queue;
-        tempQueue    = session.createTemporaryQueue();
-        sender       = session.createSender(queue);
-        receiver     = session.createReceiver(tempQueue);
-    }
+  QueueReceiver receiver;
 
+  /** Constructor for the <CODE>QueueRequestor</CODE> class.
+    *  
+    * <P>This implementation assumes the session parameter to be non-transacted,
+    * with a delivery mode of either <CODE>AUTO_ACKNOWLEDGE</CODE> or 
+    * <CODE>DUPS_OK_ACKNOWLEDGE</CODE>.
+    *
+    * @param session the <CODE>QueueSession</CODE> the queue belongs to
+    * @param queue the queue to perform the request/reply call on
+    *  
+    * @exception JMSException if the JMS provider fails to create the
+    *                         <CODE>QueueRequestor</CODE> due to some internal
+    *                         error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    */
 
-    /** Sends a request and waits for a reply. The temporary queue is used for
-      * the <CODE>JMSReplyTo</CODE> destination, and only one reply per request 
-      * is expected.
-      *  
-      * @param message the message to send
-      *  
-      * @return the reply message
-      *  
-      * @exception JMSException if the JMS provider fails to complete the
-      *                         request due to some internal error.
-      */
+  public QueueRequestor(QueueSession session, Queue queue) throws JMSException
+  {
+    this.session = session;
+    this.queue = queue;
+    tempQueue = session.createTemporaryQueue();
+    sender = session.createSender(queue);
+    receiver = session.createReceiver(tempQueue);
+  }
 
-    public Message
-    request(Message message) throws JMSException {
-	message.setJMSReplyTo(tempQueue);
-	sender.send(message);
-	return (receiver.receive());
-    }
+  /** Sends a request and waits for a reply. The temporary queue is used for
+    * the <CODE>JMSReplyTo</CODE> destination, and only one reply per request 
+    * is expected.
+    *  
+    * @param message the message to send
+    *  
+    * @return the reply message
+    *  
+    * @exception JMSException if the JMS provider fails to complete the
+    *                         request due to some internal error.
+    */
 
+  public Message request(Message message) throws JMSException
+  {
+    message.setJMSReplyTo(tempQueue);
+    sender.send(message);
+    return receiver.receive();
+  }
 
-    /** Closes the <CODE>QueueRequestor</CODE> and its session.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a 
-      * <CODE>QueueRequestor</CODE> outside the Java virtual machine, clients 
-      * should close them when they 
-      * are not needed. Relying on garbage collection to eventually reclaim 
-      * these resources may not be timely enough.
-      *  
-      * <P>Note that this method closes the <CODE>QueueSession</CODE> object 
-      * passed to the <CODE>QueueRequestor</CODE> constructor.
-      *
-      * @exception JMSException if the JMS provider fails to close the
-      *                         <CODE>QueueRequestor</CODE> due to some internal
-      *                         error.
-      */
+  /** Closes the <CODE>QueueRequestor</CODE> and its session.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a 
+    * <CODE>QueueRequestor</CODE> outside the Java virtual machine, clients 
+    * should close them when they 
+    * are not needed. Relying on garbage collection to eventually reclaim 
+    * these resources may not be timely enough.
+    *  
+    * <P>Note that this method closes the <CODE>QueueSession</CODE> object 
+    * passed to the <CODE>QueueRequestor</CODE> constructor.
+    *
+    * @exception JMSException if the JMS provider fails to close the
+    *                         <CODE>QueueRequestor</CODE> due to some internal
+    *                         error.
+    */
 
-    public void
-    close() throws JMSException {
+  public void close() throws JMSException
+  {
 
-	// publisher and consumer created by constructor are implicitly closed.
-	session.close();
-        tempQueue.delete();
-    }
+    // publisher and consumer created by constructor are implicitly closed.
+    session.close();
+    tempQueue.delete();
+  }
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java
index 57035f7a6e..267a4e4e63 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSender.java
@@ -1,197 +1,181 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** A client uses a <CODE>QueueSender</CODE> object to send messages to a queue.
-  * 
-  * <P>Normally, the <CODE>Queue</CODE> is specified when a 
-  * <CODE>QueueSender</CODE> is created.  In this case, an attempt to use
-  * the <CODE>send</CODE> methods for an unidentified 
-  * <CODE>QueueSender</CODE> will throw a 
-  * <CODE>java.lang.UnsupportedOperationException</CODE>.
-  * 
-  * <P>If the <CODE>QueueSender</CODE> is created with an unidentified 
-  * <CODE>Queue</CODE>, an attempt to use the <CODE>send</CODE> methods that 
-  * assume that the <CODE>Queue</CODE> has been identified will throw a
-  * <CODE>java.lang.UnsupportedOperationException</CODE>.
-  *
-  * <P>During the execution of its <CODE>send</CODE> method, a message 
-  * must not be changed by other threads within the client. 
-  * If the message is modified, the result of the <CODE>send</CODE> is 
-  * undefined.
-  * 
-  * <P>After sending a message, a client may retain and modify it
-  * without affecting the message that has been sent. The same message
-  * object may be sent multiple times.
-  * 
-  * <P>The following message headers are set as part of sending a 
-  * message: <code>JMSDestination</code>, <code>JMSDeliveryMode</code>, 
-  * <code>JMSExpiration</code>, <code>JMSPriority</code>, 
-  * <code>JMSMessageID</code> and <code>JMSTimeStamp</code>.
-  * When the message is sent, the values of these headers are ignored. 
-  * After the completion of the <CODE>send</CODE>, the headers hold the values 
-  * specified by the method sending the message. It is possible for the 
-  * <code>send</code> method not to set <code>JMSMessageID</code> and 
-  * <code>JMSTimeStamp</code> if the 
-  * setting of these headers is explicitly disabled by the 
-  * <code>MessageProducer.setDisableMessageID</code> or
-  * <code>MessageProducer.setDisableMessageTimestamp</code> method.
-  *
-  * <P>Creating a <CODE>MessageProducer</CODE> provides the same features as
-  * creating a <CODE>QueueSender</CODE>. A <CODE>MessageProducer</CODE> object is 
-  * recommended when creating new code. The  <CODE>QueueSender</CODE> is
-  * provided to support existing code.
-  *
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.MessageProducer
-  * @see         javax.jms.Session#createProducer(Destination)
-  * @see         javax.jms.QueueSession#createSender(Queue)
-  */
+ *
+ * <P>Normally, the <CODE>Queue</CODE> is specified when a
+ * <CODE>QueueSender</CODE> is created.  In this case, an attempt to use
+ * the <CODE>send</CODE> methods for an unidentified
+ * <CODE>QueueSender</CODE> will throw a
+ * <CODE>java.lang.UnsupportedOperationException</CODE>.
+ *
+ * <P>If the <CODE>QueueSender</CODE> is created with an unidentified
+ * <CODE>Queue</CODE>, an attempt to use the <CODE>send</CODE> methods that
+ * assume that the <CODE>Queue</CODE> has been identified will throw a
+ * <CODE>java.lang.UnsupportedOperationException</CODE>.
+ *
+ * <P>During the execution of its <CODE>send</CODE> method, a message
+ * must not be changed by other threads within the client.
+ * If the message is modified, the result of the <CODE>send</CODE> is
+ * undefined.
+ *
+ * <P>After sending a message, a client may retain and modify it
+ * without affecting the message that has been sent. The same message
+ * object may be sent multiple times.
+ *
+ * <P>The following message headers are set as part of sending a
+ * message: <code>JMSDestination</code>, <code>JMSDeliveryMode</code>,
+ * <code>JMSExpiration</code>, <code>JMSPriority</code>,
+ * <code>JMSMessageID</code> and <code>JMSTimeStamp</code>.
+ * When the message is sent, the values of these headers are ignored.
+ * After the completion of the <CODE>send</CODE>, the headers hold the values
+ * specified by the method sending the message. It is possible for the
+ * <code>send</code> method not to set <code>JMSMessageID</code> and
+ * <code>JMSTimeStamp</code> if the
+ * setting of these headers is explicitly disabled by the
+ * <code>MessageProducer.setDisableMessageID</code> or
+ * <code>MessageProducer.setDisableMessageTimestamp</code> method.
+ *
+ * <P>Creating a <CODE>MessageProducer</CODE> provides the same features as
+ * creating a <CODE>QueueSender</CODE>. A <CODE>MessageProducer</CODE> object is
+ * recommended when creating new code. The  <CODE>QueueSender</CODE> is
+ * provided to support existing code.
+ *
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.MessageProducer
+ * @see         javax.jms.Session#createProducer(Destination)
+ * @see         javax.jms.QueueSession#createSender(Queue)
+ */
 
-public interface QueueSender extends MessageProducer {
+public interface QueueSender extends MessageProducer
+{
 
-    /** Gets the queue associated with this <CODE>QueueSender</CODE>.
-      *  
-      * @return this sender's queue 
-      *  
-      * @exception JMSException if the JMS provider fails to get the queue for
-      *                         this <CODE>QueueSender</CODE>
-      *                         due to some internal error.
-      */ 
- 
-    Queue
-    getQueue() throws JMSException;
+  /** Gets the queue associated with this <CODE>QueueSender</CODE>.
+    *  
+    * @return this sender's queue 
+    *  
+    * @exception JMSException if the JMS provider fails to get the queue for
+    *                         this <CODE>QueueSender</CODE>
+    *                         due to some internal error.
+    */
 
+  Queue getQueue() throws JMSException;
 
-    /** Sends a message to the queue. Uses the <CODE>QueueSender</CODE>'s 
-      * default delivery mode, priority, and time to live.
-      *
-      * @param message the message to send 
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with a <CODE>QueueSender</CODE> with
-      *                         an invalid queue.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>QueueSender</CODE> that did
-      *                         not specify a queue at creation time.
-      * 
-      * @see javax.jms.MessageProducer#getDeliveryMode()
-      * @see javax.jms.MessageProducer#getTimeToLive()
-      * @see javax.jms.MessageProducer#getPriority()
-      */
+  /** Sends a message to the queue. Uses the <CODE>QueueSender</CODE>'s 
+    * default delivery mode, priority, and time to live.
+    *
+    * @param message the message to send 
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with a <CODE>QueueSender</CODE> with
+    *                         an invalid queue.
+    * @exception java.lang.UnsupportedOperationException if a client uses this
+    *                         method with a <CODE>QueueSender</CODE> that did
+    *                         not specify a queue at creation time.
+    * 
+    * @see javax.jms.MessageProducer#getDeliveryMode()
+    * @see javax.jms.MessageProducer#getTimeToLive()
+    * @see javax.jms.MessageProducer#getPriority()
+    */
 
-    void 
-    send(Message message) throws JMSException;
+  void send(Message message) throws JMSException;
 
+  /** Sends a message to the queue, specifying delivery mode, priority, and 
+    * time to live.
+    *
+    * @param message the message to send
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with a <CODE>QueueSender</CODE> with
+    *                         an invalid queue.
+    * @exception java.lang.UnsupportedOperationException if a client uses this
+    *                         method with a <CODE>QueueSender</CODE> that did
+    *                         not specify a queue at creation time.
+    */
 
-    /** Sends a message to the queue, specifying delivery mode, priority, and 
-      * time to live.
-      *
-      * @param message the message to send
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with a <CODE>QueueSender</CODE> with
-      *                         an invalid queue.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>QueueSender</CODE> that did
-      *                         not specify a queue at creation time.
-      */
+  void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
 
-    void 
-    send(Message message, 
-	 int deliveryMode, 
-	 int priority,
-	 long timeToLive) throws JMSException;
+  /** Sends a message to a queue for an unidentified message producer.
+    * Uses the <CODE>QueueSender</CODE>'s default delivery mode, priority,
+    * and time to live.
+    *
+    * <P>Typically, a message producer is assigned a queue at creation 
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the queue be supplied every time a message is
+    * sent.
+    *  
+    * @param queue the queue to send this message to
+    * @param message the message to send
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid queue.
+    * 
+    * @see javax.jms.MessageProducer#getDeliveryMode()
+    * @see javax.jms.MessageProducer#getTimeToLive()
+    * @see javax.jms.MessageProducer#getPriority()
+    */
 
+  void send(Queue queue, Message message) throws JMSException;
 
-    /** Sends a message to a queue for an unidentified message producer.
-      * Uses the <CODE>QueueSender</CODE>'s default delivery mode, priority,
-      * and time to live.
-      *
-      * <P>Typically, a message producer is assigned a queue at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the queue be supplied every time a message is
-      * sent.
-      *  
-      * @param queue the queue to send this message to
-      * @param message the message to send
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid queue.
-      * 
-      * @see javax.jms.MessageProducer#getDeliveryMode()
-      * @see javax.jms.MessageProducer#getTimeToLive()
-      * @see javax.jms.MessageProducer#getPriority()
-      */ 
- 
-    void
-    send(Queue queue, Message message) throws JMSException;
- 
- 
-    /** Sends a message to a queue for an unidentified message producer, 
-      * specifying delivery mode, priority and time to live.
-      *  
-      * <P>Typically, a message producer is assigned a queue at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the queue be supplied every time a message is
-      * sent.
-      *  
-      * @param queue the queue to send this message to
-      * @param message the message to send
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to send the message 
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid queue.
-      */ 
+  /** Sends a message to a queue for an unidentified message producer, 
+    * specifying delivery mode, priority and time to live.
+    *  
+    * <P>Typically, a message producer is assigned a queue at creation 
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the queue be supplied every time a message is
+    * sent.
+    *  
+    * @param queue the queue to send this message to
+    * @param message the message to send
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *  
+    * @exception JMSException if the JMS provider fails to send the message 
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid queue.
+    */
 
-    void
-    send(Queue queue, 
-	 Message message, 
-	 int deliveryMode, 
-	 int priority,
-	 long timeToLive) throws JMSException;
+  void send(Queue queue, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java
index 1c9399205e..d722bc3402 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/QueueSession.java
@@ -1,187 +1,171 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
-
 package javax.jms;
 
-/** A <CODE>QueueSession</CODE> object provides methods for creating 
-  * <CODE>QueueReceiver</CODE>, <CODE>QueueSender</CODE>, 
-  * <CODE>QueueBrowser</CODE>, and <CODE>TemporaryQueue</CODE> objects.
-  *
-  * <P>If there are messages that have been received but not acknowledged 
-  * when a <CODE>QueueSession</CODE> terminates, these messages will be retained 
-  * and redelivered when a consumer next accesses the queue.
-  *
-  *<P>A <CODE>QueueSession</CODE> is used for creating Point-to-Point specific
-  * objects. In general, use the <CODE>Session</CODE> object. 
-  * The <CODE>QueueSession</CODE> is used to support
-  * existing code. Using the <CODE>Session</CODE> object simplifies the 
-  * programming model, and allows transactions to be used across the two 
-  * messaging domains.
-  * 
-  * <P>A <CODE>QueueSession</CODE> cannot be used to create objects specific to the 
-  * publish/subscribe domain. The following methods inherit from 
-  * <CODE>Session</CODE>, but must throw an
-  * <CODE>IllegalStateException</CODE> 
-  * if they are used from <CODE>QueueSession</CODE>:
-  *<UL>
-  *   <LI><CODE>createDurableSubscriber</CODE>
-  *   <LI><CODE>createTemporaryTopic</CODE>
-  *   <LI><CODE>createTopic</CODE>
-  *   <LI><CODE>unsubscribe</CODE>
-  * </UL>
-  *
-  * @version     1.1 - April 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session
-  * @see         javax.jms.QueueConnection#createQueueSession(boolean, int)
-  * @see         javax.jms.XAQueueSession#getQueueSession()
-  */
-
-public interface QueueSession extends Session {
-
-    /** Creates a queue identity given a <CODE>Queue</CODE> name.
-      *
-      * <P>This facility is provided for the rare cases where clients need to
-      * dynamically manipulate queue identity. It allows the creation of a
-      * queue identity with a provider-specific name. Clients that depend 
-      * on this ability are not portable.
-      *
-      * <P>Note that this method is not for creating the physical queue. 
-      * The physical creation of queues is an administrative task and is not
-      * to be initiated by the JMS API. The one exception is the
-      * creation of temporary queues, which is accomplished with the 
-      * <CODE>createTemporaryQueue</CODE> method.
-      *
-      * @param queueName the name of this <CODE>Queue</CODE>
-      *
-      * @return a <CODE>Queue</CODE> with the given name
-      *
-      * @exception JMSException if the session fails to create a queue
-      *                         due to some internal error.
-      */ 
- 
-    Queue
-    createQueue(String queueName) throws JMSException;
-
-
-    /** Creates a <CODE>QueueReceiver</CODE> object to receive messages from the
-      * specified queue.
-      *
-      * @param queue the <CODE>Queue</CODE> to access
-      *
-      * @exception JMSException if the session fails to create a receiver
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      */
-
-    QueueReceiver
-    createReceiver(Queue queue) throws JMSException;
-
-
-    /** Creates a <CODE>QueueReceiver</CODE> object to receive messages from the 
-      * specified queue using a message selector.
-      *  
-      * @param queue the <CODE>Queue</CODE> to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      *  
-      * @exception JMSException if the session fails to create a receiver
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      */ 
-
-    QueueReceiver
-    createReceiver(Queue queue, 
-		   String messageSelector) throws JMSException;
-
-
-    /** Creates a <CODE>QueueSender</CODE> object to send messages to the 
-      * specified queue.
-      *
-      * @param queue the <CODE>Queue</CODE> to access, or null if this is an 
-      * unidentified producer
-      *
-      * @exception JMSException if the session fails to create a sender
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      */
- 
-    QueueSender
-    createSender(Queue queue) throws JMSException;
-
-
-    /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue.
-      *
-      * @param queue the <CODE>Queue</CODE> to access
-      *
-      * @exception JMSException if the session fails to create a browser
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      */
-
-    QueueBrowser 
-    createBrowser(Queue queue) throws JMSException;
-
-
-    /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue using a message selector.
-      *  
-      * @param queue the <CODE>Queue</CODE> to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      *  
-      * @exception JMSException if the session fails to create a browser
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid queue is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      */ 
-
-    QueueBrowser
-    createBrowser(Queue queue,
-		  String messageSelector) throws JMSException;
-
-
-    /** Creates a <CODE>TemporaryQueue</CODE> object. Its lifetime will be that 
-      * of the <CODE>QueueConnection</CODE> unless it is deleted earlier.
-      *
-      * @return a temporary queue identity
-      *
-      * @exception JMSException if the session fails to create a temporary queue
-      *                         due to some internal error.
-      */
-
-    TemporaryQueue
-    createTemporaryQueue() throws JMSException;
+/** A <CODE>QueueSession</CODE> object provides methods for creating
+ * <CODE>QueueReceiver</CODE>, <CODE>QueueSender</CODE>,
+ * <CODE>QueueBrowser</CODE>, and <CODE>TemporaryQueue</CODE> objects.
+ *
+ * <P>If there are messages that have been received but not acknowledged
+ * when a <CODE>QueueSession</CODE> terminates, these messages will be retained
+ * and redelivered when a consumer next accesses the queue.
+ *
+ *<P>A <CODE>QueueSession</CODE> is used for creating Point-to-Point specific
+ * objects. In general, use the <CODE>Session</CODE> object.
+ * The <CODE>QueueSession</CODE> is used to support
+ * existing code. Using the <CODE>Session</CODE> object simplifies the
+ * programming model, and allows transactions to be used across the two
+ * messaging domains.
+ *
+ * <P>A <CODE>QueueSession</CODE> cannot be used to create objects specific to the
+ * publish/subscribe domain. The following methods inherit from
+ * <CODE>Session</CODE>, but must throw an
+ * <CODE>IllegalStateException</CODE>
+ * if they are used from <CODE>QueueSession</CODE>:
+ *<UL>
+ *   <LI><CODE>createDurableSubscriber</CODE>
+ *   <LI><CODE>createTemporaryTopic</CODE>
+ *   <LI><CODE>createTopic</CODE>
+ *   <LI><CODE>unsubscribe</CODE>
+ * </UL>
+ *
+ * @version     1.1 - April 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session
+ * @see         javax.jms.QueueConnection#createQueueSession(boolean, int)
+ * @see         javax.jms.XAQueueSession#getQueueSession()
+ */
+
+public interface QueueSession extends Session
+{
+
+  /** Creates a queue identity given a <CODE>Queue</CODE> name.
+    *
+    * <P>This facility is provided for the rare cases where clients need to
+    * dynamically manipulate queue identity. It allows the creation of a
+    * queue identity with a provider-specific name. Clients that depend 
+    * on this ability are not portable.
+    *
+    * <P>Note that this method is not for creating the physical queue. 
+    * The physical creation of queues is an administrative task and is not
+    * to be initiated by the JMS API. The one exception is the
+    * creation of temporary queues, which is accomplished with the 
+    * <CODE>createTemporaryQueue</CODE> method.
+    *
+    * @param queueName the name of this <CODE>Queue</CODE>
+    *
+    * @return a <CODE>Queue</CODE> with the given name
+    *
+    * @exception JMSException if the session fails to create a queue
+    *                         due to some internal error.
+    */
+
+  Queue createQueue(String queueName) throws JMSException;
+
+  /** Creates a <CODE>QueueReceiver</CODE> object to receive messages from the
+    * specified queue.
+    *
+    * @param queue the <CODE>Queue</CODE> to access
+    *
+    * @exception JMSException if the session fails to create a receiver
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    */
+
+  QueueReceiver createReceiver(Queue queue) throws JMSException;
+
+  /** Creates a <CODE>QueueReceiver</CODE> object to receive messages from the 
+    * specified queue using a message selector.
+    *  
+    * @param queue the <CODE>Queue</CODE> to access
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    *  
+    * @exception JMSException if the session fails to create a receiver
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    *
+    */
+
+  QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException;
+
+  /** Creates a <CODE>QueueSender</CODE> object to send messages to the 
+    * specified queue.
+    *
+    * @param queue the <CODE>Queue</CODE> to access, or null if this is an 
+    * unidentified producer
+    *
+    * @exception JMSException if the session fails to create a sender
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    */
+
+  QueueSender createSender(Queue queue) throws JMSException;
+
+  /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
+    * the specified queue.
+    *
+    * @param queue the <CODE>Queue</CODE> to access
+    *
+    * @exception JMSException if the session fails to create a browser
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    */
+
+  QueueBrowser createBrowser(Queue queue) throws JMSException;
+
+  /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
+    * the specified queue using a message selector.
+    *  
+    * @param queue the <CODE>Queue</CODE> to access
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    *  
+    * @exception JMSException if the session fails to create a browser
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid queue is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    */
+
+  QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException;
+
+  /** Creates a <CODE>TemporaryQueue</CODE> object. Its lifetime will be that 
+    * of the <CODE>QueueConnection</CODE> unless it is deleted earlier.
+    *
+    * @return a temporary queue identity
+    *
+    * @exception JMSException if the session fails to create a temporary queue
+    *                         due to some internal error.
+    */
+
+  TemporaryQueue createTemporaryQueue() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ResourceAllocationException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ResourceAllocationException.java
index 9a865d2752..19e297996f 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ResourceAllocationException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ResourceAllocationException.java
@@ -1,33 +1,32 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /**
- * <P>This exception is thrown when a provider is unable to allocate the 
- *    resources required by a method. For example, this exception should be 
- *    thrown when a call to 
+ * <P>This exception is thrown when a provider is unable to allocate the
+ *    resources required by a method. For example, this exception should be
+ *    thrown when a call to
  *    <CODE>TopicConnectionFactory.createTopicConnection</CODE> fails due to a
  *    lack of JMS provider resources.
  *
@@ -35,28 +34,31 @@ package javax.jms;
  * @author      Rahul Sharma
  **/
 
-public class ResourceAllocationException extends JMSException {
+public class ResourceAllocationException extends JMSException
+{
+
+  private static final long serialVersionUID = 1L;
 
-  /** Constructs a <CODE>ResourceAllocationException</CODE> with the specified 
+  /** Constructs a <CODE>ResourceAllocationException</CODE> with the specified
    *  reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  ResourceAllocationException(String reason, String errorCode) {
+  public ResourceAllocationException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>ResourceAllocationException</CODE> with the specified 
+  /** Constructs a <CODE>ResourceAllocationException</CODE> with the specified
    *  reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  ResourceAllocationException(String reason) {
+  public ResourceAllocationException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java
index 85a224e1fd..d666104dc2 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSession.java
@@ -1,102 +1,99 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>ServerSession</CODE> object is an application server object that 
-  * is used by a server to associate a thread with a JMS session (optional).
-  *
-  * <P>A <CODE>ServerSession</CODE> implements two methods:
-  *
-  * <UL>
-  *   <LI><CODE>getSession</CODE> - returns the <CODE>ServerSession</CODE>'s 
-  *       JMS session.
-  *   <LI><CODE>start</CODE> - starts the execution of the 
-  *       <CODE>ServerSession</CODE> 
-  *       thread and results in the execution of the JMS session's 
-  *       <CODE>run</CODE> method.
-  * </UL>
-  *
-  * <P>A <CODE>ConnectionConsumer</CODE> implemented by a JMS provider uses a 
-  * <CODE>ServerSession</CODE> to process one or more messages that have 
-  * arrived. It does this by getting a <CODE>ServerSession</CODE> from the 
-  * <CODE>ConnectionConsumer</CODE>'s <CODE>ServerSessionPool</CODE>; getting 
-  * the <CODE>ServerSession</CODE>'s JMS session; loading it with the messages; 
-  * and then starting the <CODE>ServerSession</CODE>.
-  *
-  * <P>In most cases the <CODE>ServerSession</CODE> will register some object 
-  * it provides as the <CODE>ServerSession</CODE>'s thread run object. The 
-  * <CODE>ServerSession</CODE>'s <CODE>start</CODE> method will call the 
-  * thread's <CODE>start</CODE> method, which will start the new thread, and 
-  * from it, call the <CODE>run</CODE> method of the 
-  * <CODE>ServerSession</CODE>'s run object. This object will do some 
-  * housekeeping and then call the <CODE>Session</CODE>'s <CODE>run</CODE> 
-  * method. When <CODE>run</CODE> returns, the <CODE>ServerSession</CODE>'s run 
-  * object can return the <CODE>ServerSession</CODE> to the 
-  * <CODE>ServerSessionPool</CODE>, and the cycle starts again.
-  *
-  * <P>Note that the JMS API does not architect how the 
-  * <CODE>ConnectionConsumer</CODE> loads the <CODE>Session</CODE> with 
-  * messages. Since both the <CODE>ConnectionConsumer</CODE> and 
-  * <CODE>Session</CODE> are implemented by the same JMS provider, they can 
-  * accomplish the load using a private mechanism.
-  *
-  * @version     1.0 - 9 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.ServerSessionPool
-  * @see         javax.jms.ConnectionConsumer
-  */
-
-public interface ServerSession {
+/** A <CODE>ServerSession</CODE> object is an application server object that
+ * is used by a server to associate a thread with a JMS session (optional).
+ *
+ * <P>A <CODE>ServerSession</CODE> implements two methods:
+ *
+ * <UL>
+ *   <LI><CODE>getSession</CODE> - returns the <CODE>ServerSession</CODE>'s
+ *       JMS session.
+ *   <LI><CODE>start</CODE> - starts the execution of the
+ *       <CODE>ServerSession</CODE>
+ *       thread and results in the execution of the JMS session's
+ *       <CODE>run</CODE> method.
+ * </UL>
+ *
+ * <P>A <CODE>ConnectionConsumer</CODE> implemented by a JMS provider uses a
+ * <CODE>ServerSession</CODE> to process one or more messages that have
+ * arrived. It does this by getting a <CODE>ServerSession</CODE> from the
+ * <CODE>ConnectionConsumer</CODE>'s <CODE>ServerSessionPool</CODE>; getting
+ * the <CODE>ServerSession</CODE>'s JMS session; loading it with the messages;
+ * and then starting the <CODE>ServerSession</CODE>.
+ *
+ * <P>In most cases the <CODE>ServerSession</CODE> will register some object
+ * it provides as the <CODE>ServerSession</CODE>'s thread run object. The
+ * <CODE>ServerSession</CODE>'s <CODE>start</CODE> method will call the
+ * thread's <CODE>start</CODE> method, which will start the new thread, and
+ * from it, call the <CODE>run</CODE> method of the
+ * <CODE>ServerSession</CODE>'s run object. This object will do some
+ * housekeeping and then call the <CODE>Session</CODE>'s <CODE>run</CODE>
+ * method. When <CODE>run</CODE> returns, the <CODE>ServerSession</CODE>'s run
+ * object can return the <CODE>ServerSession</CODE> to the
+ * <CODE>ServerSessionPool</CODE>, and the cycle starts again.
+ *
+ * <P>Note that the JMS API does not architect how the
+ * <CODE>ConnectionConsumer</CODE> loads the <CODE>Session</CODE> with
+ * messages. Since both the <CODE>ConnectionConsumer</CODE> and
+ * <CODE>Session</CODE> are implemented by the same JMS provider, they can
+ * accomplish the load using a private mechanism.
+ *
+ * @version     1.0 - 9 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.ServerSessionPool
+ * @see         javax.jms.ConnectionConsumer
+ */
 
-    /** Return the <CODE>ServerSession</CODE>'s <CODE>Session</CODE>. This must 
-      * be a <CODE>Session</CODE> created by the same <CODE>Connection</CODE> 
-      * that will be dispatching messages to it. The provider will assign one or
-      * more messages to the <CODE>Session</CODE> 
-      * and then call <CODE>start</CODE> on the <CODE>ServerSession</CODE>.
-      *
-      * @return the server session's session
-      *  
-      * @exception JMSException if the JMS provider fails to get the associated
-      *                         session for this <CODE>ServerSession</CODE> due
-      *                         to some internal error.
-      **/
+public interface ServerSession
+{
 
-    Session
-    getSession() throws JMSException;
+  /** Return the <CODE>ServerSession</CODE>'s <CODE>Session</CODE>. This must 
+    * be a <CODE>Session</CODE> created by the same <CODE>Connection</CODE> 
+    * that will be dispatching messages to it. The provider will assign one or
+    * more messages to the <CODE>Session</CODE> 
+    * and then call <CODE>start</CODE> on the <CODE>ServerSession</CODE>.
+    *
+    * @return the server session's session
+    *  
+    * @exception JMSException if the JMS provider fails to get the associated
+    *                         session for this <CODE>ServerSession</CODE> due
+    *                         to some internal error.
+    **/
 
+  Session getSession() throws JMSException;
 
-    /** Cause the <CODE>Session</CODE>'s <CODE>run</CODE> method to be called 
-      * to process messages that were just assigned to it.
-      *  
-      * @exception JMSException if the JMS provider fails to start the server
-      *                         session to process messages due to some internal
-      *                         error.
-      */
+  /** Cause the <CODE>Session</CODE>'s <CODE>run</CODE> method to be called 
+    * to process messages that were just assigned to it.
+    *  
+    * @exception JMSException if the JMS provider fails to start the server
+    *                         session to process messages due to some internal
+    *                         error.
+    */
 
-    void 
-    start() throws JMSException; 
+  void start() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java
index 858b937a2a..b0f826dc6c 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/ServerSessionPool.java
@@ -1,63 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>ServerSessionPool</CODE> object is an object implemented by an 
-  * application server to provide a pool of <CODE>ServerSession</CODE> objects 
-  * for processing the messages of a <CODE>ConnectionConsumer</CODE> (optional).
-  *
-  * <P>Its only method is <CODE>getServerSession</CODE>. The JMS API does not 
-  * architect how the pool is implemented. It could be a static pool of 
-  * <CODE>ServerSession</CODE> objects, or it could use a sophisticated 
-  * algorithm to dynamically create <CODE>ServerSession</CODE> objects as 
-  * needed.
-  *
-  * <P>If the <CODE>ServerSessionPool</CODE> is out of 
-  * <CODE>ServerSession</CODE> objects, the <CODE>getServerSession</CODE> call 
-  * may block. If a <CODE>ConnectionConsumer</CODE> is blocked, it cannot 
-  * deliver new messages until a <CODE>ServerSession</CODE> is 
-  * eventually returned.
-  *
-  * @version     1.0 - 9 March 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see javax.jms.ServerSession
-  */
+/** A <CODE>ServerSessionPool</CODE> object is an object implemented by an
+ * application server to provide a pool of <CODE>ServerSession</CODE> objects
+ * for processing the messages of a <CODE>ConnectionConsumer</CODE> (optional).
+ *
+ * <P>Its only method is <CODE>getServerSession</CODE>. The JMS API does not
+ * architect how the pool is implemented. It could be a static pool of
+ * <CODE>ServerSession</CODE> objects, or it could use a sophisticated
+ * algorithm to dynamically create <CODE>ServerSession</CODE> objects as
+ * needed.
+ *
+ * <P>If the <CODE>ServerSessionPool</CODE> is out of
+ * <CODE>ServerSession</CODE> objects, the <CODE>getServerSession</CODE> call
+ * may block. If a <CODE>ConnectionConsumer</CODE> is blocked, it cannot
+ * deliver new messages until a <CODE>ServerSession</CODE> is
+ * eventually returned.
+ *
+ * @version     1.0 - 9 March 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see javax.jms.ServerSession
+ */
 
-public interface ServerSessionPool {
+public interface ServerSessionPool
+{
 
-    /** Return a server session from the pool.
-      *
-      * @return a server session from the pool
-      *  
-      * @exception JMSException if an application server fails to
-      *                         return a <CODE>ServerSession</CODE> out of its
-      *                         server session pool.
-      */ 
+  /** Return a server session from the pool.
+    *
+    * @return a server session from the pool
+    *  
+    * @exception JMSException if an application server fails to
+    *                         return a <CODE>ServerSession</CODE> out of its
+    *                         server session pool.
+    */
 
-    ServerSession
-    getServerSession() throws JMSException;
+  ServerSession getServerSession() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Session.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
index c71cddfd48..443c05dcc9 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Session.java
@@ -1,807 +1,748 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
-
 package javax.jms;
 
 import java.io.Serializable;
 
-/** <P>A <CODE>Session</CODE> object is a single-threaded context for producing and consuming 
-  * messages. Although it may allocate provider resources outside the Java 
-  * virtual machine (JVM), it is considered a lightweight JMS object.
+/** <P>A <CODE>Session</CODE> object is a single-threaded context for producing and consuming
+ * messages. Although it may allocate provider resources outside the Java
+ * virtual machine (JVM), it is considered a lightweight JMS object.
+ *
+ * <P>A session serves several purposes:
+ *
+ * <UL>
+ *   <LI>It is a factory for its message producers and consumers.
+ *   <LI>It supplies provider-optimized message factories.
+ *   <LI>It is a factory for <CODE>TemporaryTopics</CODE> and
+ *        <CODE>TemporaryQueues</CODE>.
+ *   <LI> It provides a way to create <CODE>Queue</CODE> or <CODE>Topic</CODE>
+ *      objects for those clients that need to dynamically manipulate
+ *      provider-specific destination names.
+ *   <LI>It supports a single series of transactions that combine work
+ *       spanning its producers and consumers into atomic units.
+ *   <LI>It defines a serial order for the messages it consumes and
+ *       the messages it produces.
+ *   <LI>It retains messages it consumes until they have been
+ *       acknowledged.
+ *   <LI>It serializes execution of message listeners registered with
+ *       its message consumers.
+ *   <LI> It is a factory for <CODE>QueueBrowsers</CODE>.
+ * </UL>
+ *
+ * <P>A session can create and service multiple message producers and
+ * consumers.
+ *
+ * <P>One typical use is to have a thread block on a synchronous
+ * <CODE>MessageConsumer</CODE> until a message arrives. The thread may then
+ * use one or more of the <CODE>Session</CODE>'s <CODE>MessageProducer</CODE>s.
+ *
+ * <P>If a client desires to have one thread produce messages while others
+ * consume them, the client should use a separate session for its producing
+ * thread.
+ *
+ * <P>Once a connection has been started, any session with one or more
+ * registered message listeners is dedicated to the thread of control that
+ * delivers messages to it. It is erroneous for client code to use this session
+ * or any of its constituent objects from another thread of control. The
+ * only exception to this rule is the use of the session or connection
+ * <CODE>close</CODE> method.
+ *
+ * <P>It should be easy for most clients to partition their work naturally
+ * into sessions. This model allows clients to start simply and incrementally
+ * add message processing complexity as their need for concurrency grows.
+ *
+ * <P>The <CODE>close</CODE> method is the only session method that can be
+ * called while some other session method is being executed in another thread.
+ *
+ * <P>A session may be specified as transacted. Each transacted
+ * session supports a single series of transactions. Each transaction groups
+ * a set of message sends and a set of message receives into an atomic unit
+ * of work. In effect, transactions organize a session's input message
+ * stream and output message stream into series of atomic units. When a
+ * transaction commits, its atomic unit of input is acknowledged and its
+ * associated atomic unit of output is sent. If a transaction rollback is
+ * done, the transaction's sent messages are destroyed and the session's input
+ * is automatically recovered.
+ *
+ * <P>The content of a transaction's input and output units is simply those
+ * messages that have been produced and consumed within the session's current
+ * transaction.
+ *
+ * <P>A transaction is completed using either its session's <CODE>commit</CODE>
+ * method or its session's <CODE>rollback</CODE> method. The completion of a
+ * session's current transaction automatically begins the next. The result is
+ * that a transacted session always has a current transaction within which its
+ * work is done.
+ *
+ * <P>The Java Transaction Service (JTS) or some other transaction monitor may
+ * be used to combine a session's transaction with transactions on other
+ * resources (databases, other JMS sessions, etc.). Since Java distributed
+ * transactions are controlled via the Java Transaction API (JTA), use of the
+ * session's <CODE>commit</CODE> and <CODE>rollback</CODE> methods in
+ * this context is prohibited.
+ *
+ * <P>The JMS API does not require support for JTA; however, it does define
+ * how a provider supplies this support.
+ *
+ * <P>Although it is also possible for a JMS client to handle distributed
+ * transactions directly, it is unlikely that many JMS clients will do this.
+ * Support for JTA in the JMS API is targeted at systems vendors who will be
+ * integrating the JMS API into their application server products.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.QueueSession
+ * @see         javax.jms.TopicSession
+ * @see         javax.jms.XASession
+ */
+
+public interface Session extends Runnable
+{
+
+  /** With this acknowledgment mode, the session automatically acknowledges
+    * a client's receipt of a message either when the session has successfully 
+    * returned from a call to <CODE>receive</CODE> or when the message 
+    * listener the session has called to process the message successfully 
+    * returns.
+    */
+
+  static final int AUTO_ACKNOWLEDGE = 1;
+
+  /** With this acknowledgment mode, the client acknowledges a consumed 
+    * message by calling the message's <CODE>acknowledge</CODE> method. 
+    * Acknowledging a consumed message acknowledges all messages that the 
+    * session has consumed.
+    *
+    * <P>When client acknowledgment mode is used, a client may build up a 
+    * large number of unacknowledged messages while attempting to process 
+    * them. A JMS provider should provide administrators with a way to 
+    * limit client overrun so that clients are not driven to resource 
+    * exhaustion and ensuing failure when some resource they are using 
+    * is temporarily blocked.
+    *
+    * @see javax.jms.Message#acknowledge()
+    */
+
+  static final int CLIENT_ACKNOWLEDGE = 2;
+
+  /** This acknowledgment mode instructs the session to lazily acknowledge 
+    * the delivery of messages. This is likely to result in the delivery of 
+    * some duplicate messages if the JMS provider fails, so it should only be 
+    * used by consumers that can tolerate duplicate messages. Use of this  
+    * mode can reduce session overhead by minimizing the work the 
+    * session does to prevent duplicates.
+    */
+
+  static final int DUPS_OK_ACKNOWLEDGE = 3;
+
+  /** This value is returned from the method 
+   * <CODE>getAcknowledgeMode</CODE> if the session is transacted.
+   * If a <CODE>Session</CODE> is transacted, the acknowledgement mode
+   * is ignored.
+   */
+  static final int SESSION_TRANSACTED = 0;
+
+  /** Creates a <CODE>BytesMessage</CODE> object. A <CODE>BytesMessage</CODE> 
+    * object is used to send a message containing a stream of uninterpreted 
+    * bytes.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  BytesMessage createBytesMessage() throws JMSException;
+
+  /** Creates a <CODE>MapMessage</CODE> object. A <CODE>MapMessage</CODE> 
+    * object is used to send a self-defining set of name-value pairs, where 
+    * names are <CODE>String</CODE> objects and values are primitive values 
+    * in the Java programming language.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  MapMessage createMapMessage() throws JMSException;
+
+  /** Creates a <CODE>Message</CODE> object. The <CODE>Message</CODE> 
+    * interface is the root interface of all JMS messages. A 
+    * <CODE>Message</CODE> object holds all the 
+    * standard message header information. It can be sent when a message 
+    * containing only header information is sufficient.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  Message createMessage() throws JMSException;
+
+  /** Creates an <CODE>ObjectMessage</CODE> object. An 
+    * <CODE>ObjectMessage</CODE> object is used to send a message 
+    * that contains a serializable Java object.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  ObjectMessage createObjectMessage() throws JMSException;
+
+  /** Creates an initialized <CODE>ObjectMessage</CODE> object. An 
+    * <CODE>ObjectMessage</CODE> object is used 
+    * to send a message that contains a serializable Java object.
+    *  
+    * @param object the object to use to initialize this message
+    *
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  ObjectMessage createObjectMessage(Serializable object) throws JMSException;
+
+  /** Creates a <CODE>StreamMessage</CODE> object. A 
+    * <CODE>StreamMessage</CODE> object is used to send a 
+    * self-defining stream of primitive values in the Java programming 
+    * language.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  StreamMessage createStreamMessage() throws JMSException;
+
+  /** Creates a <CODE>TextMessage</CODE> object. A <CODE>TextMessage</CODE> 
+    * object is used to send a message containing a <CODE>String</CODE>
+    * object.
+    *  
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  TextMessage createTextMessage() throws JMSException;
+
+  /** Creates an initialized <CODE>TextMessage</CODE> object. A 
+    * <CODE>TextMessage</CODE> object is used to send 
+    * a message containing a <CODE>String</CODE>.
+    *
+    * @param text the string used to initialize this message
+    *
+    * @exception JMSException if the JMS provider fails to create this message
+    *                         due to some internal error.
+    */
+
+  TextMessage createTextMessage(String text) throws JMSException;
+
+  /** Indicates whether the session is in transacted mode.
+    *  
+    * @return true if the session is in transacted mode
+    *  
+    * @exception JMSException if the JMS provider fails to return the 
+    *                         transaction mode due to some internal error.
+    */
+
+  boolean getTransacted() throws JMSException;
+
+  /** Returns the acknowledgement mode of the session. The acknowledgement
+   * mode is set at the time that the session is created. If the session is
+   * transacted, the acknowledgement mode is ignored.
+   *
+   *@return            If the session is not transacted, returns the 
+   *                  current acknowledgement mode for the session.
+   *                  If the session
+   *                  is transacted, returns SESSION_TRANSACTED.
+   *
+   *@exception JMSException   if the JMS provider fails to return the 
+   *                         acknowledgment mode due to some internal error.
+   *
+   *@see Connection#createSession
+   *@since 1.1
+   */
+  int getAcknowledgeMode() throws JMSException;
+
+  /** Commits all messages done in this transaction and releases any locks
+    * currently held.
+    *
+    * @exception JMSException if the JMS provider fails to commit the
+    *                         transaction due to some internal error.
+    * @exception TransactionRolledBackException if the transaction
+    *                         is rolled back due to some internal error
+    *                         during commit.
+    * @exception IllegalStateException if the method is not called by a 
+    *                         transacted session.
+    */
+
+  void commit() throws JMSException;
+
+  /** Rolls back any messages done in this transaction and releases any locks 
+    * currently held.
+    *
+    * @exception JMSException if the JMS provider fails to roll back the
+    *                         transaction due to some internal error.
+    * @exception IllegalStateException if the method is not called by a 
+    *                         transacted session.
+    *                                     
+    */
+
+  void rollback() throws JMSException;
+
+  /** Closes the session.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a session 
+    * outside the JVM, clients should close the resources when they are not 
+    * needed. 
+    * Relying on garbage collection to eventually reclaim these resources 
+    * may not be timely enough.
+    *
+    * <P>There is no need to close the producers and consumers
+    * of a closed session. 
+    *
+    * <P> This call will block until a <CODE>receive</CODE> call or message 
+    * listener in progress has completed. A blocked message consumer
+    * <CODE>receive</CODE> call returns <CODE>null</CODE> when this session 
+    * is closed.
+    *
+    * <P>Closing a transacted session must roll back the transaction
+    * in progress.
+    * 
+    * <P>This method is the only <CODE>Session</CODE> method that can 
+    * be called concurrently. 
+    *
+    * <P>Invoking any other <CODE>Session</CODE> method on a closed session 
+    * must throw a <CODE>JMSException.IllegalStateException</CODE>. Closing a 
+    * closed session must <I>not</I> throw an exception.
+    * 
+    * @exception JMSException if the JMS provider fails to close the
+    *                         session due to some internal error.
+    */
+
+  void close() throws JMSException;
+
+  /** Stops message delivery in this session, and restarts message delivery
+    * with the oldest unacknowledged message.
+    *  
+    * <P>All consumers deliver messages in a serial order.
+    * Acknowledging a received message automatically acknowledges all 
+    * messages that have been delivered to the client.
+    *
+    * <P>Restarting a session causes it to take the following actions:
+    *
+    * <UL>
+    *   <LI>Stop message delivery
+    *   <LI>Mark all messages that might have been delivered but not 
+    *       acknowledged as "redelivered"
+    *   <LI>Restart the delivery sequence including all unacknowledged 
+    *       messages that had been previously delivered. Redelivered messages
+    *       do not have to be delivered in 
+    *       exactly their original delivery order.
+    * </UL>
+    *
+    * @exception JMSException if the JMS provider fails to stop and restart
+    *                         message delivery due to some internal error.
+    * @exception IllegalStateException if the method is called by a 
+    *                         transacted session.
+    */
+
+  void recover() throws JMSException;
+
+  /** Returns the session's distinguished message listener (optional).
+    *
+    * @return the message listener associated with this session
+    *
+    * @exception JMSException if the JMS provider fails to get the message 
+    *                         listener due to an internal error.
+    *
+    * @see javax.jms.Session#setMessageListener
+    * @see javax.jms.ServerSessionPool
+    * @see javax.jms.ServerSession
+    */
+
+  MessageListener getMessageListener() throws JMSException;
+
+  /** Sets the session's distinguished message listener (optional).
+    *
+    * <P>When the distinguished message listener is set, no other form of 
+    * message receipt in the session can 
+    * be used; however, all forms of sending messages are still supported.
+    * 
+    * <P>This is an expert facility not used by regular JMS clients.
+    *
+    * @param listener the message listener to associate with this session
+    *
+    * @exception JMSException if the JMS provider fails to set the message 
+    *                         listener due to an internal error.
+    *
+    * @see javax.jms.Session#getMessageListener
+    * @see javax.jms.ServerSessionPool
+    * @see javax.jms.ServerSession
+    */
+
+  void setMessageListener(MessageListener listener) throws JMSException;
+
+  /**
+   * Optional operation, intended to be used only by Application Servers,
+   * not by ordinary JMS clients.
+   *
+   * @see javax.jms.ServerSession
+   */
+  public void run();
+
+  /** Creates a <CODE>MessageProducer</CODE> to send messages to the specified 
+    * destination.
+    *
+    * <P>A client uses a <CODE>MessageProducer</CODE> object to send 
+    * messages to a destination. Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
+    * both inherit from <CODE>Destination</CODE>, they can be used in
+    * the destination parameter to create a <CODE>MessageProducer</CODE> object.
+    * 
+    * @param destination the <CODE>Destination</CODE> to send to, 
+    * or null if this is a producer which does not have a specified 
+    * destination.
+    *
+    * @exception JMSException if the session fails to create a MessageProducer
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid destination
+    * is specified.
+    *
+    * @since 1.1 
+    * 
+   */
+
+  MessageProducer createProducer(Destination destination) throws JMSException;
+
+  /** Creates a <CODE>MessageConsumer</CODE> for the specified destination.
+  * Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
+  * both inherit from <CODE>Destination</CODE>, they can be used in
+  * the destination parameter to create a <CODE>MessageConsumer</CODE>.
+  *
+  * @param destination the <CODE>Destination</CODE> to access. 
+  *
+  * @exception JMSException if the session fails to create a consumer
+  *                         due to some internal error.
+  * @exception InvalidDestinationException if an invalid destination 
+  *                         is specified.
+  *
+  * @since 1.1 
+  */
+
+  MessageConsumer createConsumer(Destination destination) throws JMSException;
+
+  /** Creates a <CODE>MessageConsumer</CODE> for the specified destination, 
+  * using a message selector. 
+  * Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
+  * both inherit from <CODE>Destination</CODE>, they can be used in
+  * the destination parameter to create a <CODE>MessageConsumer</CODE>.
   *
-  * <P>A session serves several purposes:
+  * <P>A client uses a <CODE>MessageConsumer</CODE> object to receive 
+  * messages that have been sent to a destination.
+  *  
+  *       
+  * @param destination the <CODE>Destination</CODE> to access
+  * @param messageSelector only messages with properties matching the
+  * message selector expression are delivered. A value of null or
+  * an empty string indicates that there is no message selector 
+  * for the message consumer. 
+  * 
+  *  
+  * @exception JMSException if the session fails to create a MessageConsumer
+  *                         due to some internal error.
+  * @exception InvalidDestinationException if an invalid destination
+  * is specified.
+  
+  * @exception InvalidSelectorException if the message selector is invalid.
   *
-  * <UL>
-  *   <LI>It is a factory for its message producers and consumers.
-  *   <LI>It supplies provider-optimized message factories.
-  *   <LI>It is a factory for <CODE>TemporaryTopics</CODE> and 
-  *        <CODE>TemporaryQueues</CODE>. 
-  *   <LI> It provides a way to create <CODE>Queue</CODE> or <CODE>Topic</CODE>
-  *      objects for those clients that need to dynamically manipulate 
-  *      provider-specific destination names.
-  *   <LI>It supports a single series of transactions that combine work 
-  *       spanning its producers and consumers into atomic units.
-  *   <LI>It defines a serial order for the messages it consumes and 
-  *       the messages it produces.
-  *   <LI>It retains messages it consumes until they have been 
-  *       acknowledged.
-  *   <LI>It serializes execution of message listeners registered with 
-  *       its message consumers.
-  *   <LI> It is a factory for <CODE>QueueBrowsers</CODE>.
-  * </UL>
+  * @since 1.1 
+  */
+  MessageConsumer createConsumer(Destination destination, java.lang.String messageSelector) throws JMSException;
+
+  /** Creates <CODE>MessageConsumer</CODE> for the specified destination, using a
+   * message selector. This method can specify whether messages published by 
+   * its own connection should be delivered to it, if the destination is a 
+   * topic. 
+   *<P> Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
+   * both inherit from <CODE>Destination</CODE>, they can be used in
+   * the destination parameter to create a <CODE>MessageConsumer</CODE>.
+   * <P>A client uses a <CODE>MessageConsumer</CODE> object to receive 
+   * messages that have been published to a destination. 
+   *               
+   * <P>In some cases, a connection may both publish and subscribe to a 
+   * topic. The consumer <CODE>NoLocal</CODE> attribute allows a consumer
+   * to inhibit the delivery of messages published by its own connection.
+   * The default value for this attribute is False. The <CODE>noLocal</CODE> 
+   * value must be supported by destinations that are topics. 
+   *
+   * @param destination the <CODE>Destination</CODE> to access 
+   * @param messageSelector only messages with properties matching the
+   * message selector expression are delivered. A value of null or
+   * an empty string indicates that there is no message selector 
+   * for the message consumer.
+   * @param NoLocal  - if true, and the destination is a topic,
+   *                   inhibits the delivery of messages published
+   *                   by its own connection.  The behavior for
+   *                   <CODE>NoLocal</CODE> is 
+   *                   not specified if the destination is a queue.
+   * 
+   * @exception JMSException if the session fails to create a MessageConsumer
+   *                         due to some internal error.
+   * @exception InvalidDestinationException if an invalid destination
+    * is specified.
+  
+   * @exception InvalidSelectorException if the message selector is invalid.
+   *
+   * @since 1.1 
+   *
+   */
+  MessageConsumer createConsumer(Destination destination, java.lang.String messageSelector, boolean NoLocal)
+      throws JMSException;
+
+  /** Creates a queue identity given a <CODE>Queue</CODE> name.
   *
-  * <P>A session can create and service multiple message producers and 
-  * consumers.
+  * <P>This facility is provided for the rare cases where clients need to
+  * dynamically manipulate queue identity. It allows the creation of a
+  * queue identity with a provider-specific name. Clients that depend 
+  * on this ability are not portable.
   *
-  * <P>One typical use is to have a thread block on a synchronous 
-  * <CODE>MessageConsumer</CODE> until a message arrives. The thread may then
-  * use one or more of the <CODE>Session</CODE>'s <CODE>MessageProducer</CODE>s.
+  * <P>Note that this method is not for creating the physical queue. 
+  * The physical creation of queues is an administrative task and is not
+  * to be initiated by the JMS API. The one exception is the
+  * creation of temporary queues, which is accomplished with the 
+  * <CODE>createTemporaryQueue</CODE> method.
   *
-  * <P>If a client desires to have one thread produce messages while others 
-  * consume them, the client should use a separate session for its producing 
-  * thread.
+  * @param queueName the name of this <CODE>Queue</CODE>
   *
-  * <P>Once a connection has been started, any session with one or more 
-  * registered message listeners is dedicated to the thread of control that 
-  * delivers messages to it. It is erroneous for client code to use this session
-  * or any of its constituent objects from another thread of control. The
-  * only exception to this rule is the use of the session or connection 
-  * <CODE>close</CODE> method.
+  * @return a <CODE>Queue</CODE> with the given name
   *
-  * <P>It should be easy for most clients to partition their work naturally
-  * into sessions. This model allows clients to start simply and incrementally
-  * add message processing complexity as their need for concurrency grows.
+  * @exception JMSException if the session fails to create a queue
+  *                         due to some internal error.
+  * @since 1.1
+  */
+
+  Queue createQueue(String queueName) throws JMSException;
+
+  /** Creates a topic identity given a <CODE>Topic</CODE> name.
   *
-  * <P>The <CODE>close</CODE> method is the only session method that can be 
-  * called while some other session method is being executed in another thread.
+  * <P>This facility is provided for the rare cases where clients need to
+  * dynamically manipulate topic identity. This allows the creation of a
+  * topic identity with a provider-specific name. Clients that depend 
+  * on this ability are not portable.
   *
-  * <P>A session may be specified as transacted. Each transacted 
-  * session supports a single series of transactions. Each transaction groups 
-  * a set of message sends and a set of message receives into an atomic unit 
-  * of work. In effect, transactions organize a session's input message 
-  * stream and output message stream into series of atomic units. When a 
-  * transaction commits, its atomic unit of input is acknowledged and its 
-  * associated atomic unit of output is sent. If a transaction rollback is 
-  * done, the transaction's sent messages are destroyed and the session's input 
-  * is automatically recovered.
+  * <P>Note that this method is not for creating the physical topic. 
+  * The physical creation of topics is an administrative task and is not
+  * to be initiated by the JMS API. The one exception is the
+  * creation of temporary topics, which is accomplished with the 
+  * <CODE>createTemporaryTopic</CODE> method.
+  *  
+  * @param topicName the name of this <CODE>Topic</CODE>
   *
-  * <P>The content of a transaction's input and output units is simply those 
-  * messages that have been produced and consumed within the session's current 
-  * transaction.
+  * @return a <CODE>Topic</CODE> with the given name
   *
-  * <P>A transaction is completed using either its session's <CODE>commit</CODE>
-  * method or its session's <CODE>rollback</CODE> method. The completion of a
-  * session's current transaction automatically begins the next. The result is
-  * that a transacted session always has a current transaction within which its 
-  * work is done.  
+  * @exception JMSException if the session fails to create a topic
+  *                         due to some internal error.
+  * @since 1.1
+  */
+
+  Topic createTopic(String topicName) throws JMSException;
+
+  /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
+   * the specified queue.
+   *
+   * @param queue the <CODE>queue</CODE> to access
+   *
+   * @exception InvalidDestinationException if an invalid destination
+   *                         is specified 
+   *
+   * @since 1.1 
+   */
+
+  /** Creates a durable subscriber to the specified topic.
+  *  
+  * <P>If a client needs to receive all the messages published on a 
+  * topic, including the ones published while the subscriber is inactive,
+  * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
+  * retains a record of this 
+  * durable subscription and insures that all messages from the topic's 
+  * publishers are retained until they are acknowledged by this 
+  * durable subscriber or they have expired.
   *
-  * <P>The Java Transaction Service (JTS) or some other transaction monitor may 
-  * be used to combine a session's transaction with transactions on other 
-  * resources (databases, other JMS sessions, etc.). Since Java distributed 
-  * transactions are controlled via the Java Transaction API (JTA), use of the 
-  * session's <CODE>commit</CODE> and <CODE>rollback</CODE> methods in 
-  * this context is prohibited.
+  * <P>Sessions with durable subscribers must always provide the same 
+  * client identifier. In addition, each client must specify a name that 
+  * uniquely identifies (within client identifier) each durable 
+  * subscription it creates. Only one session at a time can have a 
+  * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
   *
-  * <P>The JMS API does not require support for JTA; however, it does define 
-  * how a provider supplies this support.
+  * <P>A client can change an existing durable subscription by creating 
+  * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
+  * topic and/or 
+  * message selector. Changing a durable subscriber is equivalent to 
+  * unsubscribing (deleting) the old one and creating a new one.
   *
-  * <P>Although it is also possible for a JMS client to handle distributed 
-  * transactions directly, it is unlikely that many JMS clients will do this.
-  * Support for JTA in the JMS API is targeted at systems vendors who will be 
-  * integrating the JMS API into their application server products.
+  * <P>In some cases, a connection may both publish and subscribe to a 
+  * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
+  * to inhibit the delivery of messages published by its own connection.
+  * The default value for this attribute is false.
   *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
+  * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
+  * @param name the name used to identify this subscription
+  *  
+  * @exception JMSException if the session fails to create a subscriber
+  *                         due to some internal error.
+  * @exception InvalidDestinationException if an invalid topic is specified.
   *
-  * @see         javax.jms.QueueSession
-  * @see         javax.jms.TopicSession
-  * @see         javax.jms.XASession
-  */ 
- 
-public interface Session extends Runnable {
-
-    /** With this acknowledgment mode, the session automatically acknowledges
-      * a client's receipt of a message either when the session has successfully 
-      * returned from a call to <CODE>receive</CODE> or when the message 
-      * listener the session has called to process the message successfully 
-      * returns.
-      */ 
-
-    static final int AUTO_ACKNOWLEDGE = 1;
-
-    /** With this acknowledgment mode, the client acknowledges a consumed 
-      * message by calling the message's <CODE>acknowledge</CODE> method. 
-      * Acknowledging a consumed message acknowledges all messages that the 
-      * session has consumed.
-      *
-      * <P>When client acknowledgment mode is used, a client may build up a 
-      * large number of unacknowledged messages while attempting to process 
-      * them. A JMS provider should provide administrators with a way to 
-      * limit client overrun so that clients are not driven to resource 
-      * exhaustion and ensuing failure when some resource they are using 
-      * is temporarily blocked.
-      *
-      * @see javax.jms.Message#acknowledge()
-      */ 
-
-    static final int CLIENT_ACKNOWLEDGE = 2;
-
-    /** This acknowledgment mode instructs the session to lazily acknowledge 
-      * the delivery of messages. This is likely to result in the delivery of 
-      * some duplicate messages if the JMS provider fails, so it should only be 
-      * used by consumers that can tolerate duplicate messages. Use of this  
-      * mode can reduce session overhead by minimizing the work the 
-      * session does to prevent duplicates.
-      */
-
-    static final int DUPS_OK_ACKNOWLEDGE = 3;
-    
-    /** This value is returned from the method 
-     * <CODE>getAcknowledgeMode</CODE> if the session is transacted.
-     * If a <CODE>Session</CODE> is transacted, the acknowledgement mode
-     * is ignored.
-     */
-    static final int SESSION_TRANSACTED = 0;
-
-    /** Creates a <CODE>BytesMessage</CODE> object. A <CODE>BytesMessage</CODE> 
-      * object is used to send a message containing a stream of uninterpreted 
-      * bytes.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-    
-
-    BytesMessage 
-    createBytesMessage() throws JMSException; 
-
- 
-    /** Creates a <CODE>MapMessage</CODE> object. A <CODE>MapMessage</CODE> 
-      * object is used to send a self-defining set of name-value pairs, where 
-      * names are <CODE>String</CODE> objects and values are primitive values 
-      * in the Java programming language.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    MapMessage 
-    createMapMessage() throws JMSException; 
-
- 
-    /** Creates a <CODE>Message</CODE> object. The <CODE>Message</CODE> 
-      * interface is the root interface of all JMS messages. A 
-      * <CODE>Message</CODE> object holds all the 
-      * standard message header information. It can be sent when a message 
-      * containing only header information is sufficient.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    Message
-    createMessage() throws JMSException;
-
-
-    /** Creates an <CODE>ObjectMessage</CODE> object. An 
-      * <CODE>ObjectMessage</CODE> object is used to send a message 
-      * that contains a serializable Java object.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    ObjectMessage
-    createObjectMessage() throws JMSException; 
-
-
-    /** Creates an initialized <CODE>ObjectMessage</CODE> object. An 
-      * <CODE>ObjectMessage</CODE> object is used 
-      * to send a message that contains a serializable Java object.
-      *  
-      * @param object the object to use to initialize this message
-      *
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    ObjectMessage
-    createObjectMessage(Serializable object) throws JMSException;
-
- 
-    /** Creates a <CODE>StreamMessage</CODE> object. A 
-      * <CODE>StreamMessage</CODE> object is used to send a 
-      * self-defining stream of primitive values in the Java programming 
-      * language.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */
-
-    StreamMessage 
-    createStreamMessage() throws JMSException;  
-
- 
-    /** Creates a <CODE>TextMessage</CODE> object. A <CODE>TextMessage</CODE> 
-      * object is used to send a message containing a <CODE>String</CODE>
-      * object.
-      *  
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    TextMessage 
-    createTextMessage() throws JMSException; 
-
-
-    /** Creates an initialized <CODE>TextMessage</CODE> object. A 
-      * <CODE>TextMessage</CODE> object is used to send 
-      * a message containing a <CODE>String</CODE>.
-      *
-      * @param text the string used to initialize this message
-      *
-      * @exception JMSException if the JMS provider fails to create this message
-      *                         due to some internal error.
-      */ 
-
-    TextMessage
-    createTextMessage(String text) throws JMSException;
-
-
-    /** Indicates whether the session is in transacted mode.
-      *  
-      * @return true if the session is in transacted mode
-      *  
-      * @exception JMSException if the JMS provider fails to return the 
-      *                         transaction mode due to some internal error.
-      */ 
-
-    boolean
-    getTransacted() throws JMSException;
-    
-    /** Returns the acknowledgement mode of the session. The acknowledgement
-     * mode is set at the time that the session is created. If the session is
-     * transacted, the acknowledgement mode is ignored.
-     *
-     *@return            If the session is not transacted, returns the 
-     *                  current acknowledgement mode for the session.
-     *                  If the session
-     *                  is transacted, returns SESSION_TRANSACTED.
-     *
-     *@exception JMSException   if the JMS provider fails to return the 
-     *                         acknowledgment mode due to some internal error.
-     *
-     *@see Connection#createSession
-     *@since 1.1
-     */
-    int 
-    getAcknowledgeMode() throws JMSException;
-
-
-    /** Commits all messages done in this transaction and releases any locks
-      * currently held.
-      *
-      * @exception JMSException if the JMS provider fails to commit the
-      *                         transaction due to some internal error.
-      * @exception TransactionRolledBackException if the transaction
-      *                         is rolled back due to some internal error
-      *                         during commit.
-      * @exception IllegalStateException if the method is not called by a 
-      *                         transacted session.
-      */
-
-    void
-    commit() throws JMSException;
-
-
-    /** Rolls back any messages done in this transaction and releases any locks 
-      * currently held.
-      *
-      * @exception JMSException if the JMS provider fails to roll back the
-      *                         transaction due to some internal error.
-      * @exception IllegalStateException if the method is not called by a 
-      *                         transacted session.
-      *                                     
-      */
-
-    void
-    rollback() throws JMSException;
-
-
-    /** Closes the session.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a session 
-      * outside the JVM, clients should close the resources when they are not 
-      * needed. 
-      * Relying on garbage collection to eventually reclaim these resources 
-      * may not be timely enough.
-      *
-      * <P>There is no need to close the producers and consumers
-      * of a closed session. 
-      *
-      * <P> This call will block until a <CODE>receive</CODE> call or message 
-      * listener in progress has completed. A blocked message consumer
-      * <CODE>receive</CODE> call returns <CODE>null</CODE> when this session 
-      * is closed.
-      *
-      * <P>Closing a transacted session must roll back the transaction
-      * in progress.
-      * 
-      * <P>This method is the only <CODE>Session</CODE> method that can 
-      * be called concurrently. 
-      *
-      * <P>Invoking any other <CODE>Session</CODE> method on a closed session 
-      * must throw a <CODE>JMSException.IllegalStateException</CODE>. Closing a 
-      * closed session must <I>not</I> throw an exception.
-      * 
-      * @exception JMSException if the JMS provider fails to close the
-      *                         session due to some internal error.
-      */
-
-    void
-    close() throws JMSException;
-
-
-    /** Stops message delivery in this session, and restarts message delivery
-      * with the oldest unacknowledged message.
-      *  
-      * <P>All consumers deliver messages in a serial order.
-      * Acknowledging a received message automatically acknowledges all 
-      * messages that have been delivered to the client.
-      *
-      * <P>Restarting a session causes it to take the following actions:
-      *
-      * <UL>
-      *   <LI>Stop message delivery
-      *   <LI>Mark all messages that might have been delivered but not 
-      *       acknowledged as "redelivered"
-      *   <LI>Restart the delivery sequence including all unacknowledged 
-      *       messages that had been previously delivered. Redelivered messages
-      *       do not have to be delivered in 
-      *       exactly their original delivery order.
-      * </UL>
-      *
-      * @exception JMSException if the JMS provider fails to stop and restart
-      *                         message delivery due to some internal error.
-      * @exception IllegalStateException if the method is called by a 
-      *                         transacted session.
-      */ 
-
-    void
-    recover() throws JMSException;
-
-
-    /** Returns the session's distinguished message listener (optional).
-      *
-      * @return the message listener associated with this session
-      *
-      * @exception JMSException if the JMS provider fails to get the message 
-      *                         listener due to an internal error.
-      *
-      * @see javax.jms.Session#setMessageListener
-      * @see javax.jms.ServerSessionPool
-      * @see javax.jms.ServerSession
-      */
-
-    MessageListener
-    getMessageListener() throws JMSException;
-
-
-    /** Sets the session's distinguished message listener (optional).
-      *
-      * <P>When the distinguished message listener is set, no other form of 
-      * message receipt in the session can 
-      * be used; however, all forms of sending messages are still supported.
-      * 
-      * <P>This is an expert facility not used by regular JMS clients.
-      *
-      * @param listener the message listener to associate with this session
-      *
-      * @exception JMSException if the JMS provider fails to set the message 
-      *                         listener due to an internal error.
-      *
-      * @see javax.jms.Session#getMessageListener
-      * @see javax.jms.ServerSessionPool
-      * @see javax.jms.ServerSession
-      */
-
-    void
-    setMessageListener(MessageListener listener) throws JMSException;
-
-    /**
-     * Optional operation, intended to be used only by Application Servers,
-     * not by ordinary JMS clients.
-     *
-     * @see javax.jms.ServerSession
-     */
-    public void run();
-    
-    /** Creates a <CODE>MessageProducer</CODE> to send messages to the specified 
-      * destination.
-      *
-      * <P>A client uses a <CODE>MessageProducer</CODE> object to send 
-      * messages to a destination. Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
-      * both inherit from <CODE>Destination</CODE>, they can be used in
-      * the destination parameter to create a <CODE>MessageProducer</CODE> object.
-      * 
-      * @param destination the <CODE>Destination</CODE> to send to, 
-      * or null if this is a producer which does not have a specified 
-      * destination.
-      *
-      * @exception JMSException if the session fails to create a MessageProducer
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-      * is specified.
-      *
-      * @since 1.1 
-      * 
-     */
-
-    MessageProducer
-    createProducer(Destination destination) throws JMSException;
-    
-    
-       /** Creates a <CODE>MessageConsumer</CODE> for the specified destination.
-      * Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
-      * both inherit from <CODE>Destination</CODE>, they can be used in
-      * the destination parameter to create a <CODE>MessageConsumer</CODE>.
-      *
-      * @param destination the <CODE>Destination</CODE> to access. 
-      *
-      * @exception JMSException if the session fails to create a consumer
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination 
-      *                         is specified.
-      *
-      * @since 1.1 
-      */
-
-    MessageConsumer
-    createConsumer(Destination destination) throws JMSException;
-
-       /** Creates a <CODE>MessageConsumer</CODE> for the specified destination, 
-      * using a message selector. 
-      * Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
-      * both inherit from <CODE>Destination</CODE>, they can be used in
-      * the destination parameter to create a <CODE>MessageConsumer</CODE>.
-      *
-      * <P>A client uses a <CODE>MessageConsumer</CODE> object to receive 
-      * messages that have been sent to a destination.
-      *  
-      *       
-      * @param destination the <CODE>Destination</CODE> to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer. 
-      * 
-      *  
-      * @exception JMSException if the session fails to create a MessageConsumer
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-       * is specified.
-     
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1 
-      */
-    MessageConsumer     
-    createConsumer(Destination destination, java.lang.String messageSelector) 
-    throws JMSException;
-    
-    
-     /** Creates <CODE>MessageConsumer</CODE> for the specified destination, using a
-      * message selector. This method can specify whether messages published by 
-      * its own connection should be delivered to it, if the destination is a 
-      * topic. 
-      *<P> Since <CODE>Queue</CODE> and <CODE>Topic</CODE> 
-      * both inherit from <CODE>Destination</CODE>, they can be used in
-      * the destination parameter to create a <CODE>MessageConsumer</CODE>.
-      * <P>A client uses a <CODE>MessageConsumer</CODE> object to receive 
-      * messages that have been published to a destination. 
-      *               
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The consumer <CODE>NoLocal</CODE> attribute allows a consumer
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is False. The <CODE>noLocal</CODE> 
-      * value must be supported by destinations that are topics. 
-      *
-      * @param destination the <CODE>Destination</CODE> to access 
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param NoLocal  - if true, and the destination is a topic,
-      *                   inhibits the delivery of messages published
-      *                   by its own connection.  The behavior for
-      *                   <CODE>NoLocal</CODE> is 
-      *                   not specified if the destination is a queue.
-      * 
-      * @exception JMSException if the session fails to create a MessageConsumer
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-       * is specified.
-     
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1 
-      *
-      */
-    MessageConsumer     
-    createConsumer(Destination destination, java.lang.String messageSelector, 
-    boolean NoLocal)   throws JMSException;
-    
-    
-      /** Creates a queue identity given a <CODE>Queue</CODE> name.
-      *
-      * <P>This facility is provided for the rare cases where clients need to
-      * dynamically manipulate queue identity. It allows the creation of a
-      * queue identity with a provider-specific name. Clients that depend 
-      * on this ability are not portable.
-      *
-      * <P>Note that this method is not for creating the physical queue. 
-      * The physical creation of queues is an administrative task and is not
-      * to be initiated by the JMS API. The one exception is the
-      * creation of temporary queues, which is accomplished with the 
-      * <CODE>createTemporaryQueue</CODE> method.
-      *
-      * @param queueName the name of this <CODE>Queue</CODE>
-      *
-      * @return a <CODE>Queue</CODE> with the given name
-      *
-      * @exception JMSException if the session fails to create a queue
-      *                         due to some internal error.
-      * @since 1.1
-      */ 
- 
-    Queue
-    createQueue(String queueName) throws JMSException;
-    
-      /** Creates a topic identity given a <CODE>Topic</CODE> name.
-      *
-      * <P>This facility is provided for the rare cases where clients need to
-      * dynamically manipulate topic identity. This allows the creation of a
-      * topic identity with a provider-specific name. Clients that depend 
-      * on this ability are not portable.
-      *
-      * <P>Note that this method is not for creating the physical topic. 
-      * The physical creation of topics is an administrative task and is not
-      * to be initiated by the JMS API. The one exception is the
-      * creation of temporary topics, which is accomplished with the 
-      * <CODE>createTemporaryTopic</CODE> method.
-      *  
-      * @param topicName the name of this <CODE>Topic</CODE>
-      *
-      * @return a <CODE>Topic</CODE> with the given name
-      *
-      * @exception JMSException if the session fails to create a topic
-      *                         due to some internal error.
-      * @since 1.1
-      */
-
-    Topic
-    createTopic(String topicName) throws JMSException;
-
-     /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue.
-      *
-      * @param queue the <CODE>queue</CODE> to access
-      *
-      * @exception InvalidDestinationException if an invalid destination
-      *                         is specified 
-      *
-      * @since 1.1 
-      */
-    
-    
-      /** Creates a durable subscriber to the specified topic.
-      *  
-      * <P>If a client needs to receive all the messages published on a 
-      * topic, including the ones published while the subscriber is inactive,
-      * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
-      * retains a record of this 
-      * durable subscription and insures that all messages from the topic's 
-      * publishers are retained until they are acknowledged by this 
-      * durable subscriber or they have expired.
-      *
-      * <P>Sessions with durable subscribers must always provide the same 
-      * client identifier. In addition, each client must specify a name that 
-      * uniquely identifies (within client identifier) each durable 
-      * subscription it creates. Only one session at a time can have a 
-      * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
-      *
-      * <P>A client can change an existing durable subscription by creating 
-      * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
-      * topic and/or 
-      * message selector. Changing a durable subscriber is equivalent to 
-      * unsubscribing (deleting) the old one and creating a new one.
-      *
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is false.
-      *
-      * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
-      * @param name the name used to identify this subscription
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      *
-      * @since 1.1
-      */ 
-
-    TopicSubscriber
-    createDurableSubscriber(Topic topic, 
-			    String name) throws JMSException;
-
-
-    /** Creates a durable subscriber to the specified topic, using a
-      * message selector and specifying whether messages published by its
-      * own connection should be delivered to it.
-      *  
-      * <P>If a client needs to receive all the messages published on a 
-      * topic, including the ones published while the subscriber is inactive,
-      * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
-      * retains a record of this 
-      * durable subscription and insures that all messages from the topic's 
-      * publishers are retained until they are acknowledged by this 
-      * durable subscriber or they have expired.
-      *
-      * <P>Sessions with durable subscribers must always provide the same
-      * client identifier. In addition, each client must specify a name which
-      * uniquely identifies (within client identifier) each durable
-      * subscription it creates. Only one session at a time can have a
-      * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
-      * An inactive durable subscriber is one that exists but
-      * does not currently have a message consumer associated with it.
-      *
-      * <P>A client can change an existing durable subscription by creating 
-      * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
-      * topic and/or 
-      * message selector. Changing a durable subscriber is equivalent to 
-      * unsubscribing (deleting) the old one and creating a new one.
-      *
-      * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
-      * @param name the name used to identify this subscription
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param noLocal if set, inhibits the delivery of messages published
-      * by its own connection
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1
-      */ 
- 
-    TopicSubscriber
-    createDurableSubscriber(Topic topic,
-                            String name, 
-			    String messageSelector,
-			    boolean noLocal) throws JMSException;
-    
+  * @since 1.1
+  */
+
+  TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException;
+
+  /** Creates a durable subscriber to the specified topic, using a
+    * message selector and specifying whether messages published by its
+    * own connection should be delivered to it.
+    *  
+    * <P>If a client needs to receive all the messages published on a 
+    * topic, including the ones published while the subscriber is inactive,
+    * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
+    * retains a record of this 
+    * durable subscription and insures that all messages from the topic's 
+    * publishers are retained until they are acknowledged by this 
+    * durable subscriber or they have expired.
+    *
+    * <P>Sessions with durable subscribers must always provide the same
+    * client identifier. In addition, each client must specify a name which
+    * uniquely identifies (within client identifier) each durable
+    * subscription it creates. Only one session at a time can have a
+    * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
+    * An inactive durable subscriber is one that exists but
+    * does not currently have a message consumer associated with it.
+    *
+    * <P>A client can change an existing durable subscription by creating 
+    * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
+    * topic and/or 
+    * message selector. Changing a durable subscriber is equivalent to 
+    * unsubscribing (deleting) the old one and creating a new one.
+    *
+    * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
+    * @param name the name used to identify this subscription
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param noLocal if set, inhibits the delivery of messages published
+    * by its own connection
+    *  
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    *
+    * @since 1.1
+    */
+
+  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
+      throws JMSException;
+
+  /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on
+   * the specified queue.
+   *
+   * @param queue the <CODE>queue</CODE> to access
+   *
+   *
+   * @exception JMSException if the session fails to create a browser
+   *                         due to some internal error.
+   * @exception InvalidDestinationException if an invalid destination
+   *                         is specified
+   *
+   * @since 1.1
+   */
+  QueueBrowser createBrowser(Queue queue) throws JMSException;
+
   /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue.
-      *  
-      * @param queue the <CODE>queue</CODE> to access
-      *
-      *  
-      * @exception JMSException if the session fails to create a browser
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-      *                         is specified 
-      *
-      * @since 1.1 
-      */ 
-    QueueBrowser 
-    createBrowser(Queue queue) throws JMSException;
-
-
-    /** Creates a <CODE>QueueBrowser</CODE> object to peek at the messages on 
-      * the specified queue using a message selector.
-      *  
-      * @param queue the <CODE>queue</CODE> to access
-      *
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      *  
-      * @exception JMSException if the session fails to create a browser
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid destination
-      *                         is specified 
-      * @exception InvalidSelectorException if the message selector is invalid.
-      *
-      * @since 1.1 
-      */ 
-
-    QueueBrowser
-    createBrowser(Queue queue,
-		  String messageSelector) throws JMSException;
-
-    
-     /** Creates a <CODE>TemporaryQueue</CODE> object. Its lifetime will be that 
-      * of the <CODE>Connection</CODE> unless it is deleted earlier.
-      *
-      * @return a temporary queue identity
-      *
-      * @exception JMSException if the session fails to create a temporary queue
-      *                         due to some internal error.
-      *
-      *@since 1.1
-      */
-
-    TemporaryQueue
-    createTemporaryQueue() throws JMSException;
-   
-
-     /** Creates a <CODE>TemporaryTopic</CODE> object. Its lifetime will be that 
-      * of the <CODE>Connection</CODE> unless it is deleted earlier.
-      *
-      * @return a temporary topic identity
-      *
-      * @exception JMSException if the session fails to create a temporary
-      *                         topic due to some internal error.
-      *
-      * @since 1.1  
-      */
- 
-    TemporaryTopic
-    createTemporaryTopic() throws JMSException;
-
-
-    /** Unsubscribes a durable subscription that has been created by a client.
-      *  
-      * <P>This method deletes the state being maintained on behalf of the 
-      * subscriber by its provider.
-      *
-      * <P>It is erroneous for a client to delete a durable subscription
-      * while there is an active <CODE>MessageConsumer</CODE>
-      * or <CODE>TopicSubscriber</CODE> for the 
-      * subscription, or while a consumed message is part of a pending 
-      * transaction or has not been acknowledged in the session.
-      *
-      * @param name the name used to identify this subscription
-      *  
-      * @exception JMSException if the session fails to unsubscribe to the 
-      *                         durable subscription due to some internal error.
-      * @exception InvalidDestinationException if an invalid subscription name
-      *                                        is specified.
-      *
-      * @since 1.1
-      */
-
-    void
-    unsubscribe(String name) throws JMSException;
-   
+    * the specified queue using a message selector.
+    *  
+    * @param queue the <CODE>queue</CODE> to access
+    *
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    *  
+    * @exception JMSException if the session fails to create a browser
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid destination
+    *                         is specified 
+    * @exception InvalidSelectorException if the message selector is invalid.
+    *
+    * @since 1.1 
+    */
+
+  QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException;
+
+  /** Creates a <CODE>TemporaryQueue</CODE> object. Its lifetime will be that 
+   * of the <CODE>Connection</CODE> unless it is deleted earlier.
+   *
+   * @return a temporary queue identity
+   *
+   * @exception JMSException if the session fails to create a temporary queue
+   *                         due to some internal error.
+   *
+   *@since 1.1
+   */
+
+  TemporaryQueue createTemporaryQueue() throws JMSException;
+
+  /** Creates a <CODE>TemporaryTopic</CODE> object. Its lifetime will be that 
+   * of the <CODE>Connection</CODE> unless it is deleted earlier.
+   *
+   * @return a temporary topic identity
+   *
+   * @exception JMSException if the session fails to create a temporary
+   *                         topic due to some internal error.
+   *
+   * @since 1.1  
+   */
+
+  TemporaryTopic createTemporaryTopic() throws JMSException;
+
+  /** Unsubscribes a durable subscription that has been created by a client.
+    *  
+    * <P>This method deletes the state being maintained on behalf of the 
+    * subscriber by its provider.
+    *
+    * <P>It is erroneous for a client to delete a durable subscription
+    * while there is an active <CODE>MessageConsumer</CODE>
+    * or <CODE>TopicSubscriber</CODE> for the 
+    * subscription, or while a consumed message is part of a pending 
+    * transaction or has not been acknowledged in the session.
+    *
+    * @param name the name used to identify this subscription
+    *  
+    * @exception JMSException if the session fails to unsubscribe to the 
+    *                         durable subscription due to some internal error.
+    * @exception InvalidDestinationException if an invalid subscription name
+    *                                        is specified.
+    *
+    * @since 1.1
+    */
+
+  void unsubscribe(String name) throws JMSException;
+
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java
index d3de3eeb0d..b295f1137e 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/StreamMessage.java
@@ -1,550 +1,499 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** A <CODE>StreamMessage</CODE> object is used to send a stream of primitive
-  * types in the Java programming language. It is filled and read sequentially.
-  * It inherits from the <CODE>Message</CODE> interface
-  * and adds a stream message body. Its methods are based largely on those
-  * found in <CODE>java.io.DataInputStream</CODE> and
-  * <CODE>java.io.DataOutputStream</CODE>.
-  *
-  * <P>The primitive types can be read or written explicitly using methods
-  * for each type. They may also be read or written generically as objects.
-  * For instance, a call to <CODE>StreamMessage.writeInt(6)</CODE> is
-  * equivalent to <CODE>StreamMessage.writeObject(new Integer(6))</CODE>.
-  * Both forms are provided, because the explicit form is convenient for
-  * static programming, and the object form is needed when types are not known
-  * at compile time.
-  *
-  * <P>When the message is first created, and when <CODE>clearBody</CODE>
-  * is called, the body of the message is in write-only mode. After the 
-  * first call to <CODE>reset</CODE> has been made, the message body is in 
-  * read-only mode. 
-  * After a message has been sent, the client that sent it can retain and 
-  * modify it without affecting the message that has been sent. The same message
-  * object can be sent multiple times.
-  * When a message has been received, the provider has called 
-  * <CODE>reset</CODE> so that the message body is in read-only mode for the client.
-  * 
-  * <P>If <CODE>clearBody</CODE> is called on a message in read-only mode, 
-  * the message body is cleared and the message body is in write-only mode.
-  * 
-  * <P>If a client attempts to read a message in write-only mode, a 
-  * <CODE>MessageNotReadableException</CODE> is thrown.
-  * 
-  * <P>If a client attempts to write a message in read-only mode, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown.
-  *
-  * <P><CODE>StreamMessage</CODE> objects support the following conversion 
-  * table. The marked cases must be supported. The unmarked cases must throw a 
-  * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions 
-  * may throw a runtime exception if the primitive's <CODE>valueOf()</CODE> 
-  * method does not accept it as a valid <CODE>String</CODE> representation of 
-  * the primitive.
-  *
-  * <P>A value written as the row type can be read as the column type.
-  *
-  * <PRE>
-  * |        | boolean byte short char int long float double String byte[]
-  * |----------------------------------------------------------------------
-  * |boolean |    X                                            X
-  * |byte    |          X     X         X   X                  X   
-  * |short   |                X         X   X                  X   
-  * |char    |                     X                           X
-  * |int     |                          X   X                  X   
-  * |long    |                              X                  X   
-  * |float   |                                    X     X      X   
-  * |double  |                                          X      X   
-  * |String  |    X     X     X         X   X     X     X      X   
-  * |byte[]  |                                                        X
-  * |----------------------------------------------------------------------
-  * </PRE>
-  *
-  * <P>Attempting to read a null value as a primitive type must be treated
-  * as calling the primitive's corresponding <code>valueOf(String)</code> 
-  * conversion method with a null value. Since <code>char</code> does not 
-  * support a <code>String</code> conversion, attempting to read a null value 
-  * as a <code>char</code> must throw a <code>NullPointerException</code>.
-  *
-  * @version     1.0 - 6 August 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.Session#createStreamMessage()
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.TextMessage
-  */
-
-public interface StreamMessage extends Message {
-
-
-    /** Reads a <code>boolean</code> from the stream message.
-      *
-      * @return the <code>boolean</code> value read
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */
-
-    boolean 
-    readBoolean() throws JMSException;
-
-
-    /** Reads a <code>byte</code> value from the stream message.
-      *
-      * @return the next byte from the stream message as a 8-bit
-      * <code>byte</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    byte 
-    readByte() throws JMSException;
-
-
-    /** Reads a 16-bit integer from the stream message.
-      *
-      * @return a 16-bit integer from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    short 
-    readShort() throws JMSException;
-
-
-    /** Reads a Unicode character value from the stream message.
-      *
-      * @return a Unicode character from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid      
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    char 
-    readChar() throws JMSException;
-
-
-    /** Reads a 32-bit integer from the stream message.
-      *
-      * @return a 32-bit integer value from the stream message, interpreted
-      * as an <code>int</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    int 
-    readInt() throws JMSException;
-
-
-    /** Reads a 64-bit integer from the stream message.
-      *
-      * @return a 64-bit integer value from the stream message, interpreted as
-      * a <code>long</code>
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    long 
-    readLong() throws JMSException;
-
-
-    /** Reads a <code>float</code> from the stream message.
-      *
-      * @return a <code>float</code> value from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    float 
-    readFloat() throws JMSException;
-
-
-    /** Reads a <code>double</code> from the stream message.
-      *
-      * @return a <code>double</code> value from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    double 
-    readDouble() throws JMSException;
-
-
-    /** Reads a <CODE>String</CODE> from the stream message.
-      *
-      * @return a Unicode string from the stream message
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      */ 
-
-    String 
-    readString() throws JMSException;
-
-
-    /** Reads a byte array field from the stream message into the 
-      * specified <CODE>byte[]</CODE> object (the read buffer). 
-      * 
-      * <P>To read the field value, <CODE>readBytes</CODE> should be 
-      * successively called 
-      * until it returns a value less than the length of the read buffer.
-      * The value of the bytes in the buffer following the last byte 
-      * read is undefined.
-      * 
-      * <P>If <CODE>readBytes</CODE> returns a value equal to the length of the 
-      * buffer, a subsequent <CODE>readBytes</CODE> call must be made. If there 
-      * are no more bytes to be read, this call returns -1.
-      * 
-      * <P>If the byte array field value is null, <CODE>readBytes</CODE> 
-      * returns -1.
-      *
-      * <P>If the byte array field value is empty, <CODE>readBytes</CODE> 
-      * returns 0.
-      * 
-      * <P>Once the first <CODE>readBytes</CODE> call on a <CODE>byte[]</CODE>
-      * field value has been made,
-      * the full value of the field must be read before it is valid to read 
-      * the next field. An attempt to read the next field before that has 
-      * been done will throw a <CODE>MessageFormatException</CODE>.
-      * 
-      * <P>To read the byte field value into a new <CODE>byte[]</CODE> object, 
-      * use the <CODE>readObject</CODE> method.
-      *
-      * @param value the buffer into which the data is read
-      *
-      * @return the total number of bytes read into the buffer, or -1 if 
-      * there is no more data because the end of the byte field has been 
-      * reached
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      * 
-      * @see #readObject()
-      */ 
-
-    int
-    readBytes(byte[] value) throws JMSException;
-
-
-    /** Reads an object from the stream message.
-      *
-      * <P>This method can be used to return, in objectified format,
-      * an object in the Java programming language ("Java object") that has 
-      * been written to the stream with the equivalent
-      * <CODE>writeObject</CODE> method call, or its equivalent primitive
-      * <CODE>write<I>type</I></CODE> method.
-      *  
-      * <P>Note that byte values are returned as <CODE>byte[]</CODE>, not 
-      * <CODE>Byte[]</CODE>.
-      *
-      * <P>An attempt to call <CODE>readObject</CODE> to read a byte field 
-      * value into a new <CODE>byte[]</CODE> object before the full value of the
-      * byte field has been read will throw a 
-      * <CODE>MessageFormatException</CODE>.
-      *
-      * @return a Java object from the stream message, in objectified
-      * format (for example, if the object was written as an <CODE>int</CODE>, 
-      * an <CODE>Integer</CODE> is returned)
-      *
-      * @exception JMSException if the JMS provider fails to read the message
-      *                         due to some internal error.
-      * @exception MessageEOFException if unexpected end of message stream has
-      *                                been reached.     
-      * @exception MessageFormatException if this type conversion is invalid.
-      * @exception MessageNotReadableException if the message is in write-only 
-      *                                        mode.
-      * 
-      * @see #readBytes(byte[] value)
-      */ 
-
-    Object 
-    readObject() throws JMSException;
-
-
-
-    /** Writes a <code>boolean</code> to the stream message.
-      * The value <code>true</code> is written as the value 
-      * <code>(byte)1</code>; the value <code>false</code> is written as 
-      * the value <code>(byte)0</code>.
-      *
-      * @param value the <code>boolean</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */
-
-    void 
-    writeBoolean(boolean value) 
-			throws JMSException;
-
-
-    /** Writes a <code>byte</code> to the stream message.
-      *
-      * @param value the <code>byte</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeByte(byte value) throws JMSException;
-
-
-    /** Writes a <code>short</code> to the stream message.
-      *
-      * @param value the <code>short</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeShort(short value) throws JMSException;
-
-
-    /** Writes a <code>char</code> to the stream message.
-      *
-      * @param value the <code>char</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeChar(char value) throws JMSException;
-
-
-    /** Writes an <code>int</code> to the stream message.
-      *
-      * @param value the <code>int</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeInt(int value) throws JMSException;
-
-
-    /** Writes a <code>long</code> to the stream message.
-      *
-      * @param value the <code>long</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeLong(long value) throws JMSException;
-
-
-    /** Writes a <code>float</code> to the stream message.
-      *
-      * @param value the <code>float</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeFloat(float value) throws JMSException;
-
-
-    /** Writes a <code>double</code> to the stream message.
-      *
-      * @param value the <code>double</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeDouble(double value) throws JMSException;
-
-
-    /** Writes a <code>String</code> to the stream message.
-      *
-      * @param value the <code>String</code> value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeString(String value) throws JMSException;
-
-
-    /** Writes a byte array field to the stream message.
-      *
-      * <P>The byte array <code>value</code> is written to the message
-      * as a byte array field. Consecutively written byte array fields are 
-      * treated as two distinct fields when the fields are read.
-      * 
-      * @param value the byte array value to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void
-    writeBytes(byte[] value) throws JMSException;
-
-
-    /** Writes a portion of a byte array as a byte array field to the stream 
-      * message.
-      *  
-      * <P>The a portion of the byte array <code>value</code> is written to the
-      * message as a byte array field. Consecutively written byte 
-      * array fields are treated as two distinct fields when the fields are 
-      * read.
-      *
-      * @param value the byte array value to be written
-      * @param offset the initial offset within the byte array
-      * @param length the number of bytes to use
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
- 
-    void
-    writeBytes(byte[] value, int offset, int length) 
-			throws JMSException;
-
-
-    /** Writes an object to the stream message.
-      *
-      * <P>This method works only for the objectified primitive
-      * object types (<code>Integer</code>, <code>Double</code>, 
-      * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
-      * arrays.
-      *
-      * @param value the Java object to be written
-      *
-      * @exception JMSException if the JMS provider fails to write the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if the object is invalid.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
-
-    void 
-    writeObject(Object value) throws JMSException;
-
-
-    /** Puts the message body in read-only mode and repositions the stream
-      * to the beginning.
-      *  
-      * @exception JMSException if the JMS provider fails to reset the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if the message has an invalid
-      *                                   format.
-      */ 
- 
-    void
-    reset() throws JMSException;
+ * types in the Java programming language. It is filled and read sequentially.
+ * It inherits from the <CODE>Message</CODE> interface
+ * and adds a stream message body. Its methods are based largely on those
+ * found in <CODE>java.io.DataInputStream</CODE> and
+ * <CODE>java.io.DataOutputStream</CODE>.
+ *
+ * <P>The primitive types can be read or written explicitly using methods
+ * for each type. They may also be read or written generically as objects.
+ * For instance, a call to <CODE>StreamMessage.writeInt(6)</CODE> is
+ * equivalent to <CODE>StreamMessage.writeObject(new Integer(6))</CODE>.
+ * Both forms are provided, because the explicit form is convenient for
+ * static programming, and the object form is needed when types are not known
+ * at compile time.
+ *
+ * <P>When the message is first created, and when <CODE>clearBody</CODE>
+ * is called, the body of the message is in write-only mode. After the
+ * first call to <CODE>reset</CODE> has been made, the message body is in
+ * read-only mode.
+ * After a message has been sent, the client that sent it can retain and
+ * modify it without affecting the message that has been sent. The same message
+ * object can be sent multiple times.
+ * When a message has been received, the provider has called
+ * <CODE>reset</CODE> so that the message body is in read-only mode for the client.
+ *
+ * <P>If <CODE>clearBody</CODE> is called on a message in read-only mode,
+ * the message body is cleared and the message body is in write-only mode.
+ *
+ * <P>If a client attempts to read a message in write-only mode, a
+ * <CODE>MessageNotReadableException</CODE> is thrown.
+ *
+ * <P>If a client attempts to write a message in read-only mode, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown.
+ *
+ * <P><CODE>StreamMessage</CODE> objects support the following conversion
+ * table. The marked cases must be supported. The unmarked cases must throw a
+ * <CODE>JMSException</CODE>. The <CODE>String</CODE>-to-primitive conversions
+ * may throw a runtime exception if the primitive's <CODE>valueOf()</CODE>
+ * method does not accept it as a valid <CODE>String</CODE> representation of
+ * the primitive.
+ *
+ * <P>A value written as the row type can be read as the column type.
+ *
+ * <PRE>
+ * |        | boolean byte short char int long float double String byte[]
+ * |----------------------------------------------------------------------
+ * |boolean |    X                                            X
+ * |byte    |          X     X         X   X                  X
+ * |short   |                X         X   X                  X
+ * |char    |                     X                           X
+ * |int     |                          X   X                  X
+ * |long    |                              X                  X
+ * |float   |                                    X     X      X
+ * |double  |                                          X      X
+ * |String  |    X     X     X         X   X     X     X      X
+ * |byte[]  |                                                        X
+ * |----------------------------------------------------------------------
+ * </PRE>
+ *
+ * <P>Attempting to read a null value as a primitive type must be treated
+ * as calling the primitive's corresponding <code>valueOf(String)</code>
+ * conversion method with a null value. Since <code>char</code> does not
+ * support a <code>String</code> conversion, attempting to read a null value
+ * as a <code>char</code> must throw a <code>NullPointerException</code>.
+ *
+ * @version     1.0 - 6 August 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.Session#createStreamMessage()
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.TextMessage
+ */
+
+public interface StreamMessage extends Message
+{
+
+  /** Reads a <code>boolean</code> from the stream message.
+    *
+    * @return the <code>boolean</code> value read
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  boolean readBoolean() throws JMSException;
+
+  /** Reads a <code>byte</code> value from the stream message.
+    *
+    * @return the next byte from the stream message as a 8-bit
+    * <code>byte</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  byte readByte() throws JMSException;
+
+  /** Reads a 16-bit integer from the stream message.
+    *
+    * @return a 16-bit integer from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  short readShort() throws JMSException;
+
+  /** Reads a Unicode character value from the stream message.
+    *
+    * @return a Unicode character from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid      
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  char readChar() throws JMSException;
+
+  /** Reads a 32-bit integer from the stream message.
+    *
+    * @return a 32-bit integer value from the stream message, interpreted
+    * as an <code>int</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  int readInt() throws JMSException;
+
+  /** Reads a 64-bit integer from the stream message.
+    *
+    * @return a 64-bit integer value from the stream message, interpreted as
+    * a <code>long</code>
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  long readLong() throws JMSException;
+
+  /** Reads a <code>float</code> from the stream message.
+    *
+    * @return a <code>float</code> value from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  float readFloat() throws JMSException;
+
+  /** Reads a <code>double</code> from the stream message.
+    *
+    * @return a <code>double</code> value from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  double readDouble() throws JMSException;
+
+  /** Reads a <CODE>String</CODE> from the stream message.
+    *
+    * @return a Unicode string from the stream message
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    */
+
+  String readString() throws JMSException;
+
+  /** Reads a byte array field from the stream message into the 
+    * specified <CODE>byte[]</CODE> object (the read buffer). 
+    * 
+    * <P>To read the field value, <CODE>readBytes</CODE> should be 
+    * successively called 
+    * until it returns a value less than the length of the read buffer.
+    * The value of the bytes in the buffer following the last byte 
+    * read is undefined.
+    * 
+    * <P>If <CODE>readBytes</CODE> returns a value equal to the length of the 
+    * buffer, a subsequent <CODE>readBytes</CODE> call must be made. If there 
+    * are no more bytes to be read, this call returns -1.
+    * 
+    * <P>If the byte array field value is null, <CODE>readBytes</CODE> 
+    * returns -1.
+    *
+    * <P>If the byte array field value is empty, <CODE>readBytes</CODE> 
+    * returns 0.
+    * 
+    * <P>Once the first <CODE>readBytes</CODE> call on a <CODE>byte[]</CODE>
+    * field value has been made,
+    * the full value of the field must be read before it is valid to read 
+    * the next field. An attempt to read the next field before that has 
+    * been done will throw a <CODE>MessageFormatException</CODE>.
+    * 
+    * <P>To read the byte field value into a new <CODE>byte[]</CODE> object, 
+    * use the <CODE>readObject</CODE> method.
+    *
+    * @param value the buffer into which the data is read
+    *
+    * @return the total number of bytes read into the buffer, or -1 if 
+    * there is no more data because the end of the byte field has been 
+    * reached
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    * 
+    * @see #readObject()
+    */
+
+  int readBytes(byte[] value) throws JMSException;
+
+  /** Reads an object from the stream message.
+    *
+    * <P>This method can be used to return, in objectified format,
+    * an object in the Java programming language ("Java object") that has 
+    * been written to the stream with the equivalent
+    * <CODE>writeObject</CODE> method call, or its equivalent primitive
+    * <CODE>write<I>type</I></CODE> method.
+    *  
+    * <P>Note that byte values are returned as <CODE>byte[]</CODE>, not 
+    * <CODE>Byte[]</CODE>.
+    *
+    * <P>An attempt to call <CODE>readObject</CODE> to read a byte field 
+    * value into a new <CODE>byte[]</CODE> object before the full value of the
+    * byte field has been read will throw a 
+    * <CODE>MessageFormatException</CODE>.
+    *
+    * @return a Java object from the stream message, in objectified
+    * format (for example, if the object was written as an <CODE>int</CODE>, 
+    * an <CODE>Integer</CODE> is returned)
+    *
+    * @exception JMSException if the JMS provider fails to read the message
+    *                         due to some internal error.
+    * @exception MessageEOFException if unexpected end of message stream has
+    *                                been reached.     
+    * @exception MessageFormatException if this type conversion is invalid.
+    * @exception MessageNotReadableException if the message is in write-only 
+    *                                        mode.
+    * 
+    * @see #readBytes(byte[] value)
+    */
+
+  Object readObject() throws JMSException;
+
+  /** Writes a <code>boolean</code> to the stream message.
+    * The value <code>true</code> is written as the value 
+    * <code>(byte)1</code>; the value <code>false</code> is written as 
+    * the value <code>(byte)0</code>.
+    *
+    * @param value the <code>boolean</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBoolean(boolean value) throws JMSException;
+
+  /** Writes a <code>byte</code> to the stream message.
+    *
+    * @param value the <code>byte</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeByte(byte value) throws JMSException;
+
+  /** Writes a <code>short</code> to the stream message.
+    *
+    * @param value the <code>short</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeShort(short value) throws JMSException;
+
+  /** Writes a <code>char</code> to the stream message.
+    *
+    * @param value the <code>char</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeChar(char value) throws JMSException;
+
+  /** Writes an <code>int</code> to the stream message.
+    *
+    * @param value the <code>int</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeInt(int value) throws JMSException;
+
+  /** Writes a <code>long</code> to the stream message.
+    *
+    * @param value the <code>long</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeLong(long value) throws JMSException;
+
+  /** Writes a <code>float</code> to the stream message.
+    *
+    * @param value the <code>float</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeFloat(float value) throws JMSException;
+
+  /** Writes a <code>double</code> to the stream message.
+    *
+    * @param value the <code>double</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeDouble(double value) throws JMSException;
+
+  /** Writes a <code>String</code> to the stream message.
+    *
+    * @param value the <code>String</code> value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeString(String value) throws JMSException;
+
+  /** Writes a byte array field to the stream message.
+    *
+    * <P>The byte array <code>value</code> is written to the message
+    * as a byte array field. Consecutively written byte array fields are 
+    * treated as two distinct fields when the fields are read.
+    * 
+    * @param value the byte array value to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBytes(byte[] value) throws JMSException;
+
+  /** Writes a portion of a byte array as a byte array field to the stream 
+    * message.
+    *  
+    * <P>The a portion of the byte array <code>value</code> is written to the
+    * message as a byte array field. Consecutively written byte 
+    * array fields are treated as two distinct fields when the fields are 
+    * read.
+    *
+    * @param value the byte array value to be written
+    * @param offset the initial offset within the byte array
+    * @param length the number of bytes to use
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeBytes(byte[] value, int offset, int length) throws JMSException;
+
+  /** Writes an object to the stream message.
+    *
+    * <P>This method works only for the objectified primitive
+    * object types (<code>Integer</code>, <code>Double</code>, 
+    * <code>Long</code>&nbsp;...), <code>String</code> objects, and byte 
+    * arrays.
+    *
+    * @param value the Java object to be written
+    *
+    * @exception JMSException if the JMS provider fails to write the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if the object is invalid.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
+
+  void writeObject(Object value) throws JMSException;
+
+  /** Puts the message body in read-only mode and repositions the stream
+    * to the beginning.
+    *  
+    * @exception JMSException if the JMS provider fails to reset the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if the message has an invalid
+    *                                   format.
+    */
+
+  void reset() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java
index 1de79ef678..82a9af87bf 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryQueue.java
@@ -1,58 +1,58 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A <CODE>TemporaryQueue</CODE> object is a unique <CODE>Queue</CODE> object 
-  * created for the duration of a <CODE>Connection</CODE>. It is a 
-  * system-defined queue that can be consumed only by the 
-  * <CODE>Connection</CODE> that created it.
-  *
-  *<P>A <CODE>TemporaryQueue</CODE> object can be created at either the 
-  * <CODE>Session</CODE> or <CODE>QueueSession</CODE> level. Creating it at the
-  * <CODE>Session</CODE> level allows to the <CODE>TemporaryQueue</CODE> to 
-  * participate in transactions with objects from the Pub/Sub  domain. 
-  * If it is created at the <CODE>QueueSession</CODE>, it will only
-  * be able participate in transactions with objects from the PTP domain.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see Session#createTemporaryQueue()
-  * @see QueueSession#createTemporaryQueue()
-  */
+/** A <CODE>TemporaryQueue</CODE> object is a unique <CODE>Queue</CODE> object
+ * created for the duration of a <CODE>Connection</CODE>. It is a
+ * system-defined queue that can be consumed only by the
+ * <CODE>Connection</CODE> that created it.
+ *
+ *<P>A <CODE>TemporaryQueue</CODE> object can be created at either the
+ * <CODE>Session</CODE> or <CODE>QueueSession</CODE> level. Creating it at the
+ * <CODE>Session</CODE> level allows to the <CODE>TemporaryQueue</CODE> to
+ * participate in transactions with objects from the Pub/Sub  domain.
+ * If it is created at the <CODE>QueueSession</CODE>, it will only
+ * be able participate in transactions with objects from the PTP domain.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see Session#createTemporaryQueue()
+ * @see QueueSession#createTemporaryQueue()
+ */
 
-public interface TemporaryQueue extends Queue {
+public interface TemporaryQueue extends Queue
+{
 
-    /** Deletes this temporary queue. If there are existing receivers
-      * still using it, a <CODE>JMSException</CODE> will be thrown.
-      *  
-      * @exception JMSException if the JMS provider fails to delete the 
-      *                         temporary queue due to some internal error.
-      */
+  /** Deletes this temporary queue. If there are existing receivers
+    * still using it, a <CODE>JMSException</CODE> will be thrown.
+    *  
+    * @exception JMSException if the JMS provider fails to delete the 
+    *                         temporary queue due to some internal error.
+    */
 
-    void 
-    delete() throws JMSException; 
+  void delete() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java
index cf56d565f6..4d9c9506e7 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TemporaryTopic.java
@@ -1,60 +1,59 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>TemporaryTopic</CODE> object is a unique <CODE>Topic</CODE> object 
-  * created for the duration of a <CODE>Connection</CODE>. It is a 
-  * system-defined topic that can be consumed only by the 
-  * <CODE>Connection</CODE> that created it.
-  *
-  *<P>A <CODE>TemporaryTopic</CODE> object can be created either at the 
-  * <CODE>Session</CODE> or <CODE>TopicSession</CODE> level. Creating it at the
-  * <CODE>Session</CODE> level allows the <CODE>TemporaryTopic</CODE> to participate
-  * in the same transaction with objects from the PTP domain. 
-  * If a <CODE>TemporaryTopic</CODE> is  created at the 
-  * <CODE>TopicSession</CODE>, it will only
-  * be able participate in transactions with objects from the Pub/Sub domain.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see Session#createTemporaryTopic()
-  * @see TopicSession#createTemporaryTopic()
-  */
+/** A <CODE>TemporaryTopic</CODE> object is a unique <CODE>Topic</CODE> object
+ * created for the duration of a <CODE>Connection</CODE>. It is a
+ * system-defined topic that can be consumed only by the
+ * <CODE>Connection</CODE> that created it.
+ *
+ *<P>A <CODE>TemporaryTopic</CODE> object can be created either at the
+ * <CODE>Session</CODE> or <CODE>TopicSession</CODE> level. Creating it at the
+ * <CODE>Session</CODE> level allows the <CODE>TemporaryTopic</CODE> to participate
+ * in the same transaction with objects from the PTP domain.
+ * If a <CODE>TemporaryTopic</CODE> is  created at the
+ * <CODE>TopicSession</CODE>, it will only
+ * be able participate in transactions with objects from the Pub/Sub domain.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see Session#createTemporaryTopic()
+ * @see TopicSession#createTemporaryTopic()
+ */
 
-public interface TemporaryTopic extends Topic {
+public interface TemporaryTopic extends Topic
+{
 
-    /** Deletes this temporary topic. If there are existing subscribers
-      * still using it, a <CODE>JMSException</CODE> will be thrown.
-      *  
-      * @exception JMSException if the JMS provider fails to delete the
-      *                         temporary topic due to some internal error.
-      */
+  /** Deletes this temporary topic. If there are existing subscribers
+    * still using it, a <CODE>JMSException</CODE> will be thrown.
+    *  
+    * @exception JMSException if the JMS provider fails to delete the
+    *                         temporary topic due to some internal error.
+    */
 
-    void 
-    delete() throws JMSException; 
+  void delete() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java
index 0ee45a0df1..bbca08286e 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TextMessage.java
@@ -1,82 +1,80 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** A <CODE>TextMessage</CODE> object is used to send a message containing a 
-  * <CODE>java.lang.String</CODE>.
-  * It inherits from the <CODE>Message</CODE> interface and adds a text message 
-  * body.
-  *
-  * <P>This message type can be used to transport text-based messages, including
-  *  those with XML content.
-  *
-  * <P>When a client receives a <CODE>TextMessage</CODE>, it is in read-only 
-  * mode. If a client attempts to write to the message at this point, a 
-  * <CODE>MessageNotWriteableException</CODE> is thrown. If 
-  * <CODE>clearBody</CODE> is 
-  * called, the message can now be both read from and written to.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session#createTextMessage()
-  * @see         javax.jms.Session#createTextMessage(String)
-  * @see         javax.jms.BytesMessage
-  * @see         javax.jms.MapMessage
-  * @see         javax.jms.Message
-  * @see         javax.jms.ObjectMessage
-  * @see         javax.jms.StreamMessage
-  * @see         java.lang.String
-  */
- 
-public interface TextMessage extends Message { 
+/** A <CODE>TextMessage</CODE> object is used to send a message containing a
+ * <CODE>java.lang.String</CODE>.
+ * It inherits from the <CODE>Message</CODE> interface and adds a text message
+ * body.
+ *
+ * <P>This message type can be used to transport text-based messages, including
+ *  those with XML content.
+ *
+ * <P>When a client receives a <CODE>TextMessage</CODE>, it is in read-only
+ * mode. If a client attempts to write to the message at this point, a
+ * <CODE>MessageNotWriteableException</CODE> is thrown. If
+ * <CODE>clearBody</CODE> is
+ * called, the message can now be both read from and written to.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session#createTextMessage()
+ * @see         javax.jms.Session#createTextMessage(String)
+ * @see         javax.jms.BytesMessage
+ * @see         javax.jms.MapMessage
+ * @see         javax.jms.Message
+ * @see         javax.jms.ObjectMessage
+ * @see         javax.jms.StreamMessage
+ * @see         java.lang.String
+ */
 
-    /** Sets the string containing this message's data.
-      *  
-      * @param string the <CODE>String</CODE> containing the message's data
-      *  
-      * @exception JMSException if the JMS provider fails to set the text due to
-      *                         some internal error.
-      * @exception MessageNotWriteableException if the message is in read-only 
-      *                                         mode.
-      */ 
+public interface TextMessage extends Message
+{
 
-    void
-    setText(String string) throws JMSException;
+  /** Sets the string containing this message's data.
+    *  
+    * @param string the <CODE>String</CODE> containing the message's data
+    *  
+    * @exception JMSException if the JMS provider fails to set the text due to
+    *                         some internal error.
+    * @exception MessageNotWriteableException if the message is in read-only 
+    *                                         mode.
+    */
 
+  void setText(String string) throws JMSException;
 
-    /** Gets the string containing this message's data.  The default
-      * value is null.
-      *  
-      * @return the <CODE>String</CODE> containing the message's data
-      *  
-      * @exception JMSException if the JMS provider fails to get the text due to
-      *                         some internal error.
-      */ 
+  /** Gets the string containing this message's data.  The default
+    * value is null.
+    *  
+    * @return the <CODE>String</CODE> containing the message's data
+    *  
+    * @exception JMSException if the JMS provider fails to get the text due to
+    *                         some internal error.
+    */
 
-    String
-    getText() throws JMSException;
+  String getText() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java
index 37db768ce5..2886dadead 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/Topic.java
@@ -1,90 +1,87 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
+/** A <CODE>Topic</CODE> object encapsulates a provider-specific topic name.
+ * It is the way a client specifies the identity of a topic to JMS API methods.
+ * For those methods that use a <CODE>Destination</CODE> as a parameter, a
+ * <CODE>Topic</CODE> object may used as an argument . For
+ * example, a Topic can be used to create a <CODE>MessageConsumer</CODE>
+ * and a <CODE>MessageProducer</CODE>
+ * by calling:
+ *<UL>
+ *<LI> <CODE>Session.CreateConsumer(Destination destination)</CODE>
+ *<LI> <CODE>Session.CreateProducer(Destination destination)</CODE>
+ *
+ *</UL>
+ *
+ * <P>Many publish/subscribe (pub/sub) providers group topics into hierarchies
+ * and provide various options for subscribing to parts of the hierarchy. The
+ * JMS API places no restriction on what a <CODE>Topic</CODE> object
+ * represents. It may be a leaf in a topic hierarchy, or it may be a larger
+ * part of the hierarchy.
+ *
+ * <P>The organization of topics and the granularity of subscriptions to
+ * them is an important part of a pub/sub application's architecture. The JMS
+ * API
+ * does not specify a policy for how this should be done. If an application
+ * takes advantage of a provider-specific topic-grouping mechanism, it
+ * should document this. If the application is installed using a different
+ * provider, it is the job of the administrator to construct an equivalent
+ * topic architecture and create equivalent <CODE>Topic</CODE> objects.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see        Session#createConsumer(Destination)
+ * @see        Session#createProducer(Destination)
+ * @see        javax.jms.TopicSession#createTopic(String)
+ */
 
-/** A <CODE>Topic</CODE> object encapsulates a provider-specific topic name. 
-  * It is the way a client specifies the identity of a topic to JMS API methods.
- * For those methods that use a <CODE>Destination</CODE> as a parameter, a 
-  * <CODE>Topic</CODE> object may used as an argument . For 
-  * example, a Topic can be used to create a <CODE>MessageConsumer</CODE>
-  * and a <CODE>MessageProducer</CODE>
-  * by calling:
-  *<UL>
-  *<LI> <CODE>Session.CreateConsumer(Destination destination)</CODE>
-  *<LI> <CODE>Session.CreateProducer(Destination destination)</CODE>
-  *
-  *</UL>
-  *
-  * <P>Many publish/subscribe (pub/sub) providers group topics into hierarchies 
-  * and provide various options for subscribing to parts of the hierarchy. The 
-  * JMS API places no restriction on what a <CODE>Topic</CODE> object 
-  * represents. It may be a leaf in a topic hierarchy, or it may be a larger 
-  * part of the hierarchy.
-  *
-  * <P>The organization of topics and the granularity of subscriptions to 
-  * them is an important part of a pub/sub application's architecture. The JMS 
-  * API 
-  * does not specify a policy for how this should be done. If an application 
-  * takes advantage of a provider-specific topic-grouping mechanism, it 
-  * should document this. If the application is installed using a different 
-  * provider, it is the job of the administrator to construct an equivalent 
-  * topic architecture and create equivalent <CODE>Topic</CODE> objects.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see        Session#createConsumer(Destination)
-  * @see        Session#createProducer(Destination)
-  * @see        javax.jms.TopicSession#createTopic(String)
-  */
- 
-public interface Topic extends Destination {
-
-    /** Gets the name of this topic.
-      *  
-      * <P>Clients that depend upon the name are not portable.
-      *  
-      * @return the topic name
-      *  
-      * @exception JMSException if the JMS provider implementation of 
-      *                         <CODE>Topic</CODE> fails to return the topic
-      *                         name due to some internal
-      *                         error.
-      */ 
+public interface Topic extends Destination
+{
 
-    String
-    getTopicName() throws JMSException;
+  /** Gets the name of this topic.
+    *  
+    * <P>Clients that depend upon the name are not portable.
+    *  
+    * @return the topic name
+    *  
+    * @exception JMSException if the JMS provider implementation of 
+    *                         <CODE>Topic</CODE> fails to return the topic
+    *                         name due to some internal
+    *                         error.
+    */
 
+  String getTopicName() throws JMSException;
 
-    /** Returns a string representation of this object.
-      *
-      * @return the provider-specific identity values for this topic
-      */
+  /** Returns a string representation of this object.
+    *
+    * @return the provider-specific identity values for this topic
+    */
 
-    String
-    toString();
+  String toString();
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
index 15d9a9f605..2f8cdf6fc7 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnection.java
@@ -1,146 +1,133 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>TopicConnection</CODE> object is an active connection to a 
-  * publish/subscribe JMS provider. A client uses a <CODE>TopicConnection</CODE> 
-  * object to create one or more <CODE>TopicSession</CODE> objects
-  * for producing and consuming messages.
-  *
-  *<P>A <CODE>TopicConnection</CODE> can be used to create a 
-  *<CODE>TopicSession</CODE>, from which
-  * specialized topic-related objects can be created. 
-  * A more general, and recommended approach is to use the 
-  * <CODE>Connection</CODE> object. 
-  *
-  *
-  * <P>The <CODE>TopicConnection</CODE> object
-  * should be used to support existing code.
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Connection
-  * @see         javax.jms.ConnectionFactory
-  * @see	 javax.jms.TopicConnectionFactory
-  */
-
-public interface TopicConnection extends Connection {
-
-    /** Creates a <CODE>TopicSession</CODE> object.
-      *
-      * @param transacted indicates whether the session is transacted
-      * @param acknowledgeMode indicates whether the consumer or the
-      * client will acknowledge any messages it receives; ignored if the session
-      * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
-      * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
-      * <code>Session.DUPS_OK_ACKNOWLEDGE</code>. 
-      *  
-      * @return a newly created topic session
-      *  
-      * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
-      *                         to create a session due to some internal error or
-      *                         lack of support for the specific transaction
-      *                         and acknowledgement mode.
-      *
-      * @see Session#AUTO_ACKNOWLEDGE 
-      * @see Session#CLIENT_ACKNOWLEDGE 
-      * @see Session#DUPS_OK_ACKNOWLEDGE 
-      */ 
+/** A <CODE>TopicConnection</CODE> object is an active connection to a
+ * publish/subscribe JMS provider. A client uses a <CODE>TopicConnection</CODE>
+ * object to create one or more <CODE>TopicSession</CODE> objects
+ * for producing and consuming messages.
+ *
+ *<P>A <CODE>TopicConnection</CODE> can be used to create a
+ *<CODE>TopicSession</CODE>, from which
+ * specialized topic-related objects can be created.
+ * A more general, and recommended approach is to use the
+ * <CODE>Connection</CODE> object.
+ *
+ *
+ * <P>The <CODE>TopicConnection</CODE> object
+ * should be used to support existing code.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Connection
+ * @see         javax.jms.ConnectionFactory
+ * @see	 javax.jms.TopicConnectionFactory
+ */
 
-    TopicSession
-    createTopicSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+public interface TopicConnection extends Connection
+{
 
+  /** Creates a <CODE>TopicSession</CODE> object.
+    *
+    * @param transacted indicates whether the session is transacted
+    * @param acknowledgeMode indicates whether the consumer or the
+    * client will acknowledge any messages it receives; ignored if the session
+    * is transacted. Legal values are <code>Session.AUTO_ACKNOWLEDGE</code>, 
+    * <code>Session.CLIENT_ACKNOWLEDGE</code>, and 
+    * <code>Session.DUPS_OK_ACKNOWLEDGE</code>. 
+    *  
+    * @return a newly created topic session
+    *  
+    * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
+    *                         to create a session due to some internal error or
+    *                         lack of support for the specific transaction
+    *                         and acknowledgement mode.
+    *
+    * @see Session#AUTO_ACKNOWLEDGE 
+    * @see Session#CLIENT_ACKNOWLEDGE 
+    * @see Session#DUPS_OK_ACKNOWLEDGE 
+    */
 
-    /** Creates a connection consumer for this connection (optional operation).
-      * This is an expert facility not used by regular JMS clients.
-      *  
-      * @param topic the topic to access
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector  
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the connection consumer
-      *
-      * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      * @see javax.jms.ConnectionConsumer
-      */ 
+  TopicSession createTopicSession(boolean transacted, int acknowledgeMode) throws JMSException;
 
-    ConnectionConsumer
-    createConnectionConsumer(Topic topic,
-                             String messageSelector,
-                             ServerSessionPool sessionPool,
-			     int maxMessages)
-			     throws JMSException;
+  /** Creates a connection consumer for this connection (optional operation).
+    * This is an expert facility not used by regular JMS clients.
+    *  
+    * @param topic the topic to access
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector  
+    * for the message consumer.
+    * @param sessionPool the server session pool to associate with this 
+    * connection consumer
+    * @param maxMessages the maximum number of messages that can be
+    * assigned to a server session at one time
+    *
+    * @return the connection consumer
+    *
+    * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
+    *                         to create a connection consumer due to some
+    *                         internal error or invalid arguments for 
+    *                         <CODE>sessionPool</CODE> and 
+    *                         <CODE>messageSelector</CODE>.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    * @see javax.jms.ConnectionConsumer
+    */
 
+  ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector, ServerSessionPool sessionPool,
+      int maxMessages) throws JMSException;
 
-    /** Create a durable connection consumer for this connection (optional operation). 
-      * This is an expert facility not used by regular JMS clients.
-      *                
-      * @param topic the topic to access
-      * @param subscriptionName durable subscription name
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param sessionPool the server session pool to associate with this 
-      * durable connection consumer
-      * @param maxMessages the maximum number of messages that can be
-      * assigned to a server session at one time
-      *
-      * @return the durable connection consumer
-      *  
-      * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
-      *                         to create a connection consumer due to some
-      *                         internal error or invalid arguments for 
-      *                         <CODE>sessionPool</CODE> and 
-      *                         <CODE>messageSelector</CODE>.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      * @see javax.jms.ConnectionConsumer
-      */
+  /** Create a durable connection consumer for this connection (optional operation). 
+    * This is an expert facility not used by regular JMS clients.
+    *                
+    * @param topic the topic to access
+    * @param subscriptionName durable subscription name
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param sessionPool the server session pool to associate with this 
+    * durable connection consumer
+    * @param maxMessages the maximum number of messages that can be
+    * assigned to a server session at one time
+    *
+    * @return the durable connection consumer
+    *  
+    * @exception JMSException if the <CODE>TopicConnection</CODE> object fails
+    *                         to create a connection consumer due to some
+    *                         internal error or invalid arguments for 
+    *                         <CODE>sessionPool</CODE> and 
+    *                         <CODE>messageSelector</CODE>.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    * @see javax.jms.ConnectionConsumer
+    */
 
-    ConnectionConsumer
-    createDurableConnectionConsumer(Topic topic,
-				    String subscriptionName,
-                                    String messageSelector,
-                                    ServerSessionPool sessionPool,
-				    int maxMessages)
-                             throws JMSException;
+  ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector,
+      ServerSessionPool sessionPool, int maxMessages) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java
index 68376b3a53..e518665d31 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicConnectionFactory.java
@@ -1,84 +1,80 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A client uses a <CODE>TopicConnectionFactory</CODE> object to create 
-  * <CODE>TopicConnection</CODE> objects with a publish/subscribe JMS provider.
-  *
-  * <P>A<CODE> TopicConnectionFactory</CODE> can be used to create a 
-  * <CODE>TopicConnection</CODE>, from which specialized topic-related objects
-  * can be  created. A more general, and recommended approach 
-  * is to use the <CODE>ConnectionFactory</CODE> object.
-  *  
-  * <P> The <CODE>TopicConnectionFactory</CODE> object
-  * should be used to support existing code.
-  *
-  * @version    1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.ConnectionFactory
-  */
-
-public interface TopicConnectionFactory extends ConnectionFactory {
+/** A client uses a <CODE>TopicConnectionFactory</CODE> object to create
+ * <CODE>TopicConnection</CODE> objects with a publish/subscribe JMS provider.
+ *
+ * <P>A<CODE> TopicConnectionFactory</CODE> can be used to create a
+ * <CODE>TopicConnection</CODE>, from which specialized topic-related objects
+ * can be  created. A more general, and recommended approach
+ * is to use the <CODE>ConnectionFactory</CODE> object.
+ *
+ * <P> The <CODE>TopicConnectionFactory</CODE> object
+ * should be used to support existing code.
+ *
+ * @version    1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.ConnectionFactory
+ */
 
-    /** Creates a topic connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created topic connection
-      *
-      * @exception JMSException if the JMS provider fails to create a topic 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException if client authentication fails due to 
-      *                                 an invalid user name or password.
-      */ 
+public interface TopicConnectionFactory extends ConnectionFactory
+{
 
-    TopicConnection
-    createTopicConnection() throws JMSException;
+  /** Creates a topic connection with the default user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *
+    * @return a newly created topic connection
+    *
+    * @exception JMSException if the JMS provider fails to create a topic 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException if client authentication fails due to 
+    *                                 an invalid user name or password.
+    */
 
+  TopicConnection createTopicConnection() throws JMSException;
 
-    /** Creates a topic connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created topic connection
-      *
-      * @exception JMSException if the JMS provider fails to create a topic 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException if client authentication fails due to 
-      *                                 an invalid user name or password.
-      */ 
+  /** Creates a topic connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created topic connection
+    *
+    * @exception JMSException if the JMS provider fails to create a topic 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException if client authentication fails due to 
+    *                                 an invalid user name or password.
+    */
 
-    TopicConnection
-    createTopicConnection(String userName, String password) 
-					     throws JMSException;
+  TopicConnection createTopicConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java
index b7dbb9fc69..5019bef7b7 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicPublisher.java
@@ -1,207 +1,191 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A client uses a <CODE>TopicPublisher</CODE> object to publish messages on a 
-  * topic. A <CODE>TopicPublisher</CODE> object is the publish-subscribe form
-  * of a message producer.
-  *
-  * <P>Normally, the <CODE>Topic</CODE> is specified when a 
-  * <CODE>TopicPublisher</CODE> is created.  In this case, an attempt to use 
-  * the <CODE>publish</CODE> methods for an unidentified 
-  * <CODE>TopicPublisher</CODE> will throw a 
-  * <CODE>java.lang.UnsupportedOperationException</CODE>.
-  *
-  * <P>If the <CODE>TopicPublisher</CODE> is created with an unidentified 
-  * <CODE>Topic</CODE>, an attempt to use the <CODE>publish</CODE> methods that 
-  * assume that the <CODE>Topic</CODE> has been identified will throw a 
-  * <CODE>java.lang.UnsupportedOperationException</CODE>.
-  *
-  * <P>During the execution of its <CODE>publish</CODE> method,
-  * a message must not be changed by other threads within the client. 
-  * If the message is modified, the result of the <CODE>publish</CODE> is 
-  * undefined.
-  * 
-  * <P>After publishing a message, a client may retain and modify it
-  * without affecting the message that has been published. The same message
-  * object may be published multiple times.
-  * 
-  * <P>The following message headers are set as part of publishing a 
-  * message: <code>JMSDestination</code>, <code>JMSDeliveryMode</code>, 
-  * <code>JMSExpiration</code>, <code>JMSPriority</code>, 
-  * <code>JMSMessageID</code> and <code>JMSTimeStamp</code>.
-  * When the message is published, the values of these headers are ignored. 
-  * After completion of the <CODE>publish</CODE>, the headers hold the values 
-  * specified by the method publishing the message. It is possible for the 
-  * <CODE>publish</CODE> method not to set <code>JMSMessageID</code> and 
-  * <code>JMSTimeStamp</code> if the 
-  * setting of these headers is explicitly disabled by the 
-  * <code>MessageProducer.setDisableMessageID</code> or
-  * <code>MessageProducer.setDisableMessageTimestamp</code> method.
-  *
-  *<P>Creating a <CODE>MessageProducer</CODE> provides the same features as
-  * creating a <CODE>TopicPublisher</CODE>. A <CODE>MessageProducer</CODE> object is 
-  * recommended when creating new code. The  <CODE>TopicPublisher</CODE> is
-  * provided to support existing code.
-
-  *
-  *<P>Because <CODE>TopicPublisher</CODE> inherits from 
-  * <CODE>MessageProducer</CODE>, it inherits the
-  * <CODE>send</CODE> methods that are a part of the <CODE>MessageProducer</CODE> 
-  * interface. Using the <CODE>send</CODE> methods will have the same
-  * effect as using the
-  * <CODE>publish</CODE> methods: they are functionally the same.
-  * 
-  *
-  * @version    1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see Session#createProducer(Destination) 
-  * @see TopicSession#createPublisher(Topic)
-  */
-
-public interface TopicPublisher extends MessageProducer {
-
-    /** Gets the topic associated with this <CODE>TopicPublisher</CODE>.
-      *
-      * @return this publisher's topic
-      *  
-      * @exception JMSException if the JMS provider fails to get the topic for
-      *                         this <CODE>TopicPublisher</CODE>
-      *                         due to some internal error.
-      */
-
-    Topic 
-    getTopic() throws JMSException;
-
- 
-    /** Publishes a message to the topic.
-      * Uses the <CODE>TopicPublisher</CODE>'s default delivery mode, priority,
-      * and time to live.
-      *
-      * @param message the message to publish
-      *
-      * @exception JMSException if the JMS provider fails to publish the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses this method
-      *                         with a <CODE>TopicPublisher</CODE> with
-      *                         an invalid topic.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>TopicPublisher</CODE> that
-      *                         did not specify a topic at creation time.
-      * 
-      * @see javax.jms.MessageProducer#getDeliveryMode()
-      * @see javax.jms.MessageProducer#getTimeToLive()
-      * @see javax.jms.MessageProducer#getPriority()
-      */
-
-    void 
-    publish(Message message) throws JMSException;
-
-
-    /** Publishes a message to the topic, specifying delivery mode,
-      * priority, and time to live.
-      *
-      * @param message the message to publish
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *
-      * @exception JMSException if the JMS provider fails to publish the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses this method
-      *                         with a <CODE>TopicPublisher</CODE> with
-      *                         an invalid topic.
-      * @exception java.lang.UnsupportedOperationException if a client uses this
-      *                         method with a <CODE>TopicPublisher</CODE> that
-      *                         did not specify a topic at creation time.
-      */
- 
-    void
-    publish(Message message, 
-            int deliveryMode, 
-	    int priority,
-	    long timeToLive) throws JMSException;
-
-
-    /** Publishes a message to a topic for an unidentified message producer. 
-      * Uses the <CODE>TopicPublisher</CODE>'s default delivery mode, 
-      * priority, and time to live.
-      *  
-      * <P>Typically, a message producer is assigned a topic at creation 
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the topic be supplied every time a message is
-      * published.
-      *
-      * @param topic the topic to publish this message to
-      * @param message the message to publish
-      *  
-      * @exception JMSException if the JMS provider fails to publish the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid topic.
-      * 
-      * @see javax.jms.MessageProducer#getDeliveryMode()
-      * @see javax.jms.MessageProducer#getTimeToLive()
-      * @see javax.jms.MessageProducer#getPriority()
-      */ 
-
-    void
-    publish(Topic topic, Message message) throws JMSException;
-
-
-    /** Publishes a message to a topic for an unidentified message 
-      * producer, specifying delivery mode, priority and time to live.
-      *  
-      * <P>Typically, a message producer is assigned a topic at creation
-      * time; however, the JMS API also supports unidentified message producers,
-      * which require that the topic be supplied every time a message is
-      * published.
-      *
-      * @param topic the topic to publish this message to
-      * @param message the message to publish
-      * @param deliveryMode the delivery mode to use
-      * @param priority the priority for this message
-      * @param timeToLive the message's lifetime (in milliseconds)
-      *  
-      * @exception JMSException if the JMS provider fails to publish the message
-      *                         due to some internal error.
-      * @exception MessageFormatException if an invalid message is specified.
-      * @exception InvalidDestinationException if a client uses
-      *                         this method with an invalid topic.
-      */ 
+/** A client uses a <CODE>TopicPublisher</CODE> object to publish messages on a
+ * topic. A <CODE>TopicPublisher</CODE> object is the publish-subscribe form
+ * of a message producer.
+ *
+ * <P>Normally, the <CODE>Topic</CODE> is specified when a
+ * <CODE>TopicPublisher</CODE> is created.  In this case, an attempt to use
+ * the <CODE>publish</CODE> methods for an unidentified
+ * <CODE>TopicPublisher</CODE> will throw a
+ * <CODE>java.lang.UnsupportedOperationException</CODE>.
+ *
+ * <P>If the <CODE>TopicPublisher</CODE> is created with an unidentified
+ * <CODE>Topic</CODE>, an attempt to use the <CODE>publish</CODE> methods that
+ * assume that the <CODE>Topic</CODE> has been identified will throw a
+ * <CODE>java.lang.UnsupportedOperationException</CODE>.
+ *
+ * <P>During the execution of its <CODE>publish</CODE> method,
+ * a message must not be changed by other threads within the client.
+ * If the message is modified, the result of the <CODE>publish</CODE> is
+ * undefined.
+ *
+ * <P>After publishing a message, a client may retain and modify it
+ * without affecting the message that has been published. The same message
+ * object may be published multiple times.
+ *
+ * <P>The following message headers are set as part of publishing a
+ * message: <code>JMSDestination</code>, <code>JMSDeliveryMode</code>,
+ * <code>JMSExpiration</code>, <code>JMSPriority</code>,
+ * <code>JMSMessageID</code> and <code>JMSTimeStamp</code>.
+ * When the message is published, the values of these headers are ignored.
+ * After completion of the <CODE>publish</CODE>, the headers hold the values
+ * specified by the method publishing the message. It is possible for the
+ * <CODE>publish</CODE> method not to set <code>JMSMessageID</code> and
+ * <code>JMSTimeStamp</code> if the
+ * setting of these headers is explicitly disabled by the
+ * <code>MessageProducer.setDisableMessageID</code> or
+ * <code>MessageProducer.setDisableMessageTimestamp</code> method.
+ *
+ *<P>Creating a <CODE>MessageProducer</CODE> provides the same features as
+ * creating a <CODE>TopicPublisher</CODE>. A <CODE>MessageProducer</CODE> object is
+ * recommended when creating new code. The  <CODE>TopicPublisher</CODE> is
+ * provided to support existing code.
+
+ *
+ *<P>Because <CODE>TopicPublisher</CODE> inherits from
+ * <CODE>MessageProducer</CODE>, it inherits the
+ * <CODE>send</CODE> methods that are a part of the <CODE>MessageProducer</CODE>
+ * interface. Using the <CODE>send</CODE> methods will have the same
+ * effect as using the
+ * <CODE>publish</CODE> methods: they are functionally the same.
+ *
+ *
+ * @version    1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see Session#createProducer(Destination)
+ * @see TopicSession#createPublisher(Topic)
+ */
 
-    void
-    publish(Topic topic, 
-            Message message, 
-            int deliveryMode, 
-            int priority,
-	    long timeToLive) throws JMSException;
+public interface TopicPublisher extends MessageProducer
+{
+
+  /** Gets the topic associated with this <CODE>TopicPublisher</CODE>.
+    *
+    * @return this publisher's topic
+    *  
+    * @exception JMSException if the JMS provider fails to get the topic for
+    *                         this <CODE>TopicPublisher</CODE>
+    *                         due to some internal error.
+    */
+
+  Topic getTopic() throws JMSException;
+
+  /** Publishes a message to the topic.
+    * Uses the <CODE>TopicPublisher</CODE>'s default delivery mode, priority,
+    * and time to live.
+    *
+    * @param message the message to publish
+    *
+    * @exception JMSException if the JMS provider fails to publish the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses this method
+    *                         with a <CODE>TopicPublisher</CODE> with
+    *                         an invalid topic.
+    * @exception java.lang.UnsupportedOperationException if a client uses this
+    *                         method with a <CODE>TopicPublisher</CODE> that
+    *                         did not specify a topic at creation time.
+    * 
+    * @see javax.jms.MessageProducer#getDeliveryMode()
+    * @see javax.jms.MessageProducer#getTimeToLive()
+    * @see javax.jms.MessageProducer#getPriority()
+    */
+
+  void publish(Message message) throws JMSException;
+
+  /** Publishes a message to the topic, specifying delivery mode,
+    * priority, and time to live.
+    *
+    * @param message the message to publish
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *
+    * @exception JMSException if the JMS provider fails to publish the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses this method
+    *                         with a <CODE>TopicPublisher</CODE> with
+    *                         an invalid topic.
+    * @exception java.lang.UnsupportedOperationException if a client uses this
+    *                         method with a <CODE>TopicPublisher</CODE> that
+    *                         did not specify a topic at creation time.
+    */
+
+  void publish(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
+
+  /** Publishes a message to a topic for an unidentified message producer. 
+    * Uses the <CODE>TopicPublisher</CODE>'s default delivery mode, 
+    * priority, and time to live.
+    *  
+    * <P>Typically, a message producer is assigned a topic at creation 
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the topic be supplied every time a message is
+    * published.
+    *
+    * @param topic the topic to publish this message to
+    * @param message the message to publish
+    *  
+    * @exception JMSException if the JMS provider fails to publish the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid topic.
+    * 
+    * @see javax.jms.MessageProducer#getDeliveryMode()
+    * @see javax.jms.MessageProducer#getTimeToLive()
+    * @see javax.jms.MessageProducer#getPriority()
+    */
+
+  void publish(Topic topic, Message message) throws JMSException;
+
+  /** Publishes a message to a topic for an unidentified message 
+    * producer, specifying delivery mode, priority and time to live.
+    *  
+    * <P>Typically, a message producer is assigned a topic at creation
+    * time; however, the JMS API also supports unidentified message producers,
+    * which require that the topic be supplied every time a message is
+    * published.
+    *
+    * @param topic the topic to publish this message to
+    * @param message the message to publish
+    * @param deliveryMode the delivery mode to use
+    * @param priority the priority for this message
+    * @param timeToLive the message's lifetime (in milliseconds)
+    *  
+    * @exception JMSException if the JMS provider fails to publish the message
+    *                         due to some internal error.
+    * @exception MessageFormatException if an invalid message is specified.
+    * @exception InvalidDestinationException if a client uses
+    *                         this method with an invalid topic.
+    */
+
+  void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java
index 0ef194b428..8424e94f5a 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicRequestor.java
@@ -1,123 +1,125 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /** The <CODE>TopicRequestor</CODE> helper class simplifies
-  * making service requests.
-  *
-  * <P>The <CODE>TopicRequestor</CODE> constructor is given a non-transacted 
-  * <CODE>TopicSession</CODE> and a destination <CODE>Topic</CODE>. It creates a 
-  * <CODE>TemporaryTopic</CODE> for the responses and provides a 
-  * <CODE>request</CODE> method that sends the request message and waits 
-  * for its reply.
-  *
-  * <P>This is a basic request/reply abstraction that should be sufficient 
-  * for most uses. JMS providers and clients are free to create more 
-  * sophisticated versions.
-  *
-  * @version     1.0 - 8 July 1998
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  *
-  * @see         javax.jms.QueueRequestor
-  */
+ * making service requests.
+ *
+ * <P>The <CODE>TopicRequestor</CODE> constructor is given a non-transacted
+ * <CODE>TopicSession</CODE> and a destination <CODE>Topic</CODE>. It creates a
+ * <CODE>TemporaryTopic</CODE> for the responses and provides a
+ * <CODE>request</CODE> method that sends the request message and waits
+ * for its reply.
+ *
+ * <P>This is a basic request/reply abstraction that should be sufficient
+ * for most uses. JMS providers and clients are free to create more
+ * sophisticated versions.
+ *
+ * @version     1.0 - 8 July 1998
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ *
+ * @see         javax.jms.QueueRequestor
+ */
+
+public class TopicRequestor
+{
 
-public class TopicRequestor {
+  TopicSession session; // The topic session the topic belongs to.
 
-    TopicSession    session;    // The topic session the topic belongs to.
-    Topic           topic;      // The topic to perform the request/reply on.  
-    TemporaryTopic  tempTopic;
-    TopicPublisher  publisher;
-    TopicSubscriber subscriber;
+  Topic topic; // The topic to perform the request/reply on.
 
+  TemporaryTopic tempTopic;
 
-    /** Constructor for the <CODE>TopicRequestor</CODE> class.
-      * 
-      * <P>This implementation assumes the session parameter to be non-transacted,
-      * with a delivery mode of either <CODE>AUTO_ACKNOWLEDGE</CODE> or 
-      * <CODE>DUPS_OK_ACKNOWLEDGE</CODE>.
-      *
-      * @param session the <CODE>TopicSession</CODE> the topic belongs to
-      * @param topic the topic to perform the request/reply call on
-      *
-      * @exception JMSException if the JMS provider fails to create the
-      *                         <CODE>TopicRequestor</CODE> due to some internal
-      *                         error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      */ 
+  TopicPublisher publisher;
 
-    public 
-    TopicRequestor(TopicSession session, Topic topic) throws JMSException {
-	this.session = session;
-	this.topic   = topic;
-        tempTopic    = session.createTemporaryTopic();
-        publisher    = session.createPublisher(topic);
-        subscriber   = session.createSubscriber(tempTopic);
-    }
+  TopicSubscriber subscriber;
 
+  /** Constructor for the <CODE>TopicRequestor</CODE> class.
+    * 
+    * <P>This implementation assumes the session parameter to be non-transacted,
+    * with a delivery mode of either <CODE>AUTO_ACKNOWLEDGE</CODE> or 
+    * <CODE>DUPS_OK_ACKNOWLEDGE</CODE>.
+    *
+    * @param session the <CODE>TopicSession</CODE> the topic belongs to
+    * @param topic the topic to perform the request/reply call on
+    *
+    * @exception JMSException if the JMS provider fails to create the
+    *                         <CODE>TopicRequestor</CODE> due to some internal
+    *                         error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    */
 
-    /** Sends a request and waits for a reply. The temporary topic is used for
-      * the <CODE>JMSReplyTo</CODE> destination; the first reply is returned, 
-      * and any following replies are discarded.
-      *
-      * @param message the message to send
-      *  
-      * @return the reply message
-      *  
-      * @exception JMSException if the JMS provider fails to complete the
-      *                         request due to some internal error.
-      */
+  public TopicRequestor(TopicSession session, Topic topic) throws JMSException
+  {
+    this.session = session;
+    this.topic = topic;
+    tempTopic = session.createTemporaryTopic();
+    publisher = session.createPublisher(topic);
+    subscriber = session.createSubscriber(tempTopic);
+  }
 
-    public Message
-    request(Message message) throws JMSException {
-	message.setJMSReplyTo(tempTopic);
-        publisher.publish(message);
-	return(subscriber.receive());
-    }
+  /** Sends a request and waits for a reply. The temporary topic is used for
+    * the <CODE>JMSReplyTo</CODE> destination; the first reply is returned, 
+    * and any following replies are discarded.
+    *
+    * @param message the message to send
+    *  
+    * @return the reply message
+    *  
+    * @exception JMSException if the JMS provider fails to complete the
+    *                         request due to some internal error.
+    */
 
+  public Message request(Message message) throws JMSException
+  {
+    message.setJMSReplyTo(tempTopic);
+    publisher.publish(message);
+    return subscriber.receive();
+  }
 
-    /** Closes the <CODE>TopicRequestor</CODE> and its session.
-      *
-      * <P>Since a provider may allocate some resources on behalf of a 
-      * <CODE>TopicRequestor</CODE> outside the Java virtual machine, clients 
-      * should close them when they 
-      * are not needed. Relying on garbage collection to eventually reclaim 
-      * these resources may not be timely enough.
-      *
-      * <P>Note that this method closes the <CODE>TopicSession</CODE> object 
-      * passed to the <CODE>TopicRequestor</CODE> constructor.
-      *  
-      * @exception JMSException if the JMS provider fails to close the
-      *                         <CODE>TopicRequestor</CODE> due to some internal
-      *                         error.
-      */
+  /** Closes the <CODE>TopicRequestor</CODE> and its session.
+    *
+    * <P>Since a provider may allocate some resources on behalf of a 
+    * <CODE>TopicRequestor</CODE> outside the Java virtual machine, clients 
+    * should close them when they 
+    * are not needed. Relying on garbage collection to eventually reclaim 
+    * these resources may not be timely enough.
+    *
+    * <P>Note that this method closes the <CODE>TopicSession</CODE> object 
+    * passed to the <CODE>TopicRequestor</CODE> constructor.
+    *  
+    * @exception JMSException if the JMS provider fails to close the
+    *                         <CODE>TopicRequestor</CODE> due to some internal
+    *                         error.
+    */
 
-    public void
-    close() throws JMSException {
+  public void close() throws JMSException
+  {
 
-	// publisher and consumer created by constructor are implicitly closed.
-	session.close();
-	tempTopic.delete();
-    }
+    // publisher and consumer created by constructor are implicitly closed.
+    session.close();
+    tempTopic.delete();
+  }
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
index d42dc5fb94..ca6cbb51b3 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSession.java
@@ -1,293 +1,273 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** A <CODE>TopicSession</CODE> object provides methods for creating 
-  * <CODE>TopicPublisher</CODE>, <CODE>TopicSubscriber</CODE>, and 
-  * <CODE>TemporaryTopic</CODE> objects. It also provides a method for 
-  * deleting its client's durable subscribers.
-  *
-  *<P>A <CODE>TopicSession</CODE> is used for creating Pub/Sub specific
-  * objects. In general, use the  <CODE>Session</CODE> object, and 
-  *  use <CODE>TopicSession</CODE>  only to support
-  * existing code. Using the <CODE>Session</CODE> object simplifies the 
-  * programming model, and allows transactions to be used across the two 
-  * messaging domains.
-  * 
-  * <P>A <CODE>TopicSession</CODE> cannot be used to create objects specific to the 
-  * point-to-point domain. The following methods inherit from 
-  * <CODE>Session</CODE>, but must throw an 
-  * <CODE>IllegalStateException</CODE> 
-  * if used from <CODE>TopicSession</CODE>:
-  *<UL>
-  *   <LI><CODE>createBrowser</CODE>
-  *   <LI><CODE>createQueue</CODE>
-  *   <LI><CODE>createTemporaryQueue</CODE>
-  *</UL>
-  *
-  * @version     1.1 - April 9, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author       Kate Stout
-  *
-  * @see         javax.jms.Session
-  * @see	 javax.jms.Connection#createSession(boolean, int)
-  * @see	 javax.jms.TopicConnection#createTopicSession(boolean, int)
-  * @see         javax.jms.XATopicSession#getTopicSession()
-  */
-
-public interface TopicSession extends Session {
-
-    /** Creates a topic identity given a <CODE>Topic</CODE> name.
-      *
-      * <P>This facility is provided for the rare cases where clients need to
-      * dynamically manipulate topic identity. This allows the creation of a
-      * topic identity with a provider-specific name. Clients that depend 
-      * on this ability are not portable.
-      *
-      * <P>Note that this method is not for creating the physical topic. 
-      * The physical creation of topics is an administrative task and is not
-      * to be initiated by the JMS API. The one exception is the
-      * creation of temporary topics, which is accomplished with the 
-      * <CODE>createTemporaryTopic</CODE> method.
-      *  
-      * @param topicName the name of this <CODE>Topic</CODE>
-      *
-      * @return a <CODE>Topic</CODE> with the given name
-      *
-      * @exception JMSException if the session fails to create a topic
-      *                         due to some internal error.
-      */
-
-    Topic
-    createTopic(String topicName) throws JMSException;
-
-
-    /** Creates a nondurable subscriber to the specified topic.
-      *  
-      * <P>A client uses a <CODE>TopicSubscriber</CODE> object to receive 
-      * messages that have been published to a topic.
-      *
-      * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. 
-      * They receive only messages that are published while they are active.
-      *
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is false.
-      *
-      * @param topic the <CODE>Topic</CODE> to subscribe to
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      */ 
+/** A <CODE>TopicSession</CODE> object provides methods for creating
+ * <CODE>TopicPublisher</CODE>, <CODE>TopicSubscriber</CODE>, and
+ * <CODE>TemporaryTopic</CODE> objects. It also provides a method for
+ * deleting its client's durable subscribers.
+ *
+ *<P>A <CODE>TopicSession</CODE> is used for creating Pub/Sub specific
+ * objects. In general, use the  <CODE>Session</CODE> object, and
+ *  use <CODE>TopicSession</CODE>  only to support
+ * existing code. Using the <CODE>Session</CODE> object simplifies the
+ * programming model, and allows transactions to be used across the two
+ * messaging domains.
+ *
+ * <P>A <CODE>TopicSession</CODE> cannot be used to create objects specific to the
+ * point-to-point domain. The following methods inherit from
+ * <CODE>Session</CODE>, but must throw an
+ * <CODE>IllegalStateException</CODE>
+ * if used from <CODE>TopicSession</CODE>:
+ *<UL>
+ *   <LI><CODE>createBrowser</CODE>
+ *   <LI><CODE>createQueue</CODE>
+ *   <LI><CODE>createTemporaryQueue</CODE>
+ *</UL>
+ *
+ * @version     1.1 - April 9, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author       Kate Stout
+ *
+ * @see         javax.jms.Session
+ * @see	 javax.jms.Connection#createSession(boolean, int)
+ * @see	 javax.jms.TopicConnection#createTopicSession(boolean, int)
+ * @see         javax.jms.XATopicSession#getTopicSession()
+ */
 
-    TopicSubscriber
-    createSubscriber(Topic topic) throws JMSException;
+public interface TopicSession extends Session
+{
 
+  /** Creates a topic identity given a <CODE>Topic</CODE> name.
+    *
+    * <P>This facility is provided for the rare cases where clients need to
+    * dynamically manipulate topic identity. This allows the creation of a
+    * topic identity with a provider-specific name. Clients that depend 
+    * on this ability are not portable.
+    *
+    * <P>Note that this method is not for creating the physical topic. 
+    * The physical creation of topics is an administrative task and is not
+    * to be initiated by the JMS API. The one exception is the
+    * creation of temporary topics, which is accomplished with the 
+    * <CODE>createTemporaryTopic</CODE> method.
+    *  
+    * @param topicName the name of this <CODE>Topic</CODE>
+    *
+    * @return a <CODE>Topic</CODE> with the given name
+    *
+    * @exception JMSException if the session fails to create a topic
+    *                         due to some internal error.
+    */
 
-    /** Creates a nondurable subscriber to the specified topic, using a
-      * message selector or specifying whether messages published by its
-      * own connection should be delivered to it.
-      *
-      * <P>A client uses a <CODE>TopicSubscriber</CODE> object to receive 
-      * messages that have been published to a topic.
-      *  
-      * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. 
-      * They receive only messages that are published while they are active.
-      *
-      * <P>Messages filtered out by a subscriber's message selector will 
-      * never be delivered to the subscriber. From the subscriber's 
-      * perspective, they do not exist.
-      *
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is false.
-      *
-      * @param topic the <CODE>Topic</CODE> to subscribe to
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered. A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param noLocal if set, inhibits the delivery of messages published
-      * by its own connection
-      * 
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      */
+  Topic createTopic(String topicName) throws JMSException;
 
-    TopicSubscriber 
-    createSubscriber(Topic topic, 
-		     String messageSelector,
-		     boolean noLocal) throws JMSException;
+  /** Creates a nondurable subscriber to the specified topic.
+    *  
+    * <P>A client uses a <CODE>TopicSubscriber</CODE> object to receive 
+    * messages that have been published to a topic.
+    *
+    * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. 
+    * They receive only messages that are published while they are active.
+    *
+    * <P>In some cases, a connection may both publish and subscribe to a 
+    * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
+    * to inhibit the delivery of messages published by its own connection.
+    * The default value for this attribute is false.
+    *
+    * @param topic the <CODE>Topic</CODE> to subscribe to
+    *  
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    */
 
+  TopicSubscriber createSubscriber(Topic topic) throws JMSException;
 
-    /** Creates a durable subscriber to the specified topic.
-      *  
-      * <P>If a client needs to receive all the messages published on a 
-      * topic, including the ones published while the subscriber is inactive,
-      * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
-      * retains a record of this 
-      * durable subscription and insures that all messages from the topic's 
-      * publishers are retained until they are acknowledged by this 
-      * durable subscriber or they have expired.
-      *
-      * <P>Sessions with durable subscribers must always provide the same 
-      * client identifier. In addition, each client must specify a name that 
-      * uniquely identifies (within client identifier) each durable 
-      * subscription it creates. Only one session at a time can have a 
-      * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
-      *
-      * <P>A client can change an existing durable subscription by creating 
-      * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
-      * topic and/or 
-      * message selector. Changing a durable subscriber is equivalent to 
-      * unsubscribing (deleting) the old one and creating a new one.
-      *
-      * <P>In some cases, a connection may both publish and subscribe to a 
-      * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
-      * to inhibit the delivery of messages published by its own connection.
-      * The default value for this attribute is false.
-      *
-      * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
-      * @param name the name used to identify this subscription
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      */ 
+  /** Creates a nondurable subscriber to the specified topic, using a
+    * message selector or specifying whether messages published by its
+    * own connection should be delivered to it.
+    *
+    * <P>A client uses a <CODE>TopicSubscriber</CODE> object to receive 
+    * messages that have been published to a topic.
+    *  
+    * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. 
+    * They receive only messages that are published while they are active.
+    *
+    * <P>Messages filtered out by a subscriber's message selector will 
+    * never be delivered to the subscriber. From the subscriber's 
+    * perspective, they do not exist.
+    *
+    * <P>In some cases, a connection may both publish and subscribe to a 
+    * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
+    * to inhibit the delivery of messages published by its own connection.
+    * The default value for this attribute is false.
+    *
+    * @param topic the <CODE>Topic</CODE> to subscribe to
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered. A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param noLocal if set, inhibits the delivery of messages published
+    * by its own connection
+    * 
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    */
 
-    TopicSubscriber
-    createDurableSubscriber(Topic topic, 
-			    String name) throws JMSException;
+  TopicSubscriber createSubscriber(Topic topic, String messageSelector, boolean noLocal) throws JMSException;
 
+  /** Creates a durable subscriber to the specified topic.
+    *  
+    * <P>If a client needs to receive all the messages published on a 
+    * topic, including the ones published while the subscriber is inactive,
+    * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
+    * retains a record of this 
+    * durable subscription and insures that all messages from the topic's 
+    * publishers are retained until they are acknowledged by this 
+    * durable subscriber or they have expired.
+    *
+    * <P>Sessions with durable subscribers must always provide the same 
+    * client identifier. In addition, each client must specify a name that 
+    * uniquely identifies (within client identifier) each durable 
+    * subscription it creates. Only one session at a time can have a 
+    * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
+    *
+    * <P>A client can change an existing durable subscription by creating 
+    * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
+    * topic and/or 
+    * message selector. Changing a durable subscriber is equivalent to 
+    * unsubscribing (deleting) the old one and creating a new one.
+    *
+    * <P>In some cases, a connection may both publish and subscribe to a 
+    * topic. The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber
+    * to inhibit the delivery of messages published by its own connection.
+    * The default value for this attribute is false.
+    *
+    * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
+    * @param name the name used to identify this subscription
+    *  
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    */
 
-    /** Creates a durable subscriber to the specified topic, using a
-      * message selector or specifying whether messages published by its
-      * own connection should be delivered to it.
-      *  
-      * <P>If a client needs to receive all the messages published on a 
-      * topic, including the ones published while the subscriber is inactive,
-      * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
-      * retains a record of this 
-      * durable subscription and insures that all messages from the topic's 
-      * publishers are retained until they are acknowledged by this 
-      * durable subscriber or they have expired.
-      *
-      * <P>Sessions with durable subscribers must always provide the same
-      * client identifier. In addition, each client must specify a name which
-      * uniquely identifies (within client identifier) each durable
-      * subscription it creates. Only one session at a time can have a
-      * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
-      * An inactive durable subscriber is one that exists but
-      * does not currently have a message consumer associated with it.
-      *
-      * <P>A client can change an existing durable subscription by creating 
-      * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
-      * topic and/or 
-      * message selector. Changing a durable subscriber is equivalent to 
-      * unsubscribing (deleting) the old one and creating a new one.
-      *
-      * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
-      * @param name the name used to identify this subscription
-      * @param messageSelector only messages with properties matching the
-      * message selector expression are delivered.  A value of null or
-      * an empty string indicates that there is no message selector 
-      * for the message consumer.
-      * @param noLocal if set, inhibits the delivery of messages published
-      * by its own connection
-      *  
-      * @exception JMSException if the session fails to create a subscriber
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-      * @exception InvalidSelectorException if the message selector is invalid.
-      */ 
- 
-    TopicSubscriber
-    createDurableSubscriber(Topic topic,
-                            String name, 
-			    String messageSelector,
-			    boolean noLocal) throws JMSException;
+  TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException;
 
+  /** Creates a durable subscriber to the specified topic, using a
+    * message selector or specifying whether messages published by its
+    * own connection should be delivered to it.
+    *  
+    * <P>If a client needs to receive all the messages published on a 
+    * topic, including the ones published while the subscriber is inactive,
+    * it uses a durable <CODE>TopicSubscriber</CODE>. The JMS provider
+    * retains a record of this 
+    * durable subscription and insures that all messages from the topic's 
+    * publishers are retained until they are acknowledged by this 
+    * durable subscriber or they have expired.
+    *
+    * <P>Sessions with durable subscribers must always provide the same
+    * client identifier. In addition, each client must specify a name which
+    * uniquely identifies (within client identifier) each durable
+    * subscription it creates. Only one session at a time can have a
+    * <CODE>TopicSubscriber</CODE> for a particular durable subscription.
+    * An inactive durable subscriber is one that exists but
+    * does not currently have a message consumer associated with it.
+    *
+    * <P>A client can change an existing durable subscription by creating 
+    * a durable <CODE>TopicSubscriber</CODE> with the same name and a new 
+    * topic and/or 
+    * message selector. Changing a durable subscriber is equivalent to 
+    * unsubscribing (deleting) the old one and creating a new one.
+    *
+    * @param topic the non-temporary <CODE>Topic</CODE> to subscribe to
+    * @param name the name used to identify this subscription
+    * @param messageSelector only messages with properties matching the
+    * message selector expression are delivered.  A value of null or
+    * an empty string indicates that there is no message selector 
+    * for the message consumer.
+    * @param noLocal if set, inhibits the delivery of messages published
+    * by its own connection
+    *  
+    * @exception JMSException if the session fails to create a subscriber
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+    * @exception InvalidSelectorException if the message selector is invalid.
+    */
 
-    /** Creates a publisher for the specified topic.
-      *
-      * <P>A client uses a <CODE>TopicPublisher</CODE> object to publish 
-      * messages on a topic.
-      * Each time a client creates a <CODE>TopicPublisher</CODE> on a topic, it
-      * defines a 
-      * new sequence of messages that have no ordering relationship with the 
-      * messages it has previously sent.
-      *
-      * @param topic the <CODE>Topic</CODE> to publish to, or null if this is an
-      * unidentified producer
-      *
-      * @exception JMSException if the session fails to create a publisher
-      *                         due to some internal error.
-      * @exception InvalidDestinationException if an invalid topic is specified.
-     */
+  TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal)
+      throws JMSException;
 
-    TopicPublisher 
-    createPublisher(Topic topic) throws JMSException;
+  /** Creates a publisher for the specified topic.
+    *
+    * <P>A client uses a <CODE>TopicPublisher</CODE> object to publish 
+    * messages on a topic.
+    * Each time a client creates a <CODE>TopicPublisher</CODE> on a topic, it
+    * defines a 
+    * new sequence of messages that have no ordering relationship with the 
+    * messages it has previously sent.
+    *
+    * @param topic the <CODE>Topic</CODE> to publish to, or null if this is an
+    * unidentified producer
+    *
+    * @exception JMSException if the session fails to create a publisher
+    *                         due to some internal error.
+    * @exception InvalidDestinationException if an invalid topic is specified.
+   */
 
+  TopicPublisher createPublisher(Topic topic) throws JMSException;
 
-    /** Creates a <CODE>TemporaryTopic</CODE> object. Its lifetime will be that 
-      * of the <CODE>TopicConnection</CODE> unless it is deleted earlier.
-      *
-      * @return a temporary topic identity
-      *
-      * @exception JMSException if the session fails to create a temporary
-      *                         topic due to some internal error.
-      */
- 
-    TemporaryTopic
-    createTemporaryTopic() throws JMSException;
+  /** Creates a <CODE>TemporaryTopic</CODE> object. Its lifetime will be that 
+    * of the <CODE>TopicConnection</CODE> unless it is deleted earlier.
+    *
+    * @return a temporary topic identity
+    *
+    * @exception JMSException if the session fails to create a temporary
+    *                         topic due to some internal error.
+    */
 
+  TemporaryTopic createTemporaryTopic() throws JMSException;
 
-    /** Unsubscribes a durable subscription that has been created by a client.
-      *  
-      * <P>This method deletes the state being maintained on behalf of the 
-      * subscriber by its provider.
-      *
-      * <P>It is erroneous for a client to delete a durable subscription
-      * while there is an active <CODE>TopicSubscriber</CODE> for the 
-      * subscription, or while a consumed message is part of a pending 
-      * transaction or has not been acknowledged in the session.
-      *
-      * @param name the name used to identify this subscription
-      *  
-      * @exception JMSException if the session fails to unsubscribe to the 
-      *                         durable subscription due to some internal error.
-      * @exception InvalidDestinationException if an invalid subscription name
-      *                                        is specified.
-      */
+  /** Unsubscribes a durable subscription that has been created by a client.
+    *  
+    * <P>This method deletes the state being maintained on behalf of the 
+    * subscriber by its provider.
+    *
+    * <P>It is erroneous for a client to delete a durable subscription
+    * while there is an active <CODE>TopicSubscriber</CODE> for the 
+    * subscription, or while a consumed message is part of a pending 
+    * transaction or has not been acknowledged in the session.
+    *
+    * @param name the name used to identify this subscription
+    *  
+    * @exception JMSException if the session fails to unsubscribe to the 
+    *                         durable subscription due to some internal error.
+    * @exception InvalidDestinationException if an invalid subscription name
+    *                                        is specified.
+    */
 
-    void
-    unsubscribe(String name) throws JMSException;
+  void unsubscribe(String name) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java
index 9a1337c5cb..034df82ff7 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TopicSubscriber.java
@@ -1,125 +1,122 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** A client uses a <CODE>TopicSubscriber</CODE> object to receive messages that
-  * have been published to a topic. A <CODE>TopicSubscriber</CODE> object is the
-  * publish/subscribe form of a message consumer. A <CODE>MessageConsumer</CODE>
-  * can be created by using <CODE>Session.createConsumer</CODE>. 
-  *
-  * <P>A <CODE>TopicSession</CODE> allows the creation of multiple 
-  * <CODE>TopicSubscriber</CODE> objects per topic.  It will deliver each 
-  * message for a topic to each
-  * subscriber eligible to receive it. Each copy of the message
-  * is treated as a completely separate message. Work done on one copy has
-  * no effect on the others; acknowledging one does not acknowledge the
-  * others; one message may be delivered immediately, while another waits
-  * for its subscriber to process messages ahead of it.
-  *
-  * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. They 
-  * receive only messages that are published while they are active.
-  *
-  * <P>Messages filtered out by a subscriber's message selector will never 
-  * be delivered to the subscriber. From the subscriber's perspective, they 
-  * do not exist.
-  *
-  * <P>In some cases, a connection may both publish and subscribe to a topic.
-  * The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber to inhibit
-  * the 
-  * delivery of messages published by its own connection.
-  *
-  * <P>If a client needs to receive all the messages published on a topic, 
-  * including the ones published while the subscriber is inactive, it uses 
-  * a durable <CODE>TopicSubscriber</CODE>. The JMS provider retains a record of
-  * this durable 
-  * subscription and insures that all messages from the topic's publishers 
-  * are retained until they are acknowledged by this durable 
-  * subscriber or they have expired.
-  *
-  * <P>Sessions with durable subscribers must always provide the same client 
-  * identifier. In addition, each client must specify a name that uniquely 
-  * identifies (within client identifier) each durable subscription it creates.
-  * Only one session at a time can have a <CODE>TopicSubscriber</CODE> for a 
-  * particular durable subscription. 
-  *
-  * <P>A client can change an existing durable subscription by creating a 
-  * durable <CODE>TopicSubscriber</CODE> with the same name and a new topic 
-  * and/or message 
-  * selector. Changing a durable subscription is equivalent to unsubscribing 
-  * (deleting) the old one and creating a new one.
-  *
-  * <P>The <CODE>unsubscribe</CODE> method is used to delete a durable 
-  * subscription. The <CODE>unsubscribe</CODE> method can be used at the 
-  * <CODE>Session</CODE> or <CODE>TopicSession</CODE> level.
-  * This method deletes the state being 
-  * maintained on behalf of the subscriber by its provider.
-  *
-  * <P>Creating a <CODE>MessageConsumer</CODE> provides the same features as
-  * creating a <CODE>TopicSubscriber</CODE>. To create a durable subscriber, 
-  * use of <CODE>Session.CreateDurableSubscriber</CODE> is recommended. The 
-  * <CODE>TopicSubscriber</CODE> is provided to support existing code.
-  * 
-  * 
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session#createConsumer
-  * @see         javax.jms.Session#createDurableSubscriber
-  * @see         javax.jms.TopicSession
-  * @see         javax.jms.TopicSession#createSubscriber
-  * @see         javax.jms.MessageConsumer
-  */
-
-public interface TopicSubscriber extends MessageConsumer {
+ * have been published to a topic. A <CODE>TopicSubscriber</CODE> object is the
+ * publish/subscribe form of a message consumer. A <CODE>MessageConsumer</CODE>
+ * can be created by using <CODE>Session.createConsumer</CODE>.
+ *
+ * <P>A <CODE>TopicSession</CODE> allows the creation of multiple
+ * <CODE>TopicSubscriber</CODE> objects per topic.  It will deliver each
+ * message for a topic to each
+ * subscriber eligible to receive it. Each copy of the message
+ * is treated as a completely separate message. Work done on one copy has
+ * no effect on the others; acknowledging one does not acknowledge the
+ * others; one message may be delivered immediately, while another waits
+ * for its subscriber to process messages ahead of it.
+ *
+ * <P>Regular <CODE>TopicSubscriber</CODE> objects are not durable. They
+ * receive only messages that are published while they are active.
+ *
+ * <P>Messages filtered out by a subscriber's message selector will never
+ * be delivered to the subscriber. From the subscriber's perspective, they
+ * do not exist.
+ *
+ * <P>In some cases, a connection may both publish and subscribe to a topic.
+ * The subscriber <CODE>NoLocal</CODE> attribute allows a subscriber to inhibit
+ * the
+ * delivery of messages published by its own connection.
+ *
+ * <P>If a client needs to receive all the messages published on a topic,
+ * including the ones published while the subscriber is inactive, it uses
+ * a durable <CODE>TopicSubscriber</CODE>. The JMS provider retains a record of
+ * this durable
+ * subscription and insures that all messages from the topic's publishers
+ * are retained until they are acknowledged by this durable
+ * subscriber or they have expired.
+ *
+ * <P>Sessions with durable subscribers must always provide the same client
+ * identifier. In addition, each client must specify a name that uniquely
+ * identifies (within client identifier) each durable subscription it creates.
+ * Only one session at a time can have a <CODE>TopicSubscriber</CODE> for a
+ * particular durable subscription.
+ *
+ * <P>A client can change an existing durable subscription by creating a
+ * durable <CODE>TopicSubscriber</CODE> with the same name and a new topic
+ * and/or message
+ * selector. Changing a durable subscription is equivalent to unsubscribing
+ * (deleting) the old one and creating a new one.
+ *
+ * <P>The <CODE>unsubscribe</CODE> method is used to delete a durable
+ * subscription. The <CODE>unsubscribe</CODE> method can be used at the
+ * <CODE>Session</CODE> or <CODE>TopicSession</CODE> level.
+ * This method deletes the state being
+ * maintained on behalf of the subscriber by its provider.
+ *
+ * <P>Creating a <CODE>MessageConsumer</CODE> provides the same features as
+ * creating a <CODE>TopicSubscriber</CODE>. To create a durable subscriber,
+ * use of <CODE>Session.CreateDurableSubscriber</CODE> is recommended. The
+ * <CODE>TopicSubscriber</CODE> is provided to support existing code.
+ *
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session#createConsumer
+ * @see         javax.jms.Session#createDurableSubscriber
+ * @see         javax.jms.TopicSession
+ * @see         javax.jms.TopicSession#createSubscriber
+ * @see         javax.jms.MessageConsumer
+ */
 
-    /** Gets the <CODE>Topic</CODE> associated with this subscriber.
-      *  
-      * @return this subscriber's <CODE>Topic</CODE>
-      *  
-      * @exception JMSException if the JMS provider fails to get the topic for
-      *                         this topic subscriber
-      *                         due to some internal error.
-      */ 
+public interface TopicSubscriber extends MessageConsumer
+{
 
-    Topic
-    getTopic() throws JMSException;
+  /** Gets the <CODE>Topic</CODE> associated with this subscriber.
+    *  
+    * @return this subscriber's <CODE>Topic</CODE>
+    *  
+    * @exception JMSException if the JMS provider fails to get the topic for
+    *                         this topic subscriber
+    *                         due to some internal error.
+    */
 
+  Topic getTopic() throws JMSException;
 
-    /** Gets the <CODE>NoLocal</CODE> attribute for this subscriber. 
-      * The default value for this attribute is false.
-      *  
-      * @return true if locally published messages are being inhibited
-      *  
-      * @exception JMSException if the JMS provider fails to get the
-      *                         <CODE>NoLocal</CODE> attribute for
-      *                         this topic subscriber
-      *                         due to some internal error.
-      */ 
+  /** Gets the <CODE>NoLocal</CODE> attribute for this subscriber. 
+    * The default value for this attribute is false.
+    *  
+    * @return true if locally published messages are being inhibited
+    *  
+    * @exception JMSException if the JMS provider fails to get the
+    *                         <CODE>NoLocal</CODE> attribute for
+    *                         this topic subscriber
+    *                         due to some internal error.
+    */
 
-    boolean
-    getNoLocal() throws JMSException;
+  boolean getNoLocal() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TransactionInProgressException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TransactionInProgressException.java
index 010bb58c2b..67d6407c6e 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TransactionInProgressException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TransactionInProgressException.java
@@ -1,61 +1,64 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /**
- * <P> This exception is thrown when an 
- *     operation is invalid because a transaction is in progress. 
- *     For instance, an attempt to call <CODE>Session.commit</CODE> when a 
- *     session is part of a distributed transaction should throw a 
+ * <P> This exception is thrown when an
+ *     operation is invalid because a transaction is in progress.
+ *     For instance, an attempt to call <CODE>Session.commit</CODE> when a
+ *     session is part of a distributed transaction should throw a
  *     <CODE>TransactionInProgressException</CODE>.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class TransactionInProgressException extends JMSException {
+public class TransactionInProgressException extends JMSException
+{
 
-  /** Constructs a <CODE>TransactionInProgressException</CODE> with the 
+  private static final long serialVersionUID = 1L;
+
+  /** Constructs a <CODE>TransactionInProgressException</CODE> with the
    *  specified reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  TransactionInProgressException(String reason, String errorCode) {
+  public TransactionInProgressException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>TransactionInProgressException</CODE> with the 
+  /** Constructs a <CODE>TransactionInProgressException</CODE> with the
    *  specified reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  TransactionInProgressException(String reason) {
+  public TransactionInProgressException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TransactionRolledBackException.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TransactionRolledBackException.java
index d23a9f70a5..cce088b730 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TransactionRolledBackException.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/TransactionRolledBackException.java
@@ -1,59 +1,62 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /**
- * <P> This exception must be thrown when a 
- *     call to <CODE>Session.commit</CODE> results in a rollback of the current 
+ * <P> This exception must be thrown when a
+ *     call to <CODE>Session.commit</CODE> results in a rollback of the current
  *     transaction.
  *
  * @version     26 August 1998
  * @author      Rahul Sharma
  **/
 
-public class TransactionRolledBackException extends JMSException {
+public class TransactionRolledBackException extends JMSException
+{
 
-  /** Constructs a <CODE>TransactionRolledBackException</CODE> with the 
+  private static final long serialVersionUID = 1L;
+
+  /** Constructs a <CODE>TransactionRolledBackException</CODE> with the
    *  specified reason and error code.
    *
    *  @param  reason        a description of the exception
    *  @param  errorCode     a string specifying the vendor-specific
    *                        error code
-   *                        
+   *
    **/
-  public 
-  TransactionRolledBackException(String reason, String errorCode) {
+  public TransactionRolledBackException(String reason, String errorCode)
+  {
     super(reason, errorCode);
   }
 
-  /** Constructs a <CODE>TransactionRolledBackException</CODE> with the 
+  /** Constructs a <CODE>TransactionRolledBackException</CODE> with the
    *  specified reason. The error code defaults to null.
    *
    *  @param  reason        a description of the exception
    **/
-  public 
-  TransactionRolledBackException(String reason) {
+  public TransactionRolledBackException(String reason)
+  {
     super(reason);
   }
 
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java
index cd308aaa4e..34a4019a2d 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnection.java
@@ -1,78 +1,75 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** The <CODE>XAConnection</CODE> interface extends the capability of 
-  * <CODE>Connection</CODE> by providing an <CODE>XASession</CODE> (optional).
-  *
-  *<P>The <CODE>XAConnection</CODE> interface is optional. JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XAQueueConnection
-  * @see         javax.jms.XATopicConnection
-  */
+/** The <CODE>XAConnection</CODE> interface extends the capability of
+ * <CODE>Connection</CODE> by providing an <CODE>XASession</CODE> (optional).
+ *
+ *<P>The <CODE>XAConnection</CODE> interface is optional. JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XAQueueConnection
+ * @see         javax.jms.XATopicConnection
+ */
+
+public interface XAConnection extends Connection
+{
 
-public interface XAConnection extends Connection{
-    
-    /** Creates an <CODE>XASession</CODE> object.
-      *  
-      * @return a newly created <CODE>XASession</CODE>
-      *  
-      * @exception JMSException if the <CODE>XAConnection</CODE> object 
-      *                         fails to create an <CODE>XASession</CODE> due to
-      *                         some internal error.
-      *
-      * @since 1.1
-      */ 
+  /** Creates an <CODE>XASession</CODE> object.
+    *  
+    * @return a newly created <CODE>XASession</CODE>
+    *  
+    * @exception JMSException if the <CODE>XAConnection</CODE> object 
+    *                         fails to create an <CODE>XASession</CODE> due to
+    *                         some internal error.
+    *
+    * @since 1.1
+    */
 
-    XASession
-    createXASession() throws JMSException;
+  XASession createXASession() throws JMSException;
 
-    /** Creates an <CODE>Session</CODE> object.
-      *
-      * @param transacted       usage undefined
-      * @param acknowledgeMode  usage undefined
-      *  
-      * @return a <CODE>Session</CODE> object
-      *  
-      * @exception JMSException if the <CODE>XAConnection</CODE> object 
-      *                         fails to create an <CODE>Session</CODE> due to
-      *                         some internal error.
-      *
-      * @since 1.1
-      */ 
-    Session
-    createSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+  /** Creates an <CODE>Session</CODE> object.
+    *
+    * @param transacted       usage undefined
+    * @param acknowledgeMode  usage undefined
+    *  
+    * @return a <CODE>Session</CODE> object
+    *  
+    * @exception JMSException if the <CODE>XAConnection</CODE> object 
+    *                         fails to create an <CODE>Session</CODE> due to
+    *                         some internal error.
+    *
+    * @since 1.1
+    */
+  Session createSession(boolean transacted, int acknowledgeMode) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java
index bf4dc2393f..ec332ef6af 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAConnectionFactory.java
@@ -1,101 +1,97 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** The <CODE>XAConnectionFactory</CODE> interface is a base interface for the
-  * <CODE>XAQueueConnectionFactory</CODE> and 
-  * <CODE>XATopicConnectionFactory</CODE> interfaces.
-  *
-  * <P>Some application servers provide support for grouping JTS capable 
-  * resource use into a distributed transaction (optional). To include JMS API transactions 
-  * in a JTS transaction, an application server requires a JTS aware JMS
-  * provider. A JMS provider exposes its JTS support using an
-  * <CODE>XAConnectionFactory</CODE> object, which an application server uses 
-  * to create <CODE>XAConnection</CODE> objects.
-  *
-  * <P><CODE>XAConnectionFactory</CODE> objects are JMS administered objects, 
-  * just like <CODE>ConnectionFactory</CODE> objects. It is expected that 
-  * application servers will find them using the Java Naming and Directory
-  * Interface (JNDI) API.
-  *
-  *<P>The <CODE>XAConnectionFactory</CODE> interface is optional. JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 April 4, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XAQueueConnectionFactory
-  * @see         javax.jms.XATopicConnectionFactory
-  */
+ * <CODE>XAQueueConnectionFactory</CODE> and
+ * <CODE>XATopicConnectionFactory</CODE> interfaces.
+ *
+ * <P>Some application servers provide support for grouping JTS capable
+ * resource use into a distributed transaction (optional). To include JMS API transactions
+ * in a JTS transaction, an application server requires a JTS aware JMS
+ * provider. A JMS provider exposes its JTS support using an
+ * <CODE>XAConnectionFactory</CODE> object, which an application server uses
+ * to create <CODE>XAConnection</CODE> objects.
+ *
+ * <P><CODE>XAConnectionFactory</CODE> objects are JMS administered objects,
+ * just like <CODE>ConnectionFactory</CODE> objects. It is expected that
+ * application servers will find them using the Java Naming and Directory
+ * Interface (JNDI) API.
+ *
+ *<P>The <CODE>XAConnectionFactory</CODE> interface is optional. JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 April 4, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XAQueueConnectionFactory
+ * @see         javax.jms.XATopicConnectionFactory
+ */
 
-public interface XAConnectionFactory {
-    
-     /** Creates an <CODE>XAConnection</CODE> with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created <CODE>XAConnection</CODE>
-      *
-      * @exception JMSException if the JMS provider fails to create an XA  
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      * 
-      * @since 1.1 
-      */ 
+public interface XAConnectionFactory
+{
 
-    XAConnection
-    createXAConnection() throws JMSException;
+  /** Creates an <CODE>XAConnection</CODE> with the default user identity.
+   * The connection is created in stopped mode. No messages 
+   * will be delivered until the <code>Connection.start</code> method
+   * is explicitly called.
+   *
+   * @return a newly created <CODE>XAConnection</CODE>
+   *
+   * @exception JMSException if the JMS provider fails to create an XA  
+   *                         connection due to some internal error.
+   * @exception JMSSecurityException  if client authentication fails due to 
+   *                         an invalid user name or password.
+   * 
+   * @since 1.1 
+   */
 
+  XAConnection createXAConnection() throws JMSException;
 
-    /** Creates an XA  connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created XA connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA  
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      *
-      * @since 1.1 
-      */ 
+  /** Creates an XA  connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created XA connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA  
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    *
+    * @since 1.1 
+    */
 
-    XAConnection
-    createXAConnection(String userName, String password) 
-					     throws JMSException;
+  XAConnection createXAConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java
index 691c7fdd46..b6e485272d 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnection.java
@@ -1,75 +1,72 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
-/** An <CODE>XAQueueConnection</CODE> provides the same create options as 
-  * <CODE>QueueConnection</CODE> (optional).  
-  * The only difference is that an <CODE>XAConnection</CODE> is by definition 
-  * transacted.
-  *
-  *<P>The <CODE>XAQueueConnection</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2 - 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XAConnection
-  */
+/** An <CODE>XAQueueConnection</CODE> provides the same create options as
+ * <CODE>QueueConnection</CODE> (optional).
+ * The only difference is that an <CODE>XAConnection</CODE> is by definition
+ * transacted.
+ *
+ *<P>The <CODE>XAQueueConnection</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2 - 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XAConnection
+ */
 
-public interface XAQueueConnection 
-	extends XAConnection, QueueConnection {
+public interface XAQueueConnection extends XAConnection, QueueConnection
+{
 
-    /** Creates an <CODE>XAQueueSession</CODE> object.
-      *  
-      * @return a newly created <CODE>XAQueueSession</CODE>
-      *  
-      * @exception JMSException if the <CODE>XAQueueConnection</CODE> object 
-      *                         fails to create an XA queue session due to some
-      *                         internal error.
-      */ 
+  /** Creates an <CODE>XAQueueSession</CODE> object.
+    *  
+    * @return a newly created <CODE>XAQueueSession</CODE>
+    *  
+    * @exception JMSException if the <CODE>XAQueueConnection</CODE> object 
+    *                         fails to create an XA queue session due to some
+    *                         internal error.
+    */
 
-    XAQueueSession
-    createXAQueueSession() throws JMSException;
+  XAQueueSession createXAQueueSession() throws JMSException;
 
-    /** Creates an <CODE>XAQueueSession</CODE> object.
-      *
-      * @param transacted       usage undefined
-      * @param acknowledgeMode  usage undefined
-      *  
-      * @return a newly created <CODE>XAQueueSession</CODE>
-      *  
-      * @exception JMSException if the <CODE>XAQueueConnection</CODE> object 
-      *                         fails to create an XA queue session due to some
-      *                         internal error.
-      */ 
-    QueueSession
-    createQueueSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+  /** Creates an <CODE>XAQueueSession</CODE> object.
+    *
+    * @param transacted       usage undefined
+    * @param acknowledgeMode  usage undefined
+    *  
+    * @return a newly created <CODE>XAQueueSession</CODE>
+    *  
+    * @exception JMSException if the <CODE>XAQueueConnection</CODE> object 
+    *                         fails to create an XA queue session due to some
+    *                         internal error.
+    */
+  QueueSession createQueueSession(boolean transacted, int acknowledgeMode) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java
index 5978e54d12..d7fe335724 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueConnectionFactory.java
@@ -1,85 +1,80 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** An <CODE>XAQueueConnectionFactory</CODE> provides the same create options as
-  * a <CODE>QueueConnectionFactory</CODE> (optional).
-  *
-  * <P>The <CODE>XATopicConnectionFactory</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 - 8 April 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.QueueConnectionFactory
-  * @see         javax.jms.XAConnectionFactory
-  */
-
-public interface XAQueueConnectionFactory 
-       extends XAConnectionFactory, QueueConnectionFactory {
+ * a <CODE>QueueConnectionFactory</CODE> (optional).
+ *
+ * <P>The <CODE>XATopicConnectionFactory</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 - 8 April 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.QueueConnectionFactory
+ * @see         javax.jms.XAConnectionFactory
+ */
 
-    /** Creates an XA queue connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created XA queue connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA queue 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-       */ 
+public interface XAQueueConnectionFactory extends XAConnectionFactory, QueueConnectionFactory
+{
 
-    XAQueueConnection
-    createXAQueueConnection() throws JMSException;
+  /** Creates an XA queue connection with the default user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *
+    * @return a newly created XA queue connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA queue 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+     */
 
+  XAQueueConnection createXAQueueConnection() throws JMSException;
 
-    /** Creates an XA queue connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created XA queue connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA queue 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+  /** Creates an XA queue connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created XA queue connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA queue 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
-    XAQueueConnection
-    createXAQueueConnection(String userName, String password) 
-					     throws JMSException;
+  XAQueueConnection createXAQueueConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java
index d524162a6a..e35dbf679d 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XAQueueSession.java
@@ -1,58 +1,57 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
 /** An <CODE>XAQueueSession</CODE> provides a regular <CODE>QueueSession</CODE>,
-  * which can be used to
-  * create <CODE>QueueReceiver</CODE>, <CODE>QueueSender</CODE>, and 
-  *<CODE>QueueBrowser</CODE> objects (optional).
-  *
-  * <P>The <CODE>XAQueueSession</CODE> interface is optional. JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
+ * which can be used to
+ * create <CODE>QueueReceiver</CODE>, <CODE>QueueSender</CODE>, and
+ *<CODE>QueueBrowser</CODE> objects (optional).
  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XASession
-  */
+ * <P>The <CODE>XAQueueSession</CODE> interface is optional. JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XASession
+ */
+
+public interface XAQueueSession extends XASession
+{
 
-public interface XAQueueSession extends XASession {
+  /** Gets the queue session associated with this <CODE>XAQueueSession</CODE>.
+    *  
+    * @return the queue session object
+    *  
+    * @exception JMSException if an internal error occurs.
+    */
 
-    /** Gets the queue session associated with this <CODE>XAQueueSession</CODE>.
-      *  
-      * @return the queue session object
-      *  
-      * @exception JMSException if an internal error occurs.
-      */ 
- 
-    QueueSession
-    getQueueSession() throws JMSException;
+  QueueSession getQueueSession() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java
index 31689cf49c..38679b627e 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XASession.java
@@ -1,23 +1,23 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
@@ -25,99 +25,93 @@ package javax.jms;
 
 import javax.transaction.xa.XAResource;
 
-/** The <CODE>XASession</CODE> interface extends the capability of 
-  * <CODE>Session</CODE> by adding access to a JMS provider's support for the
-  * Java Transaction API (JTA) (optional). This support takes the form of a 
-  * <CODE>javax.transaction.xa.XAResource</CODE> object. The functionality of 
-  * this object closely resembles that defined by the standard X/Open XA 
-  * Resource interface.
-  *
-  * <P>An application server controls the transactional assignment of an 
-  * <CODE>XASession</CODE> by obtaining its <CODE>XAResource</CODE>. It uses 
-  * the <CODE>XAResource</CODE> to assign the session to a transaction, prepare 
-  * and commit work on the transaction, and so on.
-  *
-  * <P>An <CODE>XAResource</CODE> provides some fairly sophisticated facilities 
-  * for interleaving work on multiple transactions, recovering a list of 
-  * transactions in progress, and so on. A JTA aware JMS provider must fully 
-  * implement this functionality. This could be done by using the services 
-  * of a database that supports XA, or a JMS provider may choose to implement 
-  * this functionality from scratch.
-  *
-  * <P>A client of the application server is given what it thinks is a 
-  * regular JMS <CODE>Session</CODE>. Behind the scenes, the application server 
-  * controls the transaction management of the underlying 
-  * <CODE>XASession</CODE>.
-  *
-  * <P>The <CODE>XASession</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.Session
-  */ 
- 
-public interface XASession extends Session {
+/** The <CODE>XASession</CODE> interface extends the capability of
+ * <CODE>Session</CODE> by adding access to a JMS provider's support for the
+ * Java Transaction API (JTA) (optional). This support takes the form of a
+ * <CODE>javax.transaction.xa.XAResource</CODE> object. The functionality of
+ * this object closely resembles that defined by the standard X/Open XA
+ * Resource interface.
+ *
+ * <P>An application server controls the transactional assignment of an
+ * <CODE>XASession</CODE> by obtaining its <CODE>XAResource</CODE>. It uses
+ * the <CODE>XAResource</CODE> to assign the session to a transaction, prepare
+ * and commit work on the transaction, and so on.
+ *
+ * <P>An <CODE>XAResource</CODE> provides some fairly sophisticated facilities
+ * for interleaving work on multiple transactions, recovering a list of
+ * transactions in progress, and so on. A JTA aware JMS provider must fully
+ * implement this functionality. This could be done by using the services
+ * of a database that supports XA, or a JMS provider may choose to implement
+ * this functionality from scratch.
+ *
+ * <P>A client of the application server is given what it thinks is a
+ * regular JMS <CODE>Session</CODE>. Behind the scenes, the application server
+ * controls the transaction management of the underlying
+ * <CODE>XASession</CODE>.
+ *
+ * <P>The <CODE>XASession</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.Session
+ */
+
+public interface XASession extends Session
+{
 
-   /** Gets the session associated with this <CODE>XASession</CODE>.
-      *  
-      * @return the  session object
-      *  
-      * @exception JMSException if an internal error occurs.
-      *
-      * @since 1.1
-      */ 
- 
-        Session
-        getSession() throws JMSException;
-  
-    /** Returns an XA resource to the caller.
-      *
-      * @return an XA resource to the caller
-      */
+  /** Gets the session associated with this <CODE>XASession</CODE>.
+     *  
+     * @return the  session object
+     *  
+     * @exception JMSException if an internal error occurs.
+     *
+     * @since 1.1
+     */
 
-     XAResource
-     getXAResource();
+  Session getSession() throws JMSException;
 
-    /** Indicates whether the session is in transacted mode.
-      *  
-      * @return true
-      *  
-      * @exception JMSException if the JMS provider fails to return the 
-      *                         transaction mode due to some internal error.
-      */ 
+  /** Returns an XA resource to the caller.
+    *
+    * @return an XA resource to the caller
+    */
 
-    boolean
-    getTransacted() throws JMSException;
+  XAResource getXAResource();
 
+  /** Indicates whether the session is in transacted mode.
+    *  
+    * @return true
+    *  
+    * @exception JMSException if the JMS provider fails to return the 
+    *                         transaction mode due to some internal error.
+    */
 
-    /** Throws a <CODE>TransactionInProgressException</CODE>, since it should 
-      * not be called for an <CODE>XASession</CODE> object.
-      *
-      * @exception TransactionInProgressException if the method is called on 
-      *                         an <CODE>XASession</CODE>.
-      *                                     
-      */
+  boolean getTransacted() throws JMSException;
 
-    void
-    commit() throws JMSException;
+  /** Throws a <CODE>TransactionInProgressException</CODE>, since it should 
+    * not be called for an <CODE>XASession</CODE> object.
+    *
+    * @exception TransactionInProgressException if the method is called on 
+    *                         an <CODE>XASession</CODE>.
+    *                                     
+    */
 
+  void commit() throws JMSException;
 
-    /** Throws a <CODE>TransactionInProgressException</CODE>, since it should 
-      * not be called for an <CODE>XASession</CODE> object.
-      *
-      * @exception TransactionInProgressException if the method is called on 
-      *                         an <CODE>XASession</CODE>.
-      *                                     
-      */
+  /** Throws a <CODE>TransactionInProgressException</CODE>, since it should 
+    * not be called for an <CODE>XASession</CODE> object.
+    *
+    * @exception TransactionInProgressException if the method is called on 
+    *                         an <CODE>XASession</CODE>.
+    *                                     
+    */
 
-    void
-    rollback() throws JMSException;
+  void rollback() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java
index 5f6b218fff..e05efb13f7 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnection.java
@@ -1,76 +1,72 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** An <CODE>XATopicConnection</CODE> provides the same create options as 
-  * <CODE>TopicConnection</CODE> (optional). The Topic connections created are
-  * transactional.
-  *
-  * <P>The <CODE>XATopicConnection</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 - February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XAConnection
-  */
+/** An <CODE>XATopicConnection</CODE> provides the same create options as
+ * <CODE>TopicConnection</CODE> (optional). The Topic connections created are
+ * transactional.
+ *
+ * <P>The <CODE>XATopicConnection</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 - February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XAConnection
+ */
 
-public interface XATopicConnection 
-	extends XAConnection, TopicConnection {
+public interface XATopicConnection extends XAConnection, TopicConnection
+{
 
-    /** Creates an <CODE>XATopicSession</CODE> object.
-      *  
-      * @return a newly created XA topic session
-      *  
-      * @exception JMSException if the <CODE>XATopicConnection</CODE> object
-      *                         fails to create an XA topic session due to some 
-      *                         internal error.
-      */ 
+  /** Creates an <CODE>XATopicSession</CODE> object.
+    *  
+    * @return a newly created XA topic session
+    *  
+    * @exception JMSException if the <CODE>XATopicConnection</CODE> object
+    *                         fails to create an XA topic session due to some 
+    *                         internal error.
+    */
 
-    XATopicSession
-    createXATopicSession() throws JMSException;
+  XATopicSession createXATopicSession() throws JMSException;
 
-    /** Creates an <CODE>XATopicSession</CODE> object.
-      *
-      * @param transacted usage undefined
-      * @param acknowledgeMode usage undefined
-      *  
-      * @return a newly created XA topic session
-      *  
-      * @exception JMSException if the <CODE>XATopicConnection</CODE> object
-      *                         fails to create an XA topic session due to some 
-      *                         internal error.
-      */ 
+  /** Creates an <CODE>XATopicSession</CODE> object.
+    *
+    * @param transacted usage undefined
+    * @param acknowledgeMode usage undefined
+    *  
+    * @return a newly created XA topic session
+    *  
+    * @exception JMSException if the <CODE>XATopicConnection</CODE> object
+    *                         fails to create an XA topic session due to some 
+    *                         internal error.
+    */
 
-    TopicSession
-    createTopicSession(boolean transacted,
-                       int acknowledgeMode) throws JMSException;
+  TopicSession createTopicSession(boolean transacted, int acknowledgeMode) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java
index 6f589d1493..3259498fb0 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicConnectionFactory.java
@@ -1,85 +1,80 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
-
 package javax.jms;
 
-/** An <CODE>XATopicConnectionFactory</CODE> provides the same create options as 
-  * a <CODE>TopicConnectionFactory</CODE> (optional).
-  *
-  * <P>The <CODE>XATopicConnectionFactory</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than use these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.TopicConnectionFactory
-  * @see         javax.jms.XAConnectionFactory
-  */
-
-public interface XATopicConnectionFactory 
-	extends XAConnectionFactory, TopicConnectionFactory {
+/** An <CODE>XATopicConnectionFactory</CODE> provides the same create options as
+ * a <CODE>TopicConnectionFactory</CODE> (optional).
+ *
+ * <P>The <CODE>XATopicConnectionFactory</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than use these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.TopicConnectionFactory
+ * @see         javax.jms.XAConnectionFactory
+ */
 
-    /** Creates an XA topic connection with the default user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *
-      * @return a newly created XA topic connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA topic 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+public interface XATopicConnectionFactory extends XAConnectionFactory, TopicConnectionFactory
+{
 
-    XATopicConnection
-    createXATopicConnection() throws JMSException;
+  /** Creates an XA topic connection with the default user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *
+    * @return a newly created XA topic connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA topic 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
+  XATopicConnection createXATopicConnection() throws JMSException;
 
-    /** Creates an XA topic connection with the specified user identity.
-      * The connection is created in stopped mode. No messages 
-      * will be delivered until the <code>Connection.start</code> method
-      * is explicitly called.
-      *  
-      * @param userName the caller's user name
-      * @param password the caller's password
-      *  
-      * @return a newly created XA topic connection
-      *
-      * @exception JMSException if the JMS provider fails to create an XA topic 
-      *                         connection due to some internal error.
-      * @exception JMSSecurityException  if client authentication fails due to 
-      *                         an invalid user name or password.
-      */ 
+  /** Creates an XA topic connection with the specified user identity.
+    * The connection is created in stopped mode. No messages 
+    * will be delivered until the <code>Connection.start</code> method
+    * is explicitly called.
+    *  
+    * @param userName the caller's user name
+    * @param password the caller's password
+    *  
+    * @return a newly created XA topic connection
+    *
+    * @exception JMSException if the JMS provider fails to create an XA topic 
+    *                         connection due to some internal error.
+    * @exception JMSSecurityException  if client authentication fails due to 
+    *                         an invalid user name or password.
+    */
 
-    XATopicConnection
-    createXATopicConnection(String userName, String password) 
-					     throws JMSException;
+  XATopicConnection createXATopicConnection(String userName, String password) throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java
index 091e391438..c395d56d57 100644
--- a/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java
+++ b/plugins/org.eclipse.net4j.jms.api/src/javax/jms/XATopicSession.java
@@ -1,57 +1,57 @@
 /*
- * The contents of this file are subject to the terms 
- * of the Common Development and Distribution License 
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
  * (the License).  You may not use this file except in
  * compliance with the License.
- * 
- * You can obtain a copy of the license at 
+ *
+ * You can obtain a copy of the license at
  * https://glassfish.dev.java.net/public/CDDLv1.0.html or
  * glassfish/bootstrap/legal/CDDLv1.0.txt.
- * See the License for the specific language governing 
+ * See the License for the specific language governing
  * permissions and limitations under the License.
- * 
- * When distributing Covered Code, include this CDDL 
- * Header Notice in each file and include the License file 
- * at glassfish/bootstrap/legal/CDDLv1.0.txt.  
- * If applicable, add the following below the CDDL Header, 
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at glassfish/bootstrap/legal/CDDLv1.0.txt.
+ * If applicable, add the following below the CDDL Header,
  * with the fields enclosed by brackets [] replaced by
- * you own identifying information: 
+ * you own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
- * 
+ *
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
  */
 
 package javax.jms;
 
 /** An <CODE>XATopicSession</CODE> provides a regular <CODE>TopicSession</CODE>.
-  * which can be used to create <CODE>TopicSubscriber</CODE> and 
-  * <CODE>TopicPublisher</CODE> objects (optional).
-  *
-  * <P>The <CODE>XATopicSession</CODE> interface is optional.  JMS providers 
-  * are not required to support this interface. This interface is for 
-  * use by JMS providers to support transactional environments. 
-  * Client programs are strongly encouraged to use the transactional support
-  * available in their environment, rather than using these XA
-  * interfaces directly. 
-  *
-  * @version     1.1 February 2, 2002
-  * @author      Mark Hapner
-  * @author      Rich Burridge
-  * @author      Kate Stout
-  *
-  * @see         javax.jms.XASession
-  * @see         javax.jms.TopicSession
-  */
+ * which can be used to create <CODE>TopicSubscriber</CODE> and
+ * <CODE>TopicPublisher</CODE> objects (optional).
+ *
+ * <P>The <CODE>XATopicSession</CODE> interface is optional.  JMS providers
+ * are not required to support this interface. This interface is for
+ * use by JMS providers to support transactional environments.
+ * Client programs are strongly encouraged to use the transactional support
+ * available in their environment, rather than using these XA
+ * interfaces directly.
+ *
+ * @version     1.1 February 2, 2002
+ * @author      Mark Hapner
+ * @author      Rich Burridge
+ * @author      Kate Stout
+ *
+ * @see         javax.jms.XASession
+ * @see         javax.jms.TopicSession
+ */
+
+public interface XATopicSession extends XASession
+{
 
-public interface XATopicSession extends XASession {
+  /** Gets the topic session associated with this <CODE>XATopicSession</CODE>.
+    *   
+    * @return the topic session object
+    *   
+    * @exception JMSException if an internal error occurs.
+    */
 
-    /** Gets the topic session associated with this <CODE>XATopicSession</CODE>.
-      *   
-      * @return the topic session object
-      *   
-      * @exception JMSException if an internal error occurs.
-      */  
-  
-    TopicSession 
-    getTopicSession() throws JMSException;
+  TopicSession getTopicSession() throws JMSException;
 }
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
index e2ac69a792..e5589bb19d 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.server.jdbc
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.jms.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: javax.jms;version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.server.internal.jdbc.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.server.jdbc;version="4.0.300"
+Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.server.internal.jdbc.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.server.jdbc;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java
index d572c4e18f..d2422821b3 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCStore.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java
index 489baaa349..9d2dc91a96 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
index 9933cb5239..3b0ee5b348 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
@@ -31,13 +31,13 @@ public class JMSSchema
   public static final IDBTable DESTINATIONS = INSTANCE.addTable("destinations"); //$NON-NLS-1$
 
   public static final IDBField DESTINATIONS_NAME = //
-  DESTINATIONS.addField("name", DBType.VARCHAR, 255); //$NON-NLS-1$
+      DESTINATIONS.addField("name", DBType.VARCHAR, 255); //$NON-NLS-1$
 
   public static final IDBField DESTINATIONS_TYPE = //
-  DESTINATIONS.addField("type", DBType.INTEGER); //$NON-NLS-1$
+      DESTINATIONS.addField("type", DBType.INTEGER); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_DESTINATIONS_PK = //
-  DESTINATIONS.addIndex(IDBIndex.Type.PRIMARY_KEY, DESTINATIONS_NAME);
+      DESTINATIONS.addIndex(IDBIndex.Type.PRIMARY_KEY, DESTINATIONS_NAME);
 
   /**
    * DBTable Messages
@@ -45,16 +45,16 @@ public class JMSSchema
   public static final IDBTable MESSAGES = INSTANCE.addTable("messages"); //$NON-NLS-1$
 
   public static final IDBField MESSAGES_ID = //
-  MESSAGES.addField("id", DBType.VARCHAR); //$NON-NLS-1$
+      MESSAGES.addField("id", DBType.VARCHAR); //$NON-NLS-1$
 
   public static final IDBField MESSAGES_DESTINATION = //
-  MESSAGES.addField("destination", DBType.VARCHAR); //$NON-NLS-1$
+      MESSAGES.addField("destination", DBType.VARCHAR); //$NON-NLS-1$
 
   public static final IDBField MESSAGES_PRIORITY = //
-  MESSAGES.addField("priority", DBType.INTEGER); //$NON-NLS-1$
+      MESSAGES.addField("priority", DBType.INTEGER); //$NON-NLS-1$
 
   public static final IDBIndex INDEX_MESSAGES_PK = //
-  MESSAGES.addIndex(IDBIndex.Type.PRIMARY_KEY, MESSAGES_ID);
+      MESSAGES.addIndex(IDBIndex.Type.PRIMARY_KEY, MESSAGES_ID);
 
   /**
    * Queries
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
index 17fb21bf16..f63cea203c 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java
index 4056f7f21e..80237afc7b 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/jdbc/JDBCUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
index 11d9a3120c..33844b8959 100644
--- a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms.server
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,10 +12,10 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.jms;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: javax.jms;version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.net4j.jms.internal.server;version="4.0.300";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
- org.eclipse.net4j.jms.internal.server.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.internal.server.messages;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.jms.internal.server.protocol;version="4.0.300";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
- org.eclipse.net4j.jms.internal.server.protocol.admin;version="4.0.300";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
- org.eclipse.net4j.jms.internal.server.store;version="4.0.300";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
- org.eclipse.net4j.jms.server;version="4.0.300"
+Export-Package: org.eclipse.net4j.jms.internal.server;version="4.0.400";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.internal.server.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.internal.server.messages;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.jms.internal.server.protocol;version="4.0.400";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.internal.server.protocol.admin;version="4.0.400";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.internal.server.store;version="4.0.400";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.server;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
index 0ecee99501..aea37c580b 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
@@ -37,7 +37,7 @@ import java.util.concurrent.ConcurrentMap;
 /**
  * @author Eike Stepper
  */
-public class Server extends QueueWorker<MessageImpl> implements IServer
+public class Server extends QueueWorker<MessageImpl>implements IServer
 {
   public static final Server INSTANCE = new Server();
 
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
index e9510c08e3..bd0df1552f 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
index fa0128b35b..80e00ecaf2 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -40,7 +40,8 @@ public class ServerConsumer implements IServerConsumer
 
   private ConcurrentMap<String, MessageImpl> messages = new ConcurrentHashMap<String, MessageImpl>();
 
-  public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal, boolean durable)
+  public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal,
+      boolean durable)
   {
     this.id = id;
     this.destination = destination;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
index 8c14d7cc35..b3f72a7b8e 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
index 91b243bc25..151de418df 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
index 001aa51b43..a9a2aa0a37 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/messages/Messages.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/messages/Messages.java
index 47d3f6c971..ee969cd557 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
index febeb2708b..fe5a1c6ac5 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
index b275c47628..0fadc8741b 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
index dc9bbc0a05..142df75590 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
index 2c1296dd52..f387afdec4 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
index fe5d1f6e1d..004ec58e6e 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
index 983deecf97..71b5cc45af 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
index 0dc12bbdc7..e28d6cb4dd 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
index 3865fd810e..883ff82bb6 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
index 60591a016f..5046288696 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
index 75d4bdbd8a..4b1fb8eb03 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
index 4d0d26b8ab..fa0d9d770c 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
index a3d5954159..b3fcdd01c0 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
index a14be5f340..bfeca720b6 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
index af5925ac51..2ddf206e63 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
index be0c2b0eab..f376ba6999 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java
index 03a9034f42..95c488f6f9 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractStore.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
index fdc725be74..476f29f073 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java
index a36c2c111a..cfeefe5f1d 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPStore.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java
index 27982b10c8..eb5647a85a 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java
index d375271a4f..b30b0756dd 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/StoreException.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java
index d3d96edd67..09e467034b 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IConnection.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java
index dd227bd8dd..493b6a414b 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IDestination.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java
index 7f6b8f1bbe..e931747d3a 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
index 4d16f38859..a828472a2a 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java
index 1f7bd152b2..2de16729a1 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/ISession.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java
index bb42455125..c2edfe8fab 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStore.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
index 02652e4a1c..cbc6f3c83f 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java
index 0af2cd79b8..db5208e28b 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/JMSServerUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
index 1c2493c118..1668b7074f 100644
--- a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.jms.tests
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
 Bundle-Localization: plugin
@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.jms.server.jdbc;bundle-version="[4.0.0,5.0.0)"
 Import-Package: javax.jms;version="[1.1.0,2.0.0)",
  org.eclipse.net4j.db.derby;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.jms.tests;version="4.0.200";x-internal:=true
+Export-Package: org.eclipse.net4j.jms.tests;version="4.0.300";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java
index 491cd02892..e311dab76c 100644
--- a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java
+++ b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java
index 0b768839d5..8abc78ef1c 100644
--- a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java
+++ b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
index 015c53027a..5fd77371d5 100644
--- a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jms
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,9 +12,9 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: javax.jms;version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.net4j.internal.jms;version="4.0.300",
- org.eclipse.net4j.internal.jms.bundle;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.internal.jms.messages;version="4.0.300";x-internal:=true,
- org.eclipse.net4j.internal.jms.protocol;version="4.0.300",
- org.eclipse.net4j.internal.jms.util;version="4.0.300",
- org.eclipse.net4j.jms;version="4.0.300"
+Export-Package: org.eclipse.net4j.internal.jms;version="4.0.400",
+ org.eclipse.net4j.internal.jms.bundle;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.internal.jms.messages;version="4.0.400";x-internal:=true,
+ org.eclipse.net4j.internal.jms.protocol;version="4.0.400",
+ org.eclipse.net4j.internal.jms.util;version="4.0.400",
+ org.eclipse.net4j.jms;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
index be8a4010de..959a692e27 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
index 7f40704a59..40c48b119d 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
index 7c07da06a8..15cd152377 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
@@ -44,7 +44,7 @@ import javax.jms.Topic;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ConnectionImpl extends Container<Session> implements Connection
+public class ConnectionImpl extends Container<Session>implements Connection
 {
   private String connectorType;
 
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
index 86c3dcbc26..f16e16c252 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java
index 16eb20dab4..b5bc816bd0 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/DestinationImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java
index d3abddbd9b..38781fa498 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSDestination.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java
index 20ddc95d29..7995a0c537 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/JMSTemporaryDestination.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
index ac8c67c6cd..521ef37b53 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
index 1f2c994d86..0abc6eab99 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
index 6ede4348cc..c08ada2eac 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -33,7 +33,7 @@ import java.util.Map.Entry;
 public class MessageImpl implements Message, Comparable<MessageImpl>
 {
   private static final String[] KEYWORDS = { "and", "between", "escape", "in", "is", "like", "false", "null", "or", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-      "not", "true" }; //$NON-NLS-1$ //$NON-NLS-2$
+    "not", "true" }; //$NON-NLS-1$ //$NON-NLS-2$
 
   private Map<String, Object> properties = new HashMap<String, Object>();
 
@@ -310,8 +310,8 @@ public class MessageImpl implements Message, Comparable<MessageImpl>
     }
     else
     {
-      throw new MessageFormatException(MessageFormat.format(
-          Messages.getString("MessageImpl_11"), value.getClass().getName())); //$NON-NLS-1$ 
+      throw new MessageFormatException(
+          MessageFormat.format(Messages.getString("MessageImpl_11"), value.getClass().getName())); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java
index ded5ccdc7e..e806abbde7 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/NotYetImplementedException.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
index 81c7b42daa..14fb7aa2d9 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
index fbe03971b5..722cd9534a 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java
index fcb03068ec..1d7d412fce 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java
index 34db7358ea..d48b308126 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueReceiverImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java
index 80a32c9f53..7eec43b40f 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueSenderImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
index 22d7057a41..b172e6b41d 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
@@ -54,7 +54,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Session
+public class SessionImpl extends QueueWorker<MessageConsumerImpl>implements Session
 {
   private ConnectionImpl connection;
 
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
index df4baefa09..479ddc4989 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
index 4c125d0122..4a23b8dad6 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java
index 2c504a593d..d7bbda13c7 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java
index 8a80920794..f9561c00f4 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicPublisherImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -42,8 +42,7 @@ public class TopicPublisherImpl extends MessageProducerImpl implements TopicPubl
     publish(topic, message, getDeliveryMode(), getPriority(), getTimeToLive());
   }
 
-  public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive)
-      throws JMSException
+  public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException
   {
     send(topic, message, deliveryMode, priority, timeToLive);
   }
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
index 5dbb47ef92..f4fcb1f396 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TopicSubscriberImpl.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
index e1fb63300e..fded4b6656 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/messages/Messages.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/messages/Messages.java
index d12570a9c2..5152781077 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/messages/Messages.java
@@ -4,9 +4,9 @@
  * 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:
- *    Victor Roldan Betancort - initial API and implementation 
+ *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
  */
 package org.eclipse.net4j.internal.jms.messages;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java
index 91b03d43aa..24a821635c 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java
index fba208fb60..ae8cbce261 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
index 56515a0ccc..20d27c74c1 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java
index c69cc5a294..43831db624 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java
index 482643a7d9..ee281aabee 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java
index d52ff229dc..8fe85a1ce5 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java
index fa4026b7b6..6be0fd11cf 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java
index 113e1d309b..d042465e74 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java
index e52cb885ec..4fa727328f 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java
index f9219f88db..8c4f069456 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
index e5e4976ed0..2f45b2a097 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java
index ddd2e0e05d..b81cb53c6c 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
index e5b132793b..4d499d3937 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java
index 9a78e79db1..4fa27ae104 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
index a6bc7ba12a..62506ecb70 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
index b1796234d1..7c920550ae 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
index 4f71083c0c..8285baa04a 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java
index f48d5b534c..9fb4db25cc 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSAdminProtocolConstants.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
index ebc21585c9..7d1a18a1d4 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java
index 92b5182f04..f6fe142957 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSProtocolConstants.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
index d8abc83783..6a845bb0de 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java
index 945535bef8..81c90cab03 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -51,7 +51,7 @@ public class JVMAcceptor extends Acceptor implements IJVMAcceptor
   @Override
   public String toString()
   {
-    return MessageFormat.format("JVMAcceptor[{0}]", name); //$NON-NLS-1$ 
+    return MessageFormat.format("JVMAcceptor[{0}]", name); //$NON-NLS-1$
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java
index 83a820f7ca..b39701bbac 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java
index d6f9e2c83b..87e734e80a 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java
index 3e5c31aa90..96056a4e06 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java
index 98b0bd85de..6afa1879d4 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
index 70587b0c11..e62eda3f41 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/messages/Messages.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/messages/Messages.java
index 4b0f740862..4d39ae56e3 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java
index 82f4009f0f..18798cebc4 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import org.eclipse.net4j.acceptor.IAcceptor;
 
 /**
  * An {@link IAcceptor acceptor} that implements JVM-embedded transport.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java
index b4d9bfd74a..443edb891b 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptorManager.java
@@ -4,7 +4,7 @@
  * 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,7 +15,7 @@ import org.eclipse.net4j.util.registry.IRegistry;
 
 /**
  * A singleton that manages all {@link IJVMAcceptor JVM acceptors} in the current JVM.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java
index 12e7eb1591..fa14e06930 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import org.eclipse.net4j.connector.IConnector;
 
 /**
  * A {@link IConnector connector} that implements JVM-embedded transport.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java
index af17e749db..83603137c9 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/JVMUtil.java
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.container.IManagedContainer;
 
 /**
  * A utility class with static convenience methods.
- * 
+ *
  * @author Eike Stepper
  */
 public final class JVMUtil
@@ -38,7 +38,7 @@ public final class JVMUtil
 
   public static IJVMConnector getConnector(IManagedContainer container, String description)
   {
-    return (IJVMConnector)container
-        .getElement(JVMConnectorFactory.PRODUCT_GROUP, JVMConnectorFactory.TYPE, description);
+    return (IJVMConnector)container.getElement(JVMConnectorFactory.PRODUCT_GROUP, JVMConnectorFactory.TYPE,
+        description);
   }
 }
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package-info.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package-info.java
index c3144fca83..3eff2fb7cd 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package-info.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
- * Transport layer extension with support for JVM embedded connections. 
+ * Transport layer extension with support for JVM embedded connections.
  */
 package org.eclipse.net4j.jvm;
-
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
index 3dde429a04..8d190802a0 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
index be1420861d..0ec8e49ccd 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java
index 21d8e4680c..d4363851e6 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorInjector.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
index 93910d9850..450b819711 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/messages/Messages.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/messages/Messages.java
index ccd40688be..e9276e5b1a 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java
index 69dc2fd746..aad5f464bd 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  *    Caspar De Groot (No Magic Asia Ltd.) - initial API and implementation
@@ -28,7 +28,7 @@ import java.nio.channels.SocketChannel;
 /**
  * All source code same as org.eclipse.internal.net4j.buffer.Buffer except adding SSLEngineManager to constructor and
  * overriding startGetting and write method in order to attach the SSL functional.
- * 
+ *
  * @author Teerawat Chaiyakijpichet (No Magic Asia Ltd.)
  * @author Caspar De Groot (No Magic Asia Ltd.)
  * @since 4.0
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBufferFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBufferFactory.java
index c0d95375c2..955c440af9 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBufferFactory.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLBufferFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  *    Caspar De Groot (No Magic Asia Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLClientConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLClientConnector.java
index d8e991b29e..b1a665c5f7 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLClientConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLClientConnector.java
@@ -22,7 +22,7 @@ import java.text.MessageFormat;
 
 /**
  * SSLClientConnector responses to be connector on client side and it handles about connecting to the server connector.
- * 
+ *
  * @author Teerawat Chaiyakijpichet (No Magic Asia Ltd.)
  * @author Caspar De Groot (No Magic Asia Ltd.)
  * @since 4.0
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLConnector.java
index 96736d0423..e401db640a 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLConnector.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  *    Caspar De Groot (No Magic Asia Ltd.) - initial API and implementation
@@ -24,7 +24,7 @@ import java.nio.channels.SocketChannel;
 /**
  * SSLConnector responses to perform tasks same as TCPConnector but it attached the SSL functionality into read and
  * write method.
- * 
+ *
  * @author Teerawat Chaiyakijpichet (No Magic Asia Ltd.)
  * @author Caspar De Groot (No Magic Asia Ltd.)
  * @since 4.0
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLEngineManager.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLEngineManager.java
index 84dcc32147..0e3966ceb7 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLEngineManager.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLEngineManager.java
@@ -280,7 +280,7 @@ public class SSLEngineManager
 
   /**
    * Write the contents of {@link #packetSendBuf} to the given {@link SocketChannel}
-   * 
+   *
    * @return the number of bytes actually written
    */
   public int handleWrite(SocketChannel socketChannel) throws IOException
@@ -310,7 +310,7 @@ public class SSLEngineManager
 
   /**
    * Read the contents from the given {@link SocketChannel} to {@link #packetSendBuf}
-   * 
+   *
    * @return the number of bytes actually read
    */
   public int handleRead(SocketChannel socketChannel) throws IOException
@@ -463,7 +463,7 @@ public class SSLEngineManager
 
   /**
    * A separate class for better monitor debugging.
-   * 
+   *
    * @author Eike Stepper
    */
   private static final class ReadLock
@@ -472,7 +472,7 @@ public class SSLEngineManager
 
   /**
    * A separate class for better monitor debugging.
-   * 
+   *
    * @author Eike Stepper
    */
   private static final class WriteLock
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLProperties.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLProperties.java
index ae07cedef9..607953f078 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLProperties.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLProperties.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  *    Caspar De Groot (No Magic Asia Ltd.) - initial API and implementation
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLServerConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLServerConnector.java
index 441d704fb4..026fe08bee 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLServerConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ssl/SSLServerConnector.java
@@ -20,7 +20,7 @@ import java.text.MessageFormat;
 /**
  * SSLServerConnector responses to be connector on server side and it handles about registration from the
  * SSLClientConnector.
- * 
+ *
  * @author Teerawat Chaiyakijpichet (No Magic Asia Ltd.)
  * @author Caspar De Groot (No Magic Asia Ltd.)
  * @since 4.0
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
index ef4a0e52fe..0ef427dc53 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
@@ -17,7 +17,7 @@ import org.eclipse.net4j.tcp.ssl.SSLUtil;
 /**
  * An {@link IAcceptor acceptor} that implements non-blocking multiplexed TCP transport, optionally with {@link SSLUtil
  * SSL}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPActiveSelectorListener.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPActiveSelectorListener.java
index a606ec596e..b213f89f95 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPActiveSelectorListener.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPActiveSelectorListener.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -17,7 +17,7 @@ import java.nio.channels.SocketChannel;
 /**
  * Call-back that handles the possible calls from a {@link ITCPSelector selector} to an active consumer, usually a
  * {@link IConnector connector}.
- * 
+ *
  * @author Eike Stepper
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java
index 7e252ea529..408a9ca984 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java
@@ -16,7 +16,7 @@ import org.eclipse.net4j.tcp.ssl.SSLUtil;
 /**
  * A {@link IConnector connector} that implements non-blocking multiplexed TCP transport, optionally with
  * {@link SSLUtil SSL}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPNegotiationContext.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPNegotiationContext.java
index 8fe55cf9f7..1eb22cb10e 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPNegotiationContext.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPNegotiationContext.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import org.eclipse.net4j.util.security.INegotiationContext;
 
 /**
  * A {@link INegotiationContext negotiation context} that is used in TCP transport.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java
index dde400390f..e158f2ac16 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPPassiveSelectorListener.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -17,7 +17,7 @@ import java.nio.channels.ServerSocketChannel;
 /**
  * Call-back that handles the possible calls from a {@link ITCPSelector selector} to a passive consumer, usually an
  * {@link IAcceptor acceptor}.
- * 
+ *
  * @author Eike Stepper
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java
index 93d1d3e319..9821f44ee1 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelector.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import java.nio.channels.SocketChannel;
  * Encapsulates a Java {@link Selector socket selector} and orchestrates a number of {@link ITCPActiveSelectorListener
  * active} and {@link ITCPPassiveSelectorListener passive} consumers, usually {@link IConnector connectors} and
  * {@link IAcceptor acceptors} that compete for the socket selector's I/O time.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package-info.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package-info.java
index 5f99981782..ed96fe1818 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package-info.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
- * Transport layer extension with support for TCP socket connections. 
+ * Transport layer extension with support for TCP socket connections.
  */
 package org.eclipse.net4j.tcp;
-
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java
index f59c6c3362..baa1904c51 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/SSLUtil.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  *    Caspar De Groot (No Magic Asia Ltd.) - initial API and implementation
@@ -40,7 +40,7 @@ import java.util.Enumeration;
 
 /**
  * A utility class with various static factory and convenience methods for SSL transport.
- * 
+ *
  * @author Teerawat Chaiyakijpichet (No Magic Asia Ltd.)
  * @author Caspar De Groot (No Magic Asia Ltd.)
  * @since 4.0
@@ -112,8 +112,8 @@ public class SSLUtil
 
   public static synchronized ITCPConnector getConnector(IManagedContainer container, String description)
   {
-    return (ITCPConnector)container
-        .getElement(TCPConnectorFactory.PRODUCT_GROUP, SSLConnectorFactory.TYPE, description);
+    return (ITCPConnector)container.getElement(TCPConnectorFactory.PRODUCT_GROUP, SSLConnectorFactory.TYPE,
+        description);
   }
 
   public static synchronized SSLEngine createSSLEngine(boolean client, String host, int port) throws Exception
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package-info.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package-info.java
index aaf20fb486..a83faa4f21 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package-info.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
- * Transport layer extension with support for TCP/SSL socket connections. 
+ * Transport layer extension with support for TCP/SSL socket connections.
  */
 package org.eclipse.net4j.tcp.ssl;
-
diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
index 1f87aee157..58c0b74a24 100644
--- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.tests;singleton:=true
-Bundle-Version: 4.1.200.qualifier
+Bundle-Version: 4.1.300.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -17,13 +17,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili
  org.eclipse.net4j.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.util.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.tests;version="4.1.200",
- org.eclipse.net4j.tests.apps;version="4.1.200",
- org.eclipse.net4j.tests.bugzilla;version="4.1.200",
- org.eclipse.net4j.tests.bundle;version="4.1.200";x-internal:=true,
- org.eclipse.net4j.tests.data;version="4.1.200",
- org.eclipse.net4j.tests.defs;version="4.1.200",
- org.eclipse.net4j.tests.signal;version="4.1.200",
+Export-Package: org.eclipse.net4j.tests;version="4.1.300",
+ org.eclipse.net4j.tests.apps;version="4.1.300",
+ org.eclipse.net4j.tests.bugzilla;version="4.1.300",
+ org.eclipse.net4j.tests.bundle;version="4.1.300";x-internal:=true,
+ org.eclipse.net4j.tests.data;version="4.1.300",
+ org.eclipse.net4j.tests.defs;version="4.1.300",
+ org.eclipse.net4j.tests.signal;version="4.1.300",
  org.eclipse.net4j.util.tests;version="4.1.0",
  org.eclipse.net4j.util.tests.cache;version="4.1.0",
  org.eclipse.net4j.util.tests.defs;version="4.1.0",
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractProtocolTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractProtocolTest.java
index 39e6e5f074..f0fb0a4110 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractProtocolTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractProtocolTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
index 866d5f9c94..1f6c6f2740 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java
@@ -4,7 +4,7 @@
  * 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
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - SSL
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllSSLTests.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllSSLTests.java
index 10bfa39381..2e5ec4be35 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllSSLTests.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllSSLTests.java
@@ -4,7 +4,7 @@
  * 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:
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - initial API and implementation
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
index 85a959c2b1..f854fabb96 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
@@ -139,22 +139,22 @@ public abstract class ChannelTest extends AbstractProtocolTest
     for (int i = 0; i < THREADS; i++)
     {
       threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) //$NON-NLS-1$
+      {
+        @Override
+        protected void doRun() throws Exception
+        {
+          for (int i = 0; i < 100; i++)
           {
-            @Override
-            protected void doRun() throws Exception
-            {
-              for (int i = 0; i < 100; i++)
-              {
-                IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$
-                TestSignalProtocol protocol = openTestSignalProtocol();
-                assertActive(protocol);
-
-                protocol.close();
-                assertInactive(protocol);
-                heartBeat();
-              }
-            }
-          });
+            IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$
+            TestSignalProtocol protocol = openTestSignalProtocol();
+            assertActive(protocol);
+
+            protocol.close();
+            assertInactive(protocol);
+            heartBeat();
+          }
+        }
+      });
     }
 
     disableConsole();
@@ -169,28 +169,28 @@ public abstract class ChannelTest extends AbstractProtocolTest
     for (int i = 0; i < THREADS; i++)
     {
       threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) //$NON-NLS-1$
+      {
+        @Override
+        protected void doRun() throws Exception
+        {
+          for (int i = 0; i < 100; i++)
           {
-            @Override
-            protected void doRun() throws Exception
-            {
-              for (int i = 0; i < 100; i++)
-              {
-                IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$
-                TestSignalProtocol protocol = openTestSignalProtocol();
-                assertActive(protocol);
-                heartBeat();
-
-                byte[] data = TinyData.getBytes();
-                byte[] result = new ArrayRequest(protocol, data).send();
-                assertEquals(true, Arrays.equals(data, result));
-                heartBeat();
-
-                protocol.close();
-                assertInactive(protocol);
-                heartBeat();
-              }
-            }
-          });
+            IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$
+            TestSignalProtocol protocol = openTestSignalProtocol();
+            assertActive(protocol);
+            heartBeat();
+
+            byte[] data = TinyData.getBytes();
+            byte[] result = new ArrayRequest(protocol, data).send();
+            assertEquals(true, Arrays.equals(data, result));
+            heartBeat();
+
+            protocol.close();
+            assertInactive(protocol);
+            heartBeat();
+          }
+        }
+      });
     }
 
     disableConsole();
@@ -204,33 +204,33 @@ public abstract class ChannelTest extends AbstractProtocolTest
     for (int i = 0; i < THREADS; i++)
     {
       threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) //$NON-NLS-1$
+      {
+        @Override
+        protected void doRun() throws Exception
+        {
+          for (int i = 0; i < 10; i++)
           {
-            @Override
-            protected void doRun() throws Exception
+            long start = System.currentTimeMillis();
+            TestSignalProtocol protocol = openTestSignalProtocol();
+            assertActive(protocol);
+
+            for (int j = 0; j < 50; j++)
             {
-              for (int i = 0; i < 10; i++)
-              {
-                long start = System.currentTimeMillis();
-                TestSignalProtocol protocol = openTestSignalProtocol();
-                assertActive(protocol);
-
-                for (int j = 0; j < 50; j++)
-                {
-                  byte[] data = TinyData.getBytes();
-                  byte[] result = new ArrayRequest(protocol, data).send();
-                  assertEquals(true, Arrays.equals(data, result));
-
-                  heartBeat();
-                  ConcurrencyUtil.sleep(10L);
-                }
-
-                protocol.close();
-                assertInactive(protocol);
-                long stop = System.currentTimeMillis();
-                IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i + " (" + (stop - start) + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-              }
+              byte[] data = TinyData.getBytes();
+              byte[] result = new ArrayRequest(protocol, data).send();
+              assertEquals(true, Arrays.equals(data, result));
+
+              heartBeat();
+              ConcurrencyUtil.sleep(10L);
             }
-          });
+
+            protocol.close();
+            assertInactive(protocol);
+            long stop = System.currentTimeMillis();
+            IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i + " (" + (stop - start) + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+          }
+        }
+      });
     }
 
     disableConsole();
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SelectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SelectorTest.java
index 49bf55388f..c1be172527 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SelectorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SelectorTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java
index 0c55b65c81..412fdec69b 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java
@@ -4,7 +4,7 @@
  * 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
  *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - SSL
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
index d717f70515..b08c99f304 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Eike Stepper - initial API and implementation
- *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - SSL    
+ *    Teerawat Chaiyakijpichet (No Magic Asia Ltd.) - SSL
  */
 package org.eclipse.net4j.tests;
 
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/apps/Performance.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/apps/Performance.java
index b0259c1481..db882fd812 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/apps/Performance.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/apps/Performance.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/apps/TCPConnectivityLoss.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/apps/TCPConnectivityLoss.java
index 9cbf1fb808..5ea9f5c9b7 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/apps/TCPConnectivityLoss.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/apps/TCPConnectivityLoss.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_262875_Test.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_262875_Test.java
index 19aa002f0f..6240972d9d 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_262875_Test.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_262875_Test.java
@@ -71,7 +71,7 @@ public class Bugzilla_262875_Test extends AbstractOMTest
   /**
    * Tests if a buffer underflow exception occurs if the data sent in a request exactly matches the capacity of a
    * buffer.
-   * 
+   *
    * @throws Exception
    *           the exception
    */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/OM.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/OM.java
index 2f0c4aacb8..5cb441ed2a 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/data/HugeData.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/data/HugeData.java
index 242473ced0..1bacaace30 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/data/HugeData.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/data/HugeData.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/data/TinyData.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/data/TinyData.java
index 13f458ed23..063ffa7d4f 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/data/TinyData.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/data/TinyData.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/Util.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/Util.java
index 19c47f123e..f235cc23f3 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/Util.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/Util.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java
index 218e498d94..b05dde7ac2 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java
index 64341b1dc8..12eef17eb5 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java
index 243a9948fe..780e2c33e4 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java
index 203e37b005..a0010b3b41 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionIndication.java
index 37fbb4c325..53582c4e05 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionIndication.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionRequest.java
index e6abb3a718..e5dc147fc5 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionRequest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ExceptionRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java
index 4685514d4d..272de6e005 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java
index cffd5763d1..2b4a3525dc 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java
index 2424c5a732..9d0f609486 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java
index 7fffdb2562..ed6b94c25b 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java
index c0d6bcc993..885548a45d 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java
index 795ce05196..90287f454d 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
index 276a8b2aba..7bb4b276b7 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java
@@ -552,8 +552,8 @@ public abstract class AbstractOMTest extends TestCase
   {
     if (!Arrays.deepEquals(expected, actual))
     {
-      throw new AssertionFailedError("expected:" + Arrays.deepToString(expected) + " but was:"
-          + Arrays.deepToString(actual));
+      throw new AssertionFailedError(
+          "expected:" + Arrays.deepToString(expected) + " but was:" + Arrays.deepToString(actual));
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java
index 0001f08aa9..f068635712 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java
@@ -20,7 +20,7 @@ import java.util.concurrent.Future;
 /**
  * A class that implements a concurrent execution environment for runnables. It waits until all runnables submitted for
  * execution are terminated and returns the first throwable that occurs
- * 
+ *
  * @author Andre Dietisheim
  */
 public class ConcurrentRunner
@@ -28,7 +28,7 @@ public class ConcurrentRunner
   /**
    * Executes Runnables in concurrent manner. The first Throwable thrown by those runnables is thrown back to the
    * caller.
-   * 
+   *
    * @param runnables
    *          the runnables to execute
    * @param maxThreads
@@ -47,7 +47,7 @@ public class ConcurrentRunner
 
   /**
    * Executes the runnables. The runnables are wrapped in Callables when they're submitted to the thread pool.
-   * 
+   *
    * @param loops
    *          the loops
    * @param threadPool
@@ -73,7 +73,7 @@ public class ConcurrentRunner
 
   /**
    * Throw a throwable if it occured while executing the runnables
-   * 
+   *
    * @param futures
    *          the futures
    * @param threadPool
@@ -108,7 +108,7 @@ public class ConcurrentRunner
 
     /**
      * Instantiates a new concurrent test case.
-     * 
+     *
      * @param runnable
      *          the runnable
      */
@@ -119,7 +119,7 @@ public class ConcurrentRunner
 
     /**
      * Call.
-     * 
+     *
      * @return the throwable
      * @throws Exception
      *           the exception
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
index ba4c5d7760..9f3c81ccc7 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
index 0837a5712a..7238dedcea 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java
index 9bb7ff7f9c..9fdf58c019 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java
index 503e6a5159..f02d467571 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
index a965c552e5..92b7a49d17 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java
index 1f8aa1e58d..e2be2fb5e8 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -46,20 +46,20 @@ public class UTFTest extends AbstractOMTest
   public void testUTF8_ThreeOctets() throws Exception
   {
     final int MAX = UNSIGNED_SHORT_MAX >> 1;
-    StringBuilder builder = new StringBuilder();
-    for (int i = 0; i < MAX; i++)
-    {
-      builder.append("\u6771"); //$NON-NLS-1$
-    }
+  StringBuilder builder = new StringBuilder();
+  for (int i = 0; i < MAX; i++)
+  {
+    builder.append("\u6771"); //$NON-NLS-1$
+  }
 
-    String str = builder.toString();
-    assertEquals(MAX, str.length());
+  String str = builder.toString();
+  assertEquals(MAX, str.length());
 
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    DataOutputStream dos = new DataOutputStream(baos);
-    dos.writeUTF(str);
+  ByteArrayOutputStream baos = new ByteArrayOutputStream();
+  DataOutputStream dos = new DataOutputStream(baos);
+  dos.writeUTF(str);
 
-    String received = baos.toString("UTF-8"); //$NON-NLS-1$
-    assertEquals(str, received);
+  String received = baos.toString("UTF-8"); //$NON-NLS-1$
+  assertEquals(str, received);
   }
 }
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java
index f81f929b86..ead5fb9871 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/CacheTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/CacheTest.java
index 61f57bb685..85b7995f04 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/CacheTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/CacheTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java
index 29f9221a2c..cbdfc6712c 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java
index 9f3e1c9625..c9a68a31a6 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java
index 3d830ff9f0..f4b0ea46e9 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsFactory.java
index 7d91f7063b..520d50aec0 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsFactory.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.util.tests.defs.DefsPackage
  * @generated
  */
@@ -24,14 +24,14 @@ public interface DefsFactory extends EFactory
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   DefsFactory eINSTANCE = org.eclipse.net4j.util.tests.defs.impl.DefsFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Test Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Test Def</em>'.
    * @generated
    */
@@ -39,7 +39,7 @@ public interface DefsFactory extends EFactory
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java
index 8dfca0bf4c..7b6659ebf4 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.util.tests.defs.DefsFactory
  * @model kind="package"
  * @generated
@@ -36,28 +36,28 @@ public interface DefsPackage extends EPackage
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNAME = "defs"; //$NON-NLS-1$
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/NET4J/defs/tests/1.0.0"; //$NON-NLS-1$
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_PREFIX = "net4j.defs.tests"; //$NON-NLS-1$
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   DefsPackage eINSTANCE = org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl.init();
@@ -65,7 +65,7 @@ public interface DefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl <em>Test Def</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.net4j.util.tests.defs.impl.TestDefImpl
    * @see org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl#getTestDef()
    * @generated
@@ -74,7 +74,7 @@ public interface DefsPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>References</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -82,7 +82,7 @@ public interface DefsPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Attribute</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -90,7 +90,7 @@ public interface DefsPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Test Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -99,7 +99,7 @@ public interface DefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.util.tests.defs.TestDef <em>Test Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Test Def</em>'.
    * @see org.eclipse.net4j.util.tests.defs.TestDef
    * @generated
@@ -109,7 +109,7 @@ public interface DefsPackage extends EPackage
   /**
    * Returns the meta object for the reference list '{@link org.eclipse.net4j.util.tests.defs.TestDef#getReferences
    * <em>References</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>References</em>'.
    * @see org.eclipse.net4j.util.tests.defs.TestDef#getReferences()
    * @see #getTestDef()
@@ -120,7 +120,7 @@ public interface DefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute
    * <em>Attribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Attribute</em>'.
    * @see org.eclipse.net4j.util.tests.defs.TestDef#getAttribute()
    * @see #getTestDef()
@@ -130,7 +130,7 @@ public interface DefsPackage extends EPackage
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -145,7 +145,7 @@ public interface DefsPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   interface Literals
@@ -153,7 +153,7 @@ public interface DefsPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl <em>Test Def</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.net4j.util.tests.defs.impl.TestDefImpl
      * @see org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl#getTestDef()
      * @generated
@@ -163,7 +163,7 @@ public interface DefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>References</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference TEST_DEF__REFERENCES = eINSTANCE.getTestDef_References();
@@ -171,7 +171,7 @@ public interface DefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Attribute</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute TEST_DEF__ATTRIBUTE = eINSTANCE.getTestDef_Attribute();
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java
index 5c704e81bf..ea27280090 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -24,7 +24,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage#getTestDef()
  * @model
  * @generated
@@ -39,7 +39,7 @@ public interface TestDef extends Def
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>References</em>' reference list.
    * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage#getTestDef_References()
    * @model
@@ -54,7 +54,7 @@ public interface TestDef extends Def
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Attribute</em>' attribute.
    * @see #setAttribute(String)
    * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage#getTestDef_Attribute()
@@ -66,7 +66,7 @@ public interface TestDef extends Def
   /**
    * Sets the value of the '{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}'
    * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Attribute</em>' attribute.
    * @see #getAttribute()
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java
index 0b1bff9e43..80d8e7c2da 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java
@@ -198,7 +198,7 @@ public class TestDefTest extends AbstractOMTest
     /**
      * (Blocking) Wait for deactivation. The deactivation is triggered in a separate thread. This method allows you
      * blocking wait for deactivation
-     * 
+     *
      * @throws InterruptedException
      *           the interrupted exception
      */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsFactory.java
index 1d25f6b583..586110659c 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsFactory.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage
  * @generated
  */
@@ -24,14 +24,14 @@ public interface TestDefsFactory extends EFactory
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   TestDefsFactory eINSTANCE = org.eclipse.net4j.util.tests.defs.impl.TestDefsFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Test Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Test Def</em>'.
    * @generated
    */
@@ -39,7 +39,7 @@ public interface TestDefsFactory extends EFactory
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java
index b7879157b3..e033786968 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.util.tests.defs.TestDefsFactory
  * @model kind="package"
  * @generated
@@ -36,28 +36,28 @@ public interface TestDefsPackage extends EPackage
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNAME = "defs"; //$NON-NLS-1$
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/NET4J/defs/tests/1.0.0"; //$NON-NLS-1$
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_PREFIX = "net4j.defs.tests"; //$NON-NLS-1$
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   TestDefsPackage eINSTANCE = org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl.init();
@@ -65,7 +65,7 @@ public interface TestDefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl <em>Test Def</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.net4j.util.tests.defs.impl.TestDefImpl
    * @see org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl#getTestDef()
    * @generated
@@ -74,7 +74,7 @@ public interface TestDefsPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>References</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -82,7 +82,7 @@ public interface TestDefsPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Attribute</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -90,7 +90,7 @@ public interface TestDefsPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Test Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -99,7 +99,7 @@ public interface TestDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.util.tests.defs.TestDef <em>Test Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Test Def</em>'.
    * @see org.eclipse.net4j.util.tests.defs.TestDef
    * @generated
@@ -109,7 +109,7 @@ public interface TestDefsPackage extends EPackage
   /**
    * Returns the meta object for the reference list '{@link org.eclipse.net4j.util.tests.defs.TestDef#getReferences
    * <em>References</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>References</em>'.
    * @see org.eclipse.net4j.util.tests.defs.TestDef#getReferences()
    * @see #getTestDef()
@@ -120,7 +120,7 @@ public interface TestDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute
    * <em>Attribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Attribute</em>'.
    * @see org.eclipse.net4j.util.tests.defs.TestDef#getAttribute()
    * @see #getTestDef()
@@ -130,7 +130,7 @@ public interface TestDefsPackage extends EPackage
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -145,7 +145,7 @@ public interface TestDefsPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   interface Literals
@@ -153,7 +153,7 @@ public interface TestDefsPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl <em>Test Def</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.net4j.util.tests.defs.impl.TestDefImpl
      * @see org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl#getTestDef()
      * @generated
@@ -163,7 +163,7 @@ public interface TestDefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>References</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference TEST_DEF__REFERENCES = eINSTANCE.getTestDef_References();
@@ -171,7 +171,7 @@ public interface TestDefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Attribute</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute TEST_DEF__ATTRIBUTE = eINSTANCE.getTestDef_Attribute();
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java
index a1334b6341..1c73ac8e77 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -23,14 +23,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class DefsFactoryImpl extends EFactoryImpl implements DefsFactory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static DefsFactory init()
@@ -53,7 +53,7 @@ public class DefsFactoryImpl extends EFactoryImpl implements DefsFactory
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public DefsFactoryImpl()
@@ -63,7 +63,7 @@ public class DefsFactoryImpl extends EFactoryImpl implements DefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -80,7 +80,7 @@ public class DefsFactoryImpl extends EFactoryImpl implements DefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public TestDef createTestDef()
@@ -91,7 +91,7 @@ public class DefsFactoryImpl extends EFactoryImpl implements DefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public DefsPackage getDefsPackage()
@@ -101,7 +101,7 @@ public class DefsFactoryImpl extends EFactoryImpl implements DefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java
index 5673b5102f..b2c93fe00b 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java
@@ -24,14 +24,14 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class DefsPackageImpl extends EPackageImpl implements DefsPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass testDefEClass;
@@ -43,7 +43,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.net4j.util.tests.defs.DefsPackage#eNS_URI
    * @see #init()
@@ -56,7 +56,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static boolean isInited = false;
@@ -73,7 +73,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
    * <p>
    * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -87,8 +87,9 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
     }
 
     // Obtain or create and register package
-    DefsPackageImpl theDefsPackage = (DefsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DefsPackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(eNS_URI) : new DefsPackageImpl());
+    DefsPackageImpl theDefsPackage = (DefsPackageImpl)(EPackage.Registry.INSTANCE
+        .getEPackage(eNS_URI) instanceof DefsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI)
+            : new DefsPackageImpl());
 
     isInited = true;
 
@@ -109,7 +110,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getTestDef()
@@ -119,7 +120,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getTestDef_References()
@@ -129,7 +130,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getTestDef_Attribute()
@@ -139,7 +140,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public DefsFactory getDefsFactory()
@@ -149,7 +150,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isCreated = false;
@@ -157,7 +158,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void createPackageContents()
@@ -176,7 +177,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isInitialized = false;
@@ -184,7 +185,7 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void initializePackageContents()
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java
index 7ff2db1bdb..e8f4a78410 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -33,7 +33,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl#getAttribute <em>Attribute</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TestDefImpl extends DefImpl implements TestDef
@@ -41,7 +41,7 @@ public class TestDefImpl extends DefImpl implements TestDef
   /**
    * The cached value of the '{@link #getReferences() <em>References</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getReferences()
    * @generated
    * @ordered
@@ -51,7 +51,7 @@ public class TestDefImpl extends DefImpl implements TestDef
   /**
    * The default value of the '{@link #getAttribute() <em>Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getAttribute()
    * @generated
    * @ordered
@@ -61,7 +61,7 @@ public class TestDefImpl extends DefImpl implements TestDef
   /**
    * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @see #getAttribute()
    * @generated
    * @ordered
@@ -70,7 +70,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TestDefImpl()
@@ -80,7 +80,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -91,7 +91,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EList<Def> getReferences()
@@ -105,7 +105,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getAttribute()
@@ -115,7 +115,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setAttribute(String newAttribute)
@@ -124,14 +124,14 @@ public class TestDefImpl extends DefImpl implements TestDef
     attribute = newAttribute;
     if (eNotificationRequired())
     {
-      eNotify(new ENotificationImpl(this, Notification.SET, TestDefsPackage.TEST_DEF__ATTRIBUTE, oldAttribute,
-          attribute));
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, TestDefsPackage.TEST_DEF__ATTRIBUTE, oldAttribute, attribute));
     }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -149,7 +149,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -171,7 +171,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -191,7 +191,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -209,7 +209,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java
index b6bdb55979..fb92c301e8 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -23,14 +23,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static TestDefsFactory init()
@@ -53,7 +53,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public TestDefsFactoryImpl()
@@ -63,7 +63,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -80,7 +80,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public TestDef createTestDef()
@@ -91,7 +91,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public TestDefsPackage getTestDefsPackage()
@@ -101,7 +101,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java
index 274257d377..c8939bb64a 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -24,14 +24,14 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass testDefEClass = null;
@@ -43,7 +43,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage#eNS_URI
    * @see #init()
@@ -56,7 +56,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static boolean isInited = false;
@@ -67,7 +67,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
    * This method is used to initialize {@link TestDefsPackage#eINSTANCE} when that field is accessed. Clients should not
    * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -81,8 +81,9 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
     }
 
     // Obtain or create and register package
-    TestDefsPackageImpl theTestDefsPackage = (TestDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TestDefsPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new TestDefsPackageImpl());
+    TestDefsPackageImpl theTestDefsPackage = (TestDefsPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof TestDefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new TestDefsPackageImpl());
 
     isInited = true;
 
@@ -105,7 +106,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getTestDef()
@@ -115,7 +116,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getTestDef_References()
@@ -125,7 +126,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getTestDef_Attribute()
@@ -135,7 +136,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public TestDefsFactory getTestDefsFactory()
@@ -145,7 +146,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isCreated = false;
@@ -153,7 +154,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void createPackageContents()
@@ -172,7 +173,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isInitialized = false;
@@ -180,7 +181,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void initializePackageContents()
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsAdapterFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsAdapterFactory.java
index dcebcb2ffd..997fb3ff5a 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsAdapterFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.util.tests.defs.DefsPackage
  * @generated
  */
@@ -31,14 +31,14 @@ public class DefsAdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static DefsPackage modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public DefsAdapterFactory()
@@ -53,7 +53,7 @@ public class DefsAdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
+   *
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -73,7 +73,7 @@ public class DefsAdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected DefsSwitch<Adapter> modelSwitch = new DefsSwitch<Adapter>()
@@ -99,7 +99,7 @@ public class DefsAdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -115,7 +115,7 @@ public class DefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.tests.defs.TestDef <em>Test Def</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.tests.defs.TestDef
    * @generated
@@ -129,7 +129,7 @@ public class DefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.defs.Def
    * @generated
@@ -142,7 +142,7 @@ public class DefsAdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsSwitch.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsSwitch.java
index 127cff01df..8ed51f77ab 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsSwitch.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/DefsSwitch.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -25,7 +25,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.util.tests.defs.DefsPackage
  * @generated
  */
@@ -33,14 +33,14 @@ public class DefsSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static DefsPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public DefsSwitch()
@@ -54,7 +54,7 @@ public class DefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -66,7 +66,7 @@ public class DefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -86,7 +86,7 @@ public class DefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -116,7 +116,7 @@ public class DefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Test Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Test Def</em>'.
@@ -131,7 +131,7 @@ public class DefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
@@ -147,7 +147,7 @@ public class DefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsAdapterFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsAdapterFactory.java
index 45952f90c7..4a3b8c4c15 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsAdapterFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage
  * @generated
  */
@@ -31,14 +31,14 @@ public class TestDefsAdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static TestDefsPackage modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public TestDefsAdapterFactory()
@@ -53,7 +53,7 @@ public class TestDefsAdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
+   *
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -73,7 +73,7 @@ public class TestDefsAdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TestDefsSwitch<Adapter> modelSwitch = new TestDefsSwitch<Adapter>()
@@ -99,7 +99,7 @@ public class TestDefsAdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -115,7 +115,7 @@ public class TestDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.tests.defs.TestDef <em>Test Def</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.tests.defs.TestDef
    * @generated
@@ -129,7 +129,7 @@ public class TestDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.defs.Def
    * @generated
@@ -142,7 +142,7 @@ public class TestDefsAdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java
index bd96dd2853..a273b83c5f 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -25,7 +25,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage
  * @generated
  */
@@ -33,14 +33,14 @@ public class TestDefsSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static TestDefsPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public TestDefsSwitch()
@@ -54,7 +54,7 @@ public class TestDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -66,7 +66,7 @@ public class TestDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -86,7 +86,7 @@ public class TestDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -116,7 +116,7 @@ public class TestDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Test Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Test Def</em>'.
@@ -131,7 +131,7 @@ public class TestDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
@@ -147,7 +147,7 @@ public class TestDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF
index 6ddd08faee..8b052b4956 100644
--- a/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.ui.defs;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,6 +10,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.net4j.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.net4j.ui.defs;version="4.0.300",
- org.eclipse.net4j.ui.defs.impl;version="4.0.300",
- org.eclipse.net4j.ui.defs.util;version="4.0.300"
+Export-Package: org.eclipse.net4j.ui.defs;version="4.0.400",
+ org.eclipse.net4j.ui.defs.impl;version="4.0.400",
+ org.eclipse.net4j.ui.defs.util;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/InteractiveCredentialsProviderDef.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/InteractiveCredentialsProviderDef.java
index ca9752efc4..a822579a48 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/InteractiveCredentialsProviderDef.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/InteractiveCredentialsProviderDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsFactory.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsFactory.java
index 63b7e5882c..624cc41ad1 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsFactory.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java
index ade68040c4..388e1fba30 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/InteractiveCredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/InteractiveCredentialsProviderDefImpl.java
index fac056610f..98413051cc 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/InteractiveCredentialsProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/InteractiveCredentialsProviderDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java
index 781102ae79..5efabd8802 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -39,7 +39,7 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.net4j.ui.defs.Net4JUIDefsPackage#eNS_URI
    * @see #init()
@@ -58,7 +58,7 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Net4JUIDefsPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc
@@ -71,11 +71,14 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
   public static Net4JUIDefsPackage init()
   {
     if (isInited)
+    {
       return (Net4JUIDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4JUIDefsPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Net4JUIDefsPackageImpl theNet4JUIDefsPackage = (Net4JUIDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Net4JUIDefsPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Net4JUIDefsPackageImpl());
+    Net4JUIDefsPackageImpl theNet4JUIDefsPackage = (Net4JUIDefsPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Net4JUIDefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new Net4JUIDefsPackageImpl());
 
     isInited = true;
 
@@ -129,7 +132,9 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -151,7 +156,9 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsAdapterFactory.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsAdapterFactory.java
index 0edd65b9fb..2ca24c0afd 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsAdapterFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -127,7 +127,7 @@ public class Net4JUIDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.defs.Def
    * @generated
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsSwitch.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsSwitch.java
index 295457eacb..179a019103 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsSwitch.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsSwitch.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -25,7 +25,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.ui.defs.Net4JUIDefsPackage
  * @generated
  */
@@ -33,14 +33,14 @@ public class Net4JUIDefsSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static Net4JUIDefsPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Net4JUIDefsSwitch()
@@ -54,7 +54,7 @@ public class Net4JUIDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -66,7 +66,7 @@ public class Net4JUIDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -86,7 +86,7 @@ public class Net4JUIDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -117,7 +117,7 @@ public class Net4JUIDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Interactive Credentials Provider Def</em>'.
    * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch.
    * <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Interactive Credentials Provider Def</em>'.
@@ -132,7 +132,7 @@ public class Net4JUIDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
@@ -148,7 +148,7 @@ public class Net4JUIDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/shared/bundle/OM.java b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/shared/bundle/OM.java
index 024d1b76e1..36376cdea6 100644
--- a/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/shared/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/internal/shared/bundle/OM.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Martin Fluegge
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index 8ea4d76c44..4a187d31a9 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.ui;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.ui.bundle;version="4.2.100";x-internal:=true,
- org.eclipse.net4j.internal.ui.container;version="4.2.100";x-internal:=true,
- org.eclipse.net4j.internal.ui.messages;version="4.2.100";x-internal:=true,
- org.eclipse.net4j.internal.ui.views;version="4.2.100";x-friends:="org.eclipse.net4j.ui.defs,org.eclipse.emf.cdo.ui.admin",
- org.eclipse.net4j.ui;version="4.2.100"
+Export-Package: org.eclipse.net4j.internal.ui.bundle;version="4.2.200";x-internal:=true,
+ org.eclipse.net4j.internal.ui.container;version="4.2.200";x-internal:=true,
+ org.eclipse.net4j.internal.ui.messages;version="4.2.200";x-internal:=true,
+ org.eclipse.net4j.internal.ui.views;version="4.2.200";x-friends:="org.eclipse.net4j.ui.defs,org.eclipse.emf.cdo.ui.admin",
+ org.eclipse.net4j.ui;version="4.2.200"
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
index 9b798e9865..b781a7fbcc 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.ui.UIActivator;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/messages/Messages.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/messages/Messages.java
index 509a1bc4e9..ececbf915f 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/AcceptorContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/AcceptorContentProvider.java
index 583192d6e4..eaf8c61969 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/AcceptorContentProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/AcceptorContentProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.spi.net4j.AcceptorFactory;
 
 /**
  * A {@link StructuredContentProvider structured content provider} that shows {@link IAcceptor acceptors}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  */
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/ConnectorContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/ConnectorContentProvider.java
index e3da81530b..279b667458 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/ConnectorContentProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/ConnectorContentProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.spi.net4j.ConnectorFactory;
 
 /**
  * A {@link StructuredContentProvider structured content provider} that shows {@link IConnector connectors}.
- * 
+ *
  * @author Eike Stepper
  * @since 4.0
  */
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/Net4jItemProvider.java
index 932a8be8b8..2d95fa750f 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/Net4jItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/Net4jItemProvider.java
@@ -92,8 +92,8 @@ public class Net4jItemProvider extends ContainerItemProvider<IContainer<Object>>
 
     public RemoveAction(Object object)
     {
-      super(
-          Messages.getString("Net4jItemProvider.0"), Messages.getString("Net4jItemProvider.1"), ContainerView.getDeleteImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
+      super(Messages.getString("Net4jItemProvider.0"), Messages.getString("Net4jItemProvider.1"), //$NON-NLS-1$ //$NON-NLS-2$
+          ContainerView.getDeleteImageDescriptor());
       this.object = object;
     }
 
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package-info.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package-info.java
index d4a84584f3..a578ae7e65 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package-info.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Reusable UI components specific to the Net4j Signalling Platform.
  */
 package org.eclipse.net4j.ui;
-
diff --git a/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF
index 510773864d..5308210d6e 100644
--- a/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util.defs/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.util.defs;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.net4j.util.defs;version="4.1.100",
- org.eclipse.net4j.util.defs.impl;version="4.1.100",
- org.eclipse.net4j.util.defs.util;version="4.1.100"
+Export-Package: org.eclipse.net4j.util.defs;version="4.1.200",
+ org.eclipse.net4j.util.defs.impl;version="4.1.200",
+ org.eclipse.net4j.util.defs.util;version="4.1.200"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java
index 2bf69ba808..bbd5edd86a 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java
index 59025535bb..14c3df5ffa 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java
index 3661267f3a..129c666cf6 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java
index 08cfdef4e5..e53f3a948a 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefException.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefException.java
index 20b5c2a56a..3787b674d6 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefException.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefException.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java
index 31870d2fbc..0b90c14f92 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java
index ce5f992950..bf676d1640 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java
index 021d5e4179..dd2846318d 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java
index f80746b7cb..1c25838ae5 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -80,7 +80,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * The feature id for the '<em><b>Default Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -89,7 +89,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>Def Container</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -98,7 +98,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.DefImpl <em>Def</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.net4j.util.defs.impl.DefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getDef()
    * @generated
@@ -185,7 +185,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>Randomizer Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -203,7 +203,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.UserImpl <em>User</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.net4j.util.defs.impl.UserImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getUser()
    * @generated
@@ -258,7 +258,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.DefContainer <em>Def Container</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Def Container</em>'.
    * @see org.eclipse.net4j.util.defs.DefContainer
    * @generated
@@ -372,7 +372,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>Negotiator Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -381,7 +381,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * The feature id for the '<em><b>Credentials Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -452,7 +452,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.RandomizerDef <em>Randomizer Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Randomizer Def</em>'.
    * @see org.eclipse.net4j.util.defs.RandomizerDef
    * @generated
@@ -551,7 +551,7 @@ public interface Net4jUtilDefsPackage extends EPackage
    * Returns the meta object for the attribute '
    * {@link org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Password</em>'.
    * @see org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef#getPassword()
    * @see #getPasswordCredentialsProviderDef()
@@ -581,7 +581,7 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.NegotiatorDef <em>Negotiator Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Negotiator Def</em>'.
    * @see org.eclipse.net4j.util.defs.NegotiatorDef
    * @generated
@@ -620,7 +620,7 @@ public interface Net4jUtilDefsPackage extends EPackage
    * Returns the meta object for the reference '
    * {@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>User Manager</em>'.
    * @see org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getUserManager()
    * @see #getChallengeNegotiatorDef()
@@ -671,7 +671,7 @@ public interface Net4jUtilDefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Definitions</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DEF_CONTAINER__DEFINITIONS = eINSTANCE.getDefContainer_Definitions();
@@ -687,7 +687,7 @@ public interface Net4jUtilDefsPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.DefImpl <em>Def</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.net4j.util.defs.impl.DefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getDef()
      * @generated
@@ -765,7 +765,7 @@ public interface Net4jUtilDefsPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.UserImpl <em>User</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.net4j.util.defs.impl.UserImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getUser()
      * @generated
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java
index d56b629d0a..8e972448c3 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java
index f7966edb43..d60bdc022e 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -149,7 +149,7 @@ public interface RandomizerDef extends Def
   /**
    * Sets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Seed</em>' attribute.
    * @see #isSetSeed()
@@ -162,7 +162,7 @@ public interface RandomizerDef extends Def
   /**
    * Unsets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isSetSeed()
    * @see #getSeed()
    * @see #setSeed(byte[])
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java
index a50f4d2ee4..b54fd70f0f 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java
index 486abba88d..5046e26d9e 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java
index 7de9161874..122d98084e 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -49,7 +49,7 @@ public interface User extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.net4j.util.defs.User#getUserID <em>User ID</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>User ID</em>' attribute.
    * @see #getUserID()
@@ -76,7 +76,7 @@ public interface User extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.net4j.util.defs.User#getPassword <em>Password</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Password</em>' attribute.
    * @see #getPassword()
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java
index 40ef0737b6..73000436bf 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.eclipse.net4j.util.defs.UserManagerDef#getUser <em>User</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getUserManagerDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java
index 1c83259215..c7be1236f0 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -93,8 +93,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
       if (userManager != oldUserManager)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER, oldUserManager, userManager));
+        }
       }
     }
     return userManager;
@@ -118,8 +120,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     UserManagerDef oldUserManager = userManager;
     userManager = newUserManager;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET,
-          Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER, oldUserManager, userManager));
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER,
+          oldUserManager, userManager));
+    }
   }
 
   /**
@@ -135,8 +139,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
       if (randomizer != oldRandomizer)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER, oldRandomizer, randomizer));
+        }
       }
     }
     return randomizer;
@@ -160,8 +166,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     RandomizerDef oldRandomizer = randomizer;
     randomizer = newRandomizer;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER,
           oldRandomizer, randomizer));
+    }
   }
 
   /**
@@ -175,11 +183,15 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     {
     case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
       if (resolve)
+      {
         return getUserManager();
+      }
       return basicGetUserManager();
     case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER:
       if (resolve)
+      {
         return getRandomizer();
+      }
       return basicGetRandomizer();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java
index 9d3d5776ed..de2d0b6275 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -89,8 +89,10 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
     String oldUserID = userID;
     userID = newUserID;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID,
           oldUserID, userID));
+    }
   }
 
   /**
@@ -163,7 +165,9 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (userID: ");
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java
index 0b206fa46e..f24826eb8e 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -44,7 +44,7 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
   /**
    * The cached value of the '{@link #getDefinitions() <em>Definitions</em>}' containment reference list. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getDefinitions()
    * @generated
    * @ordered
@@ -54,7 +54,7 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
   /**
    * The cached value of the '{@link #getDefaultDefinition() <em>Default Definition</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getDefaultDefinition()
    * @generated
    * @ordered
@@ -106,8 +106,10 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
       if (defaultDefinition != oldDefaultDefinition)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION, oldDefaultDefinition, defaultDefinition));
+        }
       }
     }
     return defaultDefinition;
@@ -131,8 +133,10 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
     Def oldDefaultDefinition = defaultDefinition;
     defaultDefinition = newDefaultDefinition;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION,
           oldDefaultDefinition, defaultDefinition));
+    }
   }
 
   /**
@@ -163,7 +167,9 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
       return getDefinitions();
     case Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION:
       if (resolve)
+      {
         return getDefaultDefinition();
+      }
       return basicGetDefaultDefinition();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java
index be693c2777..ad4bbcf805 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -77,7 +77,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @generated NOT
    */
   protected DefImpl()
@@ -88,7 +88,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
 
   /**
    * Gets the internal instance.
-   * 
+   *
    * @return the internal instance
    * @ADDED
    */
@@ -99,7 +99,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
+   *
    * @return the e class
    * @generated
    */
@@ -112,7 +112,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
   /**
    * returns an instance that is created for the given definition. Instances are stored and reused. The instance is
    * activated before it is returned. A later call to #getInstace
-   * 
+   *
    * @return the instance that this definition defines
    * @see #createInstance()
    * @see #wireInstance(Object)
@@ -152,7 +152,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
 
   /**
    * Activate a given instance.
-   * 
+   *
    * @param instance
    *          the instance to activate
    * @ADDED
@@ -164,7 +164,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
 
   /**
    * Deactivate a given instance.
-   * 
+   *
    * @ADDED
    */
   protected void deactivateInstance(Object instance)
@@ -175,7 +175,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
   /**
    * <!-- begin-user-doc -->Unsets the instance managed by this Definition. The internal reference to it is cleared and
    * internal listeners to it are removed <!-- end-user-doc -->
-   * 
+   *
    * @ADDED
    */
   public void unsetInstance()
@@ -186,7 +186,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
   /**
    * Checks if the the instance in this <em>definition</em> is set. In other words, if the instance handled by this
    * <em>defintion</em> is present
-   * 
+   *
    * @return <code>true</code>, if the instance in this definition is set
    * @ADDED
    */
@@ -198,7 +198,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
   /**
    * Returns whether this definition (and all its nested, referenced defs) was touched since it created its internal
    * instance.
-   * 
+   *
    * @return true, if this definition was touched since it created its internal instance
    * @ADDED
    */
@@ -217,7 +217,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
 
   /**
    * Returns whether any referenced def is touched
-   * 
+   *
    * @return true, if there's any referenced def that has been touched
    */
   protected boolean areReferencedDefsTouched()
@@ -286,7 +286,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
 
   /**
    * validates the present definition. Subclasses have to provide an implementation
-   * 
+   *
    * @throws IllegalStateException
    * @ADDED
    */
@@ -296,7 +296,7 @@ public abstract class DefImpl extends EObjectImpl implements Def
 
   /**
    * Creates a new instance. Subclasses have to provide an implementation
-   * 
+   *
    * @return a new instance
    * @ADDED
    */
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java
index 3d2c31ec80..7210d8d3f0 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java
index f9cf98bb43..2f56fa5605 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java
index ffbb839364..85d0c99cec 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java
index 16648d4189..2cc63775f6 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -117,7 +117,7 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#eNS_URI
    * @see #init()
@@ -140,7 +140,7 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
    * This method is used to initialize {@link Net4jUtilDefsPackage#eINSTANCE} when that field is accessed. Clients
    * should not invoke it directly. Instead, they should simply access that field to obtain the package. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -149,12 +149,14 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
   public static Net4jUtilDefsPackage init()
   {
     if (isInited)
+    {
       return (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     Net4jUtilDefsPackageImpl theNet4jUtilDefsPackage = (Net4jUtilDefsPackageImpl)(EPackage.Registry.INSTANCE
         .get(eNS_URI) instanceof Net4jUtilDefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-        : new Net4jUtilDefsPackageImpl());
+            : new Net4jUtilDefsPackageImpl());
 
     isInited = true;
 
@@ -421,7 +423,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -478,7 +482,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -491,23 +497,23 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    executorServiceDefEClass.getESuperTypes().add(this.getDef());
-    threadPoolDefEClass.getESuperTypes().add(this.getExecutorServiceDef());
-    randomizerDefEClass.getESuperTypes().add(this.getDef());
-    userManagerDefEClass.getESuperTypes().add(this.getDef());
-    passwordCredentialsProviderDefEClass.getESuperTypes().add(this.getCredentialsProviderDef());
-    credentialsProviderDefEClass.getESuperTypes().add(this.getDef());
-    negotiatorDefEClass.getESuperTypes().add(this.getDef());
-    responseNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef());
-    challengeNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef());
+    executorServiceDefEClass.getESuperTypes().add(getDef());
+    threadPoolDefEClass.getESuperTypes().add(getExecutorServiceDef());
+    randomizerDefEClass.getESuperTypes().add(getDef());
+    userManagerDefEClass.getESuperTypes().add(getDef());
+    passwordCredentialsProviderDefEClass.getESuperTypes().add(getCredentialsProviderDef());
+    credentialsProviderDefEClass.getESuperTypes().add(getDef());
+    negotiatorDefEClass.getESuperTypes().add(getDef());
+    responseNegotiatorDefEClass.getESuperTypes().add(getNegotiatorDef());
+    challengeNegotiatorDefEClass.getESuperTypes().add(getNegotiatorDef());
 
     // Initialize classes and features; add operations and parameters
     initEClass(defContainerEClass, DefContainer.class, "DefContainer", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDefContainer_Definitions(), this.getDef(), null, "definitions", null, 1, -1, DefContainer.class,
+    initEReference(getDefContainer_Definitions(), getDef(), null, "definitions", null, 1, -1, DefContainer.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getDefContainer_DefaultDefinition(), this.getDef(), null, "defaultDefinition", null, 0, 1,
+    initEReference(getDefContainer_DefaultDefinition(), getDef(), null, "defaultDefinition", null, 0, 1,
         DefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -536,9 +542,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
     initEClass(userManagerDefEClass, UserManagerDef.class, "UserManagerDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getUserManagerDef_User(), this.getUser(), null, "user", null, 1, -1, UserManagerDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getUserManagerDef_User(), getUser(), null, "user", null, 1, -1, UserManagerDef.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getUser_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, User.class, !IS_TRANSIENT,
@@ -563,16 +569,16 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
     initEClass(responseNegotiatorDefEClass, ResponseNegotiatorDef.class, "ResponseNegotiatorDef", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getResponseNegotiatorDef_CredentialsProvider(), this.getCredentialsProviderDef(), null,
+    initEReference(getResponseNegotiatorDef_CredentialsProvider(), getCredentialsProviderDef(), null,
         "credentialsProvider", null, 0, 1, ResponseNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(challengeNegotiatorDefEClass, ChallengeNegotiatorDef.class, "ChallengeNegotiatorDef", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getChallengeNegotiatorDef_UserManager(), this.getUserManagerDef(), null, "userManager", null, 0, 1,
+    initEReference(getChallengeNegotiatorDef_UserManager(), getUserManagerDef(), null, "userManager", null, 0, 1,
         ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getChallengeNegotiatorDef_Randomizer(), this.getRandomizerDef(), null, "randomizer", null, 0, 1,
+    initEReference(getChallengeNegotiatorDef_Randomizer(), getRandomizerDef(), null, "randomizer", null, 0, 1,
         ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java
index 8510710e0c..a7414efe60 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -34,8 +34,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *
  * @generated
  */
-public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefImpl implements
-    PasswordCredentialsProviderDef
+public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefImpl
+    implements PasswordCredentialsProviderDef
 {
 
   /**
@@ -95,8 +95,10 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
     String oldPassword = password;
     password = newPassword;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Net4jUtilDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD, oldPassword, password));
+    }
   }
 
   /**
@@ -169,7 +171,9 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (password: ");
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java
index 7dcbc28e9a..ca2c220f7e 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -93,7 +93,7 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
   /**
    * The default value of the '{@link #getSeed() <em>Seed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getSeed()
    * @generated
    * @ordered
@@ -175,8 +175,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     boolean oldAlgorithmNameESet = algorithmNameESet;
     algorithmNameESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME,
           oldAlgorithmName, algorithmName, !oldAlgorithmNameESet));
+    }
   }
 
   /**
@@ -190,8 +192,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     algorithmName = ALGORITHM_NAME_EDEFAULT;
     algorithmNameESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME,
           oldAlgorithmName, ALGORITHM_NAME_EDEFAULT, oldAlgorithmNameESet));
+    }
   }
 
   /**
@@ -223,8 +227,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     boolean oldProviderNameESet = providerNameESet;
     providerNameESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME,
           oldProviderName, providerName, !oldProviderNameESet));
+    }
   }
 
   /**
@@ -238,8 +244,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     providerName = PROVIDER_NAME_EDEFAULT;
     providerNameESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME,
           oldProviderName, PROVIDER_NAME_EDEFAULT, oldProviderNameESet));
+    }
   }
 
   /**
@@ -271,8 +279,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     boolean oldSeedESet = seedESet;
     seedESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED, oldSeed, seed,
           !oldSeedESet));
+    }
   }
 
   /**
@@ -286,8 +296,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     seed = SEED_EDEFAULT;
     seedESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED, oldSeed,
           SEED_EDEFAULT, oldSeedESet));
+    }
   }
 
   /**
@@ -389,24 +401,38 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (algorithmName: ");
     if (algorithmNameESet)
+    {
       result.append(algorithmName);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", providerName: ");
     if (providerNameESet)
+    {
       result.append(providerName);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", seed: ");
     if (seedESet)
+    {
       result.append(seed);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java
index f0ec4c53d0..c416f26a23 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -39,7 +39,7 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
   /**
    * The cached value of the '{@link #getCredentialsProvider() <em>Credentials Provider</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #getCredentialsProvider()
    * @generated
    * @ordered
@@ -78,9 +78,11 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
       if (credentialsProvider != oldCredentialsProvider)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider,
               credentialsProvider));
+        }
       }
     }
     return credentialsProvider;
@@ -104,9 +106,11 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
     CredentialsProviderDef oldCredentialsProvider = credentialsProvider;
     credentialsProvider = newCredentialsProvider;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider,
           credentialsProvider));
+    }
   }
 
   /**
@@ -120,7 +124,9 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
     {
     case Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
       if (resolve)
+      {
         return getCredentialsProvider();
+      }
       return basicGetCredentialsProvider();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java
index 63959b4d54..bde6dd002e 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -25,7 +25,7 @@ import java.util.concurrent.ThreadFactory;
  * -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadPoolDef
@@ -55,7 +55,7 @@ public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadP
   /**
    * Gets a executor service instance. The current implementation does not reuse an instance created in a former call
    * TODO: reuse instances
-   * 
+   *
    * @return the instance
    */
   @Override
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java
index e5bf898821..04b8972f9f 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -110,7 +110,9 @@ public class UserImpl extends EObjectImpl implements User
     String oldUserID = userID;
     userID = newUserID;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.USER__USER_ID, oldUserID, userID));
+    }
   }
 
   /**
@@ -131,7 +133,10 @@ public class UserImpl extends EObjectImpl implements User
     String oldPassword = password;
     password = newPassword;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.USER__PASSWORD, oldPassword, password));
+    {
+      eNotify(
+          new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.USER__PASSWORD, oldPassword, password));
+    }
   }
 
   /**
@@ -214,7 +219,9 @@ public class UserImpl extends EObjectImpl implements User
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (userID: ");
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java
index d4d420d580..5ccbcf5cf9 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -32,7 +32,7 @@ import java.util.Collection;
  * <li>{@link org.eclipse.net4j.util.defs.impl.UserManagerDefImpl#getUser <em>User</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class UserManagerDefImpl extends DefImpl implements UserManagerDef
@@ -86,7 +86,9 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
   public void unsetUser()
   {
     if (user != null)
+    {
       ((InternalEList.Unsettable<?>)user).unset();
+    }
   }
 
   /**
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java
index f5bbfceb4a..4225033473 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -196,7 +196,7 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.defs.Def
    * @generated
@@ -263,7 +263,7 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.User <em>User</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.defs.User
    * @generated
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java
index 193f73dacd..6c288cfb82 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java
@@ -4,7 +4,7 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -35,7 +35,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage
  * @generated
  */
@@ -43,14 +43,14 @@ public class Net4jUtilDefsSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static Net4jUtilDefsPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Net4jUtilDefsSwitch()
@@ -64,7 +64,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -76,7 +76,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -96,7 +96,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -284,7 +284,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Def Container</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def Container</em>'.
@@ -299,7 +299,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
@@ -315,7 +315,7 @@ public class Net4jUtilDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Executor Service Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Executor Service Def</em>'.
@@ -330,7 +330,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Thread Pool Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Thread Pool Def</em>'.
@@ -345,7 +345,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Randomizer Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Randomizer Def</em>'.
@@ -360,7 +360,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>User Manager Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>User Manager Def</em>'.
@@ -375,7 +375,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>User</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>User</em>'.
@@ -391,7 +391,7 @@ public class Net4jUtilDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Password Credentials Provider Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Password Credentials Provider Def</em>'.
@@ -407,7 +407,7 @@ public class Net4jUtilDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Credentials Provider Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Credentials Provider Def</em>'.
@@ -422,7 +422,7 @@ public class Net4jUtilDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Negotiator Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Negotiator Def</em>'.
@@ -438,7 +438,7 @@ public class Net4jUtilDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Response Negotiator Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Response Negotiator Def</em>'.
@@ -454,7 +454,7 @@ public class Net4jUtilDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Challenge Negotiator Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Challenge Negotiator Def</em>'.
@@ -470,7 +470,7 @@ public class Net4jUtilDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Legal.java b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Legal.java
index f864e54f62..d2d759d2ca 100644
--- a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Legal.java
+++ b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Legal.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.doc;
 
 /**
  * Legal
- * 
+ *
  * @external about.html
  * @number 666
  */
diff --git a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Overview.java b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Overview.java
index 66c9ede1f9..5d05ad34fb 100644
--- a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Overview.java
+++ b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Overview.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ package org.eclipse.net4j.util.doc;
  * Overview
  * <p>
  * {@toc}
- * 
+ *
  * @default
  */
 public class Overview
diff --git a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/Homepage.java b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/Homepage.java
index 3d56af7cd1..570ec6d5b6 100644
--- a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/Homepage.java
+++ b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/Homepage.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.doc.online;
 
 /**
  * Homepage
- * 
+ *
  * @external http://www.eclipse.org/cdo
  * @number 1
  */
diff --git a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/Wiki.java b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/Wiki.java
index 5884ad01af..ff9462ac13 100644
--- a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/Wiki.java
+++ b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/Wiki.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.doc.online;
 
 /**
  * Wiki
- * 
+ *
  * @external http://wiki.eclipse.org/CDO
  * @number 2
  */
diff --git a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/package-info.java b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/package-info.java
index 49658bdae4..5d2a76cd57 100644
--- a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/package-info.java
+++ b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/online/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Online Docs
- * 
+ *
  * @number 555
  */
 package org.eclipse.net4j.util.doc.online;
-
diff --git a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/api/package-info.java b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/api/package-info.java
index 09f4aa87db..e3135dee69 100644
--- a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/api/package-info.java
+++ b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/api/package-info.java
@@ -4,14 +4,14 @@
  * 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
  */
 
 /**
  * API Reference
- * 
+ *
  * @number 1
  */
 package org.eclipse.net4j.util.doc.reference.api;
diff --git a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/package-info.java b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/package-info.java
index c36e1fe9ec..c0ba2600b6 100644
--- a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/package-info.java
+++ b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Reference
- * 
+ *
  * @number 444
  */
 package org.eclipse.net4j.util.doc.reference;
-
diff --git a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/schema/package-info.java b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/schema/package-info.java
index c6fbc6f3b7..ce6d5409e9 100644
--- a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/schema/package-info.java
+++ b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/reference/schema/package-info.java
@@ -4,14 +4,14 @@
  * 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
  */
 
 /**
  * Extension Point Reference
- * 
+ *
  * @number 2
  */
 package org.eclipse.net4j.util.doc.reference.schema;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java
index d4ff7f1cc4..ccd15ffde4 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java
index 47e8ca524c..7bcb184a70 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/Messages.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/Messages.java
index 13c1437fb9..b2714ac320 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/Messages.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/Messages.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
index f48608b28f..96b77b38bd 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
@@ -61,8 +61,8 @@ public class Net4jContainerItemProvider extends ContainerItemProvider<IContainer
 
     public RemoveAction(ITreeSelection selection)
     {
-      super(
-          Messages.getString("Net4jContainerItemProvider_0"), Messages.getString("Net4jContainerItemProvider.1"), ContainerView.getDeleteImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
+      super(Messages.getString("Net4jContainerItemProvider_0"), Messages.getString("Net4jContainerItemProvider.1"), //$NON-NLS-1$ //$NON-NLS-2$
+          ContainerView.getDeleteImageDescriptor());
       this.selection = selection;
     }
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
index 5d3c471754..3b62979e01 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
index 905ad01032..a1e4f139b0 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
@@ -63,8 +63,8 @@ import java.util.Stack;
 /**
  * @author Eike Stepper
  */
-public class Net4jIntrospectorView extends ViewPart implements IPartListener, ISelectionListener, IDoubleClickListener,
-    IListener
+public class Net4jIntrospectorView extends ViewPart
+    implements IPartListener, ISelectionListener, IDoubleClickListener, IListener
 {
   public static final String VIEW_ID = "org.eclipse.net4j.util.Net4jIntrospectorView"; //$NON-NLS-1$
 
@@ -416,8 +416,9 @@ public class Net4jIntrospectorView extends ViewPart implements IPartListener, IS
   private void createObjectColmuns()
   {
     Table table = objectViewer.getTable();
-    String[] columnNames = {
-        Messages.getString("Net4jIntrospectorView_4"), Messages.getString("Net4jIntrospectorView_5"), Messages.getString("Net4jIntrospectorView_6"), Messages.getString("Net4jIntrospectorView_7") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    String[] columnNames = { Messages.getString("Net4jIntrospectorView_4"), //$NON-NLS-1$
+        Messages.getString("Net4jIntrospectorView_5"), Messages.getString("Net4jIntrospectorView_6"), //$NON-NLS-1$ //$NON-NLS-2$
+        Messages.getString("Net4jIntrospectorView_7") }; //$NON-NLS-1$
     int[] columnWidths = { 200, 400, 300, 300 };
     createColumns(table, columnNames, columnWidths);
   }
@@ -425,8 +426,8 @@ public class Net4jIntrospectorView extends ViewPart implements IPartListener, IS
   private void createMapColmuns()
   {
     Table table = mapViewer.getTable();
-    String[] columnNames = {
-        Messages.getString("Net4jIntrospectorView_8"), Messages.getString("Net4jIntrospectorView_9"), Messages.getString("Net4jIntrospectorView_10") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    String[] columnNames = { Messages.getString("Net4jIntrospectorView_8"), //$NON-NLS-1$
+        Messages.getString("Net4jIntrospectorView_9"), Messages.getString("Net4jIntrospectorView_10") }; //$NON-NLS-1$ //$NON-NLS-2$
     int[] columnWidths = { 200, 400, 300 };
     createColumns(table, columnNames, columnWidths);
   }
@@ -434,8 +435,8 @@ public class Net4jIntrospectorView extends ViewPart implements IPartListener, IS
   private void createIterableColmuns()
   {
     Table table = iterableViewer.getTable();
-    String[] columnNames = {
-        Messages.getString("Net4jIntrospectorView_11"), Messages.getString("Net4jIntrospectorView_12") }; //$NON-NLS-1$ //$NON-NLS-2$
+    String[] columnNames = { Messages.getString("Net4jIntrospectorView_11"), //$NON-NLS-1$
+        Messages.getString("Net4jIntrospectorView_12") }; //$NON-NLS-1$
     int[] columnWidths = { 400, 300 };
     createColumns(table, columnNames, columnWidths);
   }
@@ -443,8 +444,8 @@ public class Net4jIntrospectorView extends ViewPart implements IPartListener, IS
   private void createArrayColmuns()
   {
     Table table = arrayViewer.getTable();
-    String[] columnNames = {
-        Messages.getString("Net4jIntrospectorView_13"), Messages.getString("Net4jIntrospectorView_14"), Messages.getString("Net4jIntrospectorView_15") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    String[] columnNames = { Messages.getString("Net4jIntrospectorView_13"), //$NON-NLS-1$
+        Messages.getString("Net4jIntrospectorView_14"), Messages.getString("Net4jIntrospectorView_15") }; //$NON-NLS-1$ //$NON-NLS-2$
     int[] columnWidths = { 50, 400, 300 };
     createColumns(table, columnNames, columnWidths);
   }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ComboAutoCompleter.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ComboAutoCompleter.java
index abf644a898..dbbb82746d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ComboAutoCompleter.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ComboAutoCompleter.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java
index e9871d5b20..1f54eb4158 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
index 08f1ca50a5..6d76cd3df9 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
index 6709154e7c..2f52b104a4 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
@@ -26,8 +26,8 @@ import org.eclipse.swt.widgets.Display;
 /**
  * @author Eike Stepper
  */
-public abstract class StructuredContentProvider<INPUT> extends ViewerSorter implements IStructuredContentProvider,
-    IListener
+public abstract class StructuredContentProvider<INPUT> extends ViewerSorter
+    implements IStructuredContentProvider, IListener
 {
   private StructuredViewer viewer;
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/TableLabelProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/TableLabelProvider.java
index 9c9e0165dc..95dc3c3467 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/TableLabelProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/TableLabelProvider.java
@@ -31,8 +31,8 @@ import java.util.List;
  * @author Eike Stepper
  * @since 3.3
  */
-public class TableLabelProvider<T> extends ManagedLabelProvider implements ITableLabelProvider, ITableColorProvider,
-    ITableFontProvider
+public class TableLabelProvider<T> extends ManagedLabelProvider
+    implements ITableLabelProvider, ITableColorProvider, ITableFontProvider
 {
   private final List<Column<T>> columns = new ArrayList<Column<T>>();
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
index 4791f64c1e..11297e3099 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
@@ -736,25 +736,25 @@ public final class UIUtil
   {
     viewer.addDragSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY,
         new Transfer[] { LocalSelectionTransfer.getTransfer() }, new DragSourceAdapter()
-        {
-          private long lastDragTime;
+    {
+      private long lastDragTime;
 
-          @Override
-          public void dragStart(DragSourceEvent event)
-          {
-            lastDragTime = System.currentTimeMillis();
-            LocalSelectionTransfer.getTransfer().setSelection(viewer.getSelection());
-            LocalSelectionTransfer.getTransfer().setSelectionSetTime(lastDragTime);
-          }
+      @Override
+      public void dragStart(DragSourceEvent event)
+      {
+        lastDragTime = System.currentTimeMillis();
+        LocalSelectionTransfer.getTransfer().setSelection(viewer.getSelection());
+        LocalSelectionTransfer.getTransfer().setSelectionSetTime(lastDragTime);
+      }
 
-          @Override
-          public void dragFinished(DragSourceEvent event)
-          {
-            if (LocalSelectionTransfer.getTransfer().getSelectionSetTime() == lastDragTime)
-            {
-              LocalSelectionTransfer.getTransfer().setSelection(null);
-            }
-          }
-        });
+      @Override
+      public void dragFinished(DragSourceEvent event)
+      {
+        if (LocalSelectionTransfer.getTransfer().getSelectionSetTime() == lastDragTime)
+        {
+          LocalSelectionTransfer.getTransfer().setSelection(null);
+        }
+      }
+    });
   }
 }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ValidationParticipant.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ValidationParticipant.java
index a5b4a2a39c..a4063dcbb3 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ValidationParticipant.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/ValidationParticipant.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java
index 2524ec7afc..975c3cf6b9 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/package-info.java
index ae1d79709c..feceb45ca9 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Reusable actions and action delegates.
  */
 package org.eclipse.net4j.util.ui.actions;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/ConfirmationDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/ConfirmationDialog.java
index ebdb6e45d1..498c98f51d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/ConfirmationDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/ConfirmationDialog.java
@@ -33,8 +33,8 @@ public class ConfirmationDialog extends MessageDialog
   public ConfirmationDialog(Shell shell, String title, String message, Set<Confirmation> acceptableResponses,
       Confirmation suggestedResponse)
   {
-    this(shell, title, message, getButtonLabels(inOrder(acceptableResponses)), inOrder(acceptableResponses).indexOf(
-        suggestedResponse));
+    this(shell, title, message, getButtonLabels(inOrder(acceptableResponses)),
+        inOrder(acceptableResponses).indexOf(suggestedResponse));
   }
 
   private ConfirmationDialog(Shell shell, String title, String message, String[] buttonLabels, int defaultIndex)
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/InteractiveConfirmationProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/InteractiveConfirmationProvider.java
index f740ccc449..22eadc5979 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/InteractiveConfirmationProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/InteractiveConfirmationProvider.java
@@ -23,7 +23,7 @@ import java.util.Set;
 
 /**
  * @author Christian W. Damus (CEA LIST)
- * 
+ *
  * @since 3.4
  */
 public class InteractiveConfirmationProvider implements IConfirmationProvider
@@ -67,7 +67,7 @@ public class InteractiveConfirmationProvider implements IConfirmationProvider
 
   /**
    * @author Christian W. Damus (CEA LIST)
-   * 
+   *
    * @since 3.4
    */
   public static class Factory extends IConfirmationProvider.Factory
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/package-info.java
index 86119f8165..87d1ec3429 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/confirmation/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2013 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:
- *    Christian W. Damus (CEA LIST) - initial API and implementation
+ * Copyright (c) 2013 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: Christian W. Damus (CEA LIST) - initial
+ * API and implementation
  */
 
 /**
  * Confirmation dialogs.
- * 
+ *
  * @since 3.4
  */
 package org.eclipse.net4j.util.ui.confirmation;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardAction.java
index 32d385114b..278d055806 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardAction.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardAction.java
@@ -122,7 +122,7 @@ public class ElementWizardAction extends LongRunningAction
         public void run()
         {
           MessageDialog.openError(shell, title, "An error occured: " + ex.getMessage()
-              + "\n\nThe error log may contain more information about the problem.");
+          + "\n\nThe error log may contain more information about the problem.");
         }
       });
     }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java
index fff477b07c..cc7a4f2422 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java
@@ -331,7 +331,8 @@ public abstract class ElementWizardComposite extends Composite implements IListe
     /**
      * @since 3.2
      */
-    public WithCombo(Composite parent, int style, String productGroup, String label, ValidationContext validationContext)
+    public WithCombo(Composite parent, int style, String productGroup, String label,
+        ValidationContext validationContext)
     {
       super(parent, style, productGroup, label, validationContext);
     }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/package-info.java
index 0bdaccf4bc..efb510ead6 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * An element wizard framework for managed containers.
  */
 package org.eclipse.net4j.util.ui.container;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/package-info.java
index 57f775c76b..b12f91ae7c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Helpers for drag and drop support.
  */
 package org.eclipse.net4j.util.ui.dnd;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/handlers/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/handlers/package-info.java
index c98e4f837c..83bda9934b 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/handlers/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/handlers/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2013 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:
- *    Christian W. Damus (CEA LIST) - initial API and implementation
+ * Copyright (c) 2013 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: Christian W. Damus (CEA LIST) - initial
+ * API and implementation
  */
 
 /**
  * Reusable command handlers.
- * 
+ *
  * @since 3.4
  */
 package org.eclipse.net4j.util.ui.handlers;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/package-info.java
index 8f9da51ea2..16d9cc225e 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Reusable UI components.
  */
 package org.eclipse.net4j.util.ui;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java
index f399a6a456..f845df513f 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
index 89ee617788..34329c4a26 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/package-info.java
index c360f88cd2..0398060fab 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Helpers for O&amp;M based preference pages.
  */
 package org.eclipse.net4j.util.ui.prefs;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/README.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/README.java
index d44ef8cf38..fb4d5da10d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/README.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/README.java
@@ -4,7 +4,7 @@
  * 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,7 +15,7 @@ package org.eclipse.net4j.util.ui.proposals;
  * org.eclipse.ui.texteditor.RegExContentProposalProvider is not public.
  * <p>
  * TODO We should ask platform guys to open this API.
- * 
+ *
  * @author Eike Stepper
  */
 class README
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java
index 9c2b500e5f..cd32b648ad 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExContentProposalProvider.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
  * Needed by org.eclipse.mylyn.internal.team.ui.preferences.workaround.MylynTeamPreferencePage.
  * <p>
  * TODO Ask platform guys to open this API
- * 
+ *
  * @since 3.2
  */
 public class RegExContentProposalProvider implements IContentProposalProvider
@@ -103,7 +103,7 @@ public class RegExContentProposalProvider implements IContentProposalProvider
 
     /**
      * Creates a new Proposal Computer.
-     * 
+     *
      * @param contents
      *          the contents of the subject control
      * @param position
@@ -134,7 +134,7 @@ public class RegExContentProposalProvider implements IContentProposalProvider
 
     /**
      * Computes applicable proposals for the find field.
-     * 
+     *
      * @return the proposals
      */
     public IContentProposal[] computeFindProposals()
@@ -224,14 +224,14 @@ public class RegExContentProposalProvider implements IContentProposalProvider
         addBracketProposal("(?>)", 3, RegExMessages.displayString_atomicCap, RegExMessages.additionalInfo_atomicCap); //$NON-NLS-1$
 
         // lookaraound
-        addBracketProposal(
-            "(?=)", 3, RegExMessages.displayString_posLookahead, RegExMessages.additionalInfo_posLookahead); //$NON-NLS-1$
-        addBracketProposal(
-            "(?!)", 3, RegExMessages.displayString_negLookahead, RegExMessages.additionalInfo_negLookahead); //$NON-NLS-1$
-        addBracketProposal(
-            "(?<=)", 4, RegExMessages.displayString_posLookbehind, RegExMessages.additionalInfo_posLookbehind); //$NON-NLS-1$
-        addBracketProposal(
-            "(?<!)", 4, RegExMessages.displayString_negLookbehind, RegExMessages.additionalInfo_negLookbehind); //$NON-NLS-1$
+        addBracketProposal("(?=)", 3, RegExMessages.displayString_posLookahead, //$NON-NLS-1$
+            RegExMessages.additionalInfo_posLookahead);
+        addBracketProposal("(?!)", 3, RegExMessages.displayString_negLookahead, //$NON-NLS-1$
+            RegExMessages.additionalInfo_negLookahead);
+        addBracketProposal("(?<=)", 4, RegExMessages.displayString_posLookbehind, //$NON-NLS-1$
+            RegExMessages.additionalInfo_posLookbehind);
+        addBracketProposal("(?<!)", 4, RegExMessages.displayString_negLookbehind, //$NON-NLS-1$
+            RegExMessages.additionalInfo_negLookbehind);
 
         // greedy quantifiers
         addBracketProposal("?", 1, RegExMessages.displayString_quest, RegExMessages.additionalInfo_quest); //$NON-NLS-1$
@@ -267,7 +267,7 @@ public class RegExContentProposalProvider implements IContentProposalProvider
 
     /**
      * Computes applicable proposals for the replace field.
-     * 
+     *
      * @return the proposals
      */
     public IContentProposal[] computeReplaceProposals()
@@ -287,7 +287,7 @@ public class RegExContentProposalProvider implements IContentProposalProvider
 
     /**
      * Adds a proposal.
-     * 
+     *
      * @param proposal
      *          the string to be inserted
      * @param displayString
@@ -302,7 +302,7 @@ public class RegExContentProposalProvider implements IContentProposalProvider
 
     /**
      * Adds a proposal.
-     * 
+     *
      * @param proposal
      *          the string to be inserted
      * @param cursorPosition
@@ -319,7 +319,7 @@ public class RegExContentProposalProvider implements IContentProposalProvider
 
     /**
      * Adds a proposal to the priority proposals list.
-     * 
+     *
      * @param proposal
      *          the string to be inserted
      * @param displayString
@@ -334,7 +334,7 @@ public class RegExContentProposalProvider implements IContentProposalProvider
 
     /**
      * Adds a proposal. Ensures that existing pre- and postfixes are not duplicated.
-     * 
+     *
      * @param proposal
      *          the string to be inserted
      * @param cursorPosition
@@ -347,7 +347,8 @@ public class RegExContentProposalProvider implements IContentProposalProvider
     private void addBracketProposal(String proposal, int cursorPosition, String displayString, String additionalInfo)
     {
       String prolog = fExpression.substring(0, fDocumentOffset);
-      if (!fIsEscape && prolog.endsWith("\\") && proposal.startsWith("\\")) { //$NON-NLS-1$//$NON-NLS-2$
+      if (!fIsEscape && prolog.endsWith("\\") && proposal.startsWith("\\")) //$NON-NLS-1$//$NON-NLS-2$
+      {
         fProposals.add(new Proposal(proposal, displayString, additionalInfo, cursorPosition));
         return;
       }
@@ -360,13 +361,13 @@ public class RegExContentProposalProvider implements IContentProposalProvider
           String epilog = fExpression.substring(fDocumentOffset);
           if (epilog.startsWith(postfix))
           {
-            fPriorityProposals.add(new Proposal(proposal.substring(i, cursorPosition), displayString, additionalInfo,
-                cursorPosition - i));
+            fPriorityProposals.add(
+                new Proposal(proposal.substring(i, cursorPosition), displayString, additionalInfo, cursorPosition - i));
           }
           else
           {
-            fPriorityProposals.add(new Proposal(proposal.substring(i), displayString, additionalInfo, cursorPosition
-                - i));
+            fPriorityProposals
+                .add(new Proposal(proposal.substring(i), displayString, additionalInfo, cursorPosition - i));
           }
           return;
         }
@@ -376,7 +377,7 @@ public class RegExContentProposalProvider implements IContentProposalProvider
 
     /**
      * Adds a proposal that starts with a backslash. Ensures that the backslash is not repeated if already typed.
-     * 
+     *
      * @param proposal
      *          the string to be inserted
      * @param displayString
@@ -390,7 +391,8 @@ public class RegExContentProposalProvider implements IContentProposalProvider
       int position = proposal.length();
       // If the string already contains the backslash, do not include in
       // the proposal
-      if (prolog.endsWith("\\")) { //$NON-NLS-1$
+      if (prolog.endsWith("\\")) //$NON-NLS-1$
+      {
         position--;
         proposal = proposal.substring(1);
       }
@@ -414,7 +416,7 @@ public class RegExContentProposalProvider implements IContentProposalProvider
 
   /**
    * Creates a new completion proposal provider.
-   * 
+   *
    * @param isFind
    *          <code>true</code> if the provider is used for the 'find' field <code>false</code> if the provider is used
    *          for the 'reaplce' field
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java
index f51e323e07..7bfddcd7e1 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java
@@ -22,7 +22,7 @@ import org.eclipse.osgi.util.NLS;
  * Needed by org.eclipse.mylyn.internal.team.ui.preferences.workaround.RegExContentProposalProvider.
  * <p>
  * TODO Ask platform guys to open this API
- * 
+ *
  * @since 3.1
  */
 final class RegExMessages extends NLS
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/package-info.java
index 1b97ba0841..77aa4043a4 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Copied from org.eclipse.ui.texteditor.
  */
 package org.eclipse.net4j.util.ui.proposals;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java
index b82ef9100a..519931ff6c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java
@@ -76,8 +76,8 @@ public class CredentialsDialog extends BaseDialog<Viewer>
    */
   public CredentialsDialog(Shell shell, String realm, String title, String message)
   {
-    super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, title, message,
-        OM.Activator.INSTANCE.getDialogSettings(), OM.getImageDescriptor("icons/credentials_wiz.gif")); //$NON-NLS-1$
+    super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, title, message, OM.Activator.INSTANCE.getDialogSettings(),
+        OM.getImageDescriptor("icons/credentials_wiz.gif")); //$NON-NLS-1$
     this.realm = realm;
     users = loadUsers();
   }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java
index 6770d05969..b6802549c9 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java
@@ -35,8 +35,7 @@ import java.text.MessageFormat;
  * @author Eike Stepper
  * @since 2.0
  */
-public class InteractiveCredentialsProvider implements IPasswordCredentialsProvider2,
-    IPasswordCredentialsUpdateProvider
+public class InteractiveCredentialsProvider implements IPasswordCredentialsProvider2, IPasswordCredentialsUpdateProvider
 {
   public InteractiveCredentialsProvider()
   {
@@ -134,12 +133,13 @@ public class InteractiveCredentialsProvider implements IPasswordCredentialsProvi
             update[0] = dialog.getCredentials();
             final String newPassword = new String(update[0].getNewPassword());
 
-            MessageDialog msg = new MessageDialog(shell,
-                Messages.getString("InteractiveCredentialsProvider.0"), null, MessageFormat.format( //$NON-NLS-1$
+            MessageDialog msg = new MessageDialog(shell, Messages.getString("InteractiveCredentialsProvider.0"), null, //$NON-NLS-1$
+                MessageFormat.format(
                     Messages.getString("InteractiveCredentialsProvider.1"), //$NON-NLS-1$
-                    userID, newPassword), MessageDialog.INFORMATION, new String[] {
-                    Messages.getString("InteractiveCredentialsProvider.2"), //$NON-NLS-1$
-                    IDialogConstants.OK_LABEL }, 0)
+                    userID, newPassword),
+                MessageDialog.INFORMATION, new String[] { Messages.getString("InteractiveCredentialsProvider.2"), //$NON-NLS-1$
+              IDialogConstants.OK_LABEL },
+                0)
             {
 
               @Override
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/package-info.java
index 38f886aeaa..1c838bd5dd 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Credentials dialogs.
  */
 package org.eclipse.net4j.util.ui.security;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java
index 23bb4a17fd..fe204b6276 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerPathItemProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -25,7 +25,7 @@ import java.util.Map;
  */
 @Deprecated
 public class ContainerPathItemProvider<CONTAINER extends IContainer<Object>> extends ContainerItemProvider<CONTAINER>
-    implements ITreePathContentProvider
+implements ITreePathContentProvider
 {
   private Map<Object, List<TreePath>> parents = new HashMap<Object, List<TreePath>>();
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
index d61e673006..f6d17b3bc3 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
@@ -693,8 +693,8 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
   {
     private CollapseAllAction()
     {
-      super(
-          Messages.getString("ContainerView_3"), Messages.getString("ContainerView_4"), getCollapseAllImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
+      super(Messages.getString("ContainerView_3"), Messages.getString("ContainerView_4"), //$NON-NLS-1$ //$NON-NLS-2$
+          getCollapseAllImageDescriptor());
     }
 
     @Override
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/IElementFilter.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/IElementFilter.java
index aedc257bb9..f40f53906c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/IElementFilter.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/IElementFilter.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java
index ba023f5038..8e864a9f48 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java
@@ -34,8 +34,8 @@ import org.eclipse.ui.PlatformUI;
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class ItemProvider<INPUT> extends StructuredContentProvider<INPUT> implements ITreeContentProvider,
-    ILabelProvider, IColorProvider, IFontProvider, IStyledLabelProvider
+public abstract class ItemProvider<INPUT> extends StructuredContentProvider<INPUT>
+    implements ITreeContentProvider, ILabelProvider, IColorProvider, IFontProvider, IStyledLabelProvider
 {
   public static final Object[] NO_ELEMENTS = {};
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
index 0254b957ab..9d6c76be14 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -198,8 +198,8 @@ public abstract class MasterDetailsView extends MultiViewersView
     }
 
     // Temporarily remember old values
-    String oldDetailTitle = detailItems == null || currentDetailIndex < 0 ? null : detailItems[currentDetailIndex]
-        .getText();
+    String oldDetailTitle = detailItems == null || currentDetailIndex < 0 ? null
+        : detailItems[currentDetailIndex].getText();
     StructuredViewer[] oldDetails = details;
     CTabItem[] oldDetailItems = detailItems;
 
@@ -301,8 +301,8 @@ public abstract class MasterDetailsView extends MultiViewersView
   {
     public RefreshAction()
     {
-      super(
-          Messages.getString("MasterDetailsView_2"), Messages.getString("MasterDetailsView_3"), OM.getImageDescriptor("icons/full/etool16/refresh.gif")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+      super(Messages.getString("MasterDetailsView_2"), Messages.getString("MasterDetailsView_3"), //$NON-NLS-1$ //$NON-NLS-2$
+          OM.getImageDescriptor("icons/full/etool16/refresh.gif")); //$NON-NLS-1$
     }
 
     @Override
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MultiViewersView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MultiViewersView.java
index 1b71bb30d7..a364aba21d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MultiViewersView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MultiViewersView.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/package-info.java
index 3994cbda60..fb40da2e66 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Helpers for Eclipse view parts.
  */
 package org.eclipse.net4j.util.ui.views;
-
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/CoolBarComposite.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/CoolBarComposite.java
index 724e415bf9..d07a753d74 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/CoolBarComposite.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/CoolBarComposite.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
index a9a50f061d..865e65fce5 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Text;
 
 /**
  * TODO extend BaseDialog
- * 
+ *
  * @author Eike Stepper
  */
 public class HistoryTextDialog extends InputDialog
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/OneBorderComposite.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/OneBorderComposite.java
index 53058b41e6..b780506f7e 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/OneBorderComposite.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/OneBorderComposite.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/package-info.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/package-info.java
index 5ce51e2358..c3495f2538 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/package-info.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * A library with reusable widgets.
  */
 package org.eclipse.net4j.util.ui.widgets;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
index 753900e30e..bf6c7a332b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
@@ -162,7 +162,7 @@ public abstract class AbstractPlatform implements OMPlatform
         try
         {
           URI uri = new URI(state);
-          state = new File(new File(uri), ".metadata").getAbsolutePath(); //$NON-NLS-1$;
+          state = new File(new File(uri), ".metadata").getAbsolutePath(); //$NON-NLS-1$ ;
         }
         catch (Exception ex)
         {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
index 0de332d1c7..284421b57b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -28,7 +28,7 @@ import org.osgi.framework.BundleContext;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
index eed81866b9..76f32d5467 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
@@ -211,8 +211,8 @@ public class PluginElementProcessorList extends Lifecycle implements List<IEleme
       return;
     }
 
-    org.eclipse.core.runtime.IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(
-        NAMESPACE, EXT_POINT);
+    org.eclipse.core.runtime.IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(NAMESPACE,
+        EXT_POINT);
     for (org.eclipse.core.runtime.IConfigurationElement element : elements)
     {
       IElementProcessor processor = (IElementProcessor)element.createExecutableExtension(ATTR_CLASS);
@@ -246,6 +246,6 @@ public class PluginElementProcessorList extends Lifecycle implements List<IEleme
     }
 
     extensionRegistry
-        .removeRegistryChangeListener((org.eclipse.core.runtime.IRegistryChangeListener)extensionRegistryListener);
+    .removeRegistryChangeListener((org.eclipse.core.runtime.IRegistryChangeListener)extensionRegistryListener);
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
index 7a57517c18..bb65771eb6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
@@ -103,8 +103,8 @@ public class PluginFactoryRegistry extends HashMapRegistry<IFactoryKey, IFactory
       return;
     }
 
-    org.eclipse.core.runtime.IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(
-        NAMESPACE, EXT_POINT);
+    org.eclipse.core.runtime.IConfigurationElement[] elements = extensionRegistry.getConfigurationElementsFor(NAMESPACE,
+        EXT_POINT);
     for (org.eclipse.core.runtime.IConfigurationElement element : elements)
     {
       registerFactory(new FactoryDescriptor(element));
@@ -137,6 +137,6 @@ public class PluginFactoryRegistry extends HashMapRegistry<IFactoryKey, IFactory
     }
 
     extensionRegistry
-        .removeRegistryChangeListener((org.eclipse.core.runtime.IRegistryChangeListener)extensionRegistryListener);
+    .removeRegistryChangeListener((org.eclipse.core.runtime.IRegistryChangeListener)extensionRegistryListener);
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
index 2a006158c4..ff41494fd3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
@@ -333,7 +333,7 @@ public class LegacyBundle extends AbstractBundle
 
   /**
    * TODO Make configurable
-   * 
+   *
    * @see org.eclipse.emf.common.util.URI#isArchiveScheme(String)
    */
   private static boolean isArchiveProtocol(String scheme)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
index 898d17c4d8..d5f2cbb67f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java
index 8df9851b86..03bcdb77ca 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ArrayUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ArrayUtil.java
index 80a396fbc4..4ac44ae309 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ArrayUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ArrayUtil.java
@@ -14,7 +14,7 @@ import java.lang.reflect.Array;
 
 /**
  * Various static helper methods.
- * 
+ *
  * @author Eike Stepper
  * @since 3.4
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
index c2d092a599..d8a7d395b5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util;
 
 /**
  * Provides static methods that check object states and invocation arguments.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
index dce3846a92..510ae1ce75 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
@@ -16,12 +16,13 @@ import java.io.IOException;
 
 /**
  * Provides static methods that convert to and from hexadecimal string formats.
- * 
+ *
  * @author Eike Stepper
  */
 public final class HexUtil
 {
-  public static final char DIGITS[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', };
+  public static final char DIGITS[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e',
+      'f', };
 
   private HexUtil()
   {
@@ -29,7 +30,7 @@ public final class HexUtil
 
   /**
    * Converts a byte array into a string of lower case hex chars.
-   * 
+   *
    * @param bs
    *          A byte array
    * @param off
@@ -106,7 +107,7 @@ public final class HexUtil
 
   /**
    * Converts a String of hex characters into an array of bytes.
-   * 
+   *
    * @param s
    *          A string of hex characters (upper case or lower) of even length.
    * @param out
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IErrorHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IErrorHandler.java
index 4da2e4a63f..f08c9447d7 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IErrorHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IErrorHandler.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util;
 
 /**
  * A callback interface with a {@link #handleError(Throwable) handleError()} method.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java
index 937506b57b..b19e8fb69b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ImplementationError.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util;
 
 /**
  * Should not be used anymore in favour of {@link AssertionError}. Likely to be deprecated soon.
- * 
+ *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
  * @apiviz.exclude
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ObjectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ObjectUtil.java
index e86bfd35b8..a675d87a12 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ObjectUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ObjectUtil.java
@@ -152,11 +152,11 @@ public final class ObjectUtil
 
   /**
    * Attempts to cast an {@code object} as an instance of the given {@code type}.
-   * 
+   *
    * @param object an object to cast to some {@code type}
    * @param type the type to cast the {@code object} to
    * @return the {@code object} or {@code null} if it is not of the required {@code type}
-   * 
+   *
    * @since 3.4
    */
   public static <T> T tryCast(Object object, Class<T> type)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
index 18578feb94..7fb9f8879d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
@@ -232,7 +232,7 @@ public final class ReflectUtil
 
   /**
    * Prints the stack trace of the current thread to {@link System#err}.
-   * 
+   *
    * @since 3.4
    */
   public static void printStackTrace()
@@ -387,7 +387,7 @@ public final class ReflectUtil
 
   public static Object instantiate(Map<Object, Object> properties, String namespace, String classKey,
       ClassLoader classLoader) throws ClassNotFoundException, InstantiationException, IllegalAccessException,
-      IllegalArgumentException, InvocationTargetException
+          IllegalArgumentException, InvocationTargetException
   {
     if (namespace != null)
     {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java
index d16b0c7f6d..6701e39043 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/UUIDGenerator.java
@@ -20,7 +20,7 @@ import java.util.Random;
 
 /**
  * Generates 16 byte UUID values and can encode them to Strings, decode from Strings respectively.
- * 
+ *
  * @author Eike Stepper
  * @since 3.2
  */
@@ -134,9 +134,9 @@ public final class UUIDGenerator
   }
 
   private static final char[] BASE64_DIGITS = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-      'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
-      'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
-      '6', '7', '8', '9', '-', '_' };
+    'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
+      'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
+      '8', '9', '-', '_' };
 
   private static final byte[] BASE64_INDEX;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java
index b9b0446131..63973d2c8b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/WrappedException.java
@@ -13,7 +13,7 @@ package org.eclipse.net4j.util;
 /**
  * An unchecked exception that wraps a checked exception. Wrapping occurs conditionally in the static
  * {@link #wrap(Exception, String) wrap()} methods.
- * 
+ *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/Cache.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/Cache.java
index 1abca7f944..8085b6c193 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/Cache.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/Cache.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheRegistration.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheRegistration.java
index e543be3071..a39e5f7983 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheRegistration.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheRegistration.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java
index 8feca53849..5df6c6b06f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICache.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICache.java
index e3c5f5f651..a05654f396 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICache.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICache.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitor.java
index e04bbe1a6f..68e73a0013 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheMonitor.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheProbe.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheProbe.java
index 1d1a04cf2a..a970961314 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheProbe.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheProbe.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheRegistration.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheRegistration.java
index 3ef1a1c248..c161a38d43 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheRegistration.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ICacheRegistration.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.java
index a2ed414b46..926389694f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/package-info.java
index 12c924b19f..f96dd6dc5d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * A generic caching and memory monitoring framework.
  */
 package org.eclipse.net4j.util.cache;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/ArrayIterator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/ArrayIterator.java
index d1a9fe6b05..73ad318822 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/ArrayIterator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/ArrayIterator.java
@@ -15,7 +15,7 @@ import java.util.NoSuchElementException;
 
 /**
  * An object that iterates over the elements of an array
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  */
@@ -61,7 +61,7 @@ public class ArrayIterator<T> implements Iterator<T>
 
   /**
    * Unsupported.
-   * 
+   *
    * @throws UnsupportedOperationException
    *           always
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/BidiMapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/BidiMapper.java
index b158c2052d..4d6f9aa6fb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/BidiMapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/BidiMapper.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/ByteArrayWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/ByteArrayWrapper.java
index 48de224857..8b7f340984 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/ByteArrayWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/ByteArrayWrapper.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.java
index 744985c802..b54f2c2ca8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Closeable.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Closeable.java
index 434ae5bf37..df3a06ef04 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Closeable.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Closeable.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/CloseableIterator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/CloseableIterator.java
index c43c820c40..d9a4959873 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/CloseableIterator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/CloseableIterator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import java.util.Iterator;
 
 /**
  * A closeable iterator.
- * 
+ *
  * @author Eike Stepper
  */
 public interface CloseableIterator<E> extends Iterator<E>, Closeable
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/DynamicArray.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/DynamicArray.java
index 2e1246cbc3..ae75b96c4b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/DynamicArray.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/DynamicArray.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/GrowingRandomAccessList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/GrowingRandomAccessList.java
index 7232fd6987..7425528b50 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/GrowingRandomAccessList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/GrowingRandomAccessList.java
@@ -24,7 +24,7 @@ import java.util.RandomAccess;
  * @author Eike Stepper
  * @since 3.3
  */
-public class GrowingRandomAccessList<E> extends AbstractList<E> implements Queue<E>, RandomAccess
+public class GrowingRandomAccessList<E> extends AbstractList<E>implements Queue<E>, RandomAccess
 {
   private final Class<E> componentType;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java
index 4610c82212..5ad6feb181 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistory.java
index 96e32e06ee..2811173e98 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java
index b41aed046d..c886948e28 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java
index 68c30475b4..07c6244ccf 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableArrayList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableArrayList.java
index 41dc4fc0a3..9088761e16 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableArrayList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableArrayList.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
  *
  * @author Eike Stepper
  */
-public class MoveableArrayList<E> extends ArrayList<E> implements MoveableList<E>
+public class MoveableArrayList<E> extends ArrayList<E>implements MoveableList<E>
 {
   private static final long serialVersionUID = 1L;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableList.java
index 0eeee9d666..d0fa91513d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableList.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/PreferenceHistory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/PreferenceHistory.java
index e2a2e488b3..38e87da0e7 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/PreferenceHistory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/PreferenceHistory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package-info.java
index a0ffc6f28d..48ac38dcd4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * @apiviz.exclude .*
  */
 package org.eclipse.net4j.util.collection;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.java
index 0bb6612ec5..445f67e3bc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.java
index cd88064704..9d2dc42ef4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.java
@@ -63,64 +63,64 @@ public class ExecutorServiceFactory extends Factory
     final ExecutorService executorService = Executors.newCachedThreadPool(threadFactory);
     return LifecycleUtil.delegateLifecycle(getClass().getClassLoader(), executorService, ExecutorService.class,
         new ILifecycle()
+    {
+      private boolean active;
+
+      public void activate() throws LifecycleException
+      {
+        active = true;
+      }
+
+      public Exception deactivate()
+      {
+        try
         {
-          private boolean active;
-
-          public void activate() throws LifecycleException
-          {
-            active = true;
-          }
-
-          public Exception deactivate()
-          {
-            try
-            {
-              executorService.shutdown();
-              active = false;
-              return null;
-            }
-            catch (Exception ex)
-            {
-              return ex;
-            }
-          }
-
-          public LifecycleState getLifecycleState()
-          {
-            return active ? LifecycleState.ACTIVE : LifecycleState.INACTIVE;
-          }
-
-          public boolean isActive()
-          {
-            return active;
-          }
-
-          public void addListener(IListener listener)
-          {
-            // Do nothing
-          }
-
-          public void removeListener(IListener listener)
-          {
-            // Do nothing
-          }
-
-          public IListener[] getListeners()
-          {
-            return EventUtil.NO_LISTENERS;
-          }
-
-          public boolean hasListeners()
-          {
-            return false;
-          }
-
-          @Override
-          public String toString()
-          {
-            return "CachedThreadPool";
-          }
-        });
+          executorService.shutdown();
+          active = false;
+          return null;
+        }
+        catch (Exception ex)
+        {
+          return ex;
+        }
+      }
+
+      public LifecycleState getLifecycleState()
+      {
+        return active ? LifecycleState.ACTIVE : LifecycleState.INACTIVE;
+      }
+
+      public boolean isActive()
+      {
+        return active;
+      }
+
+      public void addListener(IListener listener)
+      {
+        // Do nothing
+      }
+
+      public void removeListener(IListener listener)
+      {
+        // Do nothing
+      }
+
+      public IListener[] getListeners()
+      {
+        return EventUtil.NO_LISTENERS;
+      }
+
+      public boolean hasListeners()
+      {
+        return false;
+      }
+
+      @Override
+      public String toString()
+      {
+        return "CachedThreadPool";
+      }
+    });
   }
 
   public static ExecutorService get(IManagedContainer container)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ICorrelator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ICorrelator.java
index 47e3f53b23..b2061f90a4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ICorrelator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ICorrelator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java
index 319aceb159..ed103e8ebf 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWLockManager.java
@@ -16,7 +16,7 @@ import java.util.Collection;
  * Support Multiple reads/no write and upgrade lock from read to write. Many context could request
  * {@link LockType#WRITE write} lock at the same time. It will privileges first context that has already a
  * {@link LockType#READ read} lock. If no one has any read lock, it's "first come first serve".
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  */
@@ -33,7 +33,7 @@ public interface IRWLockManager<OBJECT, CONTEXT>
 
   /**
    * Attempts to release for a given locktype, context and objects.
-   * 
+   *
    * @throws IllegalMonitorStateException
    *           Unlocking objects without lock.
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java
index b10def8648..cb11385598 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IRWOLockManager.java
@@ -4,7 +4,7 @@
  * 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:
  *    Caspar De Groot - initial API and implementation
  */
@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * A {@link IRWLockManager read/write lock manager} that supports {@link IRWLockManager.LockType#OPTION write option}
  * locks.
- * 
+ *
  * @author Caspar De Groot
  * @since 3.2
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java
index dd5d1d2c25..443a5d45a1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java
@@ -4,7 +4,7 @@
  * 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,7 +15,7 @@ package org.eclipse.net4j.util.concurrent;
  * consumer must have access to this {@link ISynchronizer} and there must only ever exist one consumer for it. Once the
  * result value is consumed by the consumer this {@link ISynchronizer} must not be reused.
  * <p>
- * 
+ *
  * @author Eike Stepper
  */
 public interface ISynchronizer<RESULT>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java
index 9c74c33b03..fa519aa7a2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/OnePendingExecutor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/OnePendingExecutor.java
index 4efc4b2eb3..92ab5c648c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/OnePendingExecutor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/OnePendingExecutor.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueRunner.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueRunner.java
index 82bf5dbf10..15b80874b2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueRunner.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/QueueRunner.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
index 3bd5deeab4..da8951bc3c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
@@ -29,7 +29,7 @@ import java.util.Set;
  * Support Multiple reads/no write and upgrade lock from read to write. Many context could request
  * {@link IRWLockManager.LockType#WRITE write} lock at the same time. It will privileges first context that has already
  * a {@link IRWLockManager.LockType#READ read} lock. If no one has any read lock, it's "first come first serve".
- * 
+ *
  * @author Simon McDuff
  * @since 2.0
  * @deprecated Use {@link RWOLockManager}
@@ -130,7 +130,7 @@ public class RWLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWLock
 
   /**
    * Attempts to release for a given locktype, context and objects.
-   * 
+   *
    * @throws IllegalMonitorStateException
    *           Unlocking objects without lock.
    * @since 3.0
@@ -267,7 +267,7 @@ public class RWLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWLock
    * Attempts to release this lock.
    * <p>
    * If the number of context is now zero then the lock is made available for write lock attempts.
-   * 
+   *
    * @throws IllegalMonitorStateException
    *           Unlocking object not locked.
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RoundRobinList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RoundRobinList.java
index 605ae181ad..0c361a2d82 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RoundRobinList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RoundRobinList.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Sleeper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Sleeper.java
index 06da07c4cb..80896594d2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Sleeper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Sleeper.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.java
index 1bf21139fe..6819932258 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/TrackableTimerTask.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/TrackableTimerTask.java
index 8cca7eb369..213d169559 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/TrackableTimerTask.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/TrackableTimerTask.java
@@ -29,11 +29,11 @@ public abstract class TrackableTimerTask extends TimerTask
   /**
    * The boolean value of the system property <code>org.eclipse.net4j.util.concurrent.TrackTimerTasks</code>.
    */
-  public static final boolean TRACK_TIMER_TASKS = Boolean.parseBoolean(OMPlatform.INSTANCE.getProperty(
-      "org.eclipse.net4j.util.concurrent.TrackTimerTasks", "false"));
+  public static final boolean TRACK_TIMER_TASKS = Boolean
+      .parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.util.concurrent.TrackTimerTasks", "false"));
 
-  private static final Map<TrackableTimerTask, ConstructionInfo> CONSTRUCTION_INFOS = TRACK_TIMER_TASKS ? new WeakHashMap<TrackableTimerTask, ConstructionInfo>()
-      : null;
+  private static final Map<TrackableTimerTask, ConstructionInfo> CONSTRUCTION_INFOS = TRACK_TIMER_TASKS
+      ? new WeakHashMap<TrackableTimerTask, ConstructionInfo>() : null;
 
   protected TrackableTimerTask()
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package-info.java
index 12fd804b0c..49f9a16946 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * @apiviz.exclude .*
  */
 package org.eclipse.net4j.util.concurrent;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/Confirmation.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/Confirmation.java
index b7a721e87e..8f5929b1fa 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/Confirmation.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/Confirmation.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -12,10 +12,10 @@ package org.eclipse.net4j.util.confirmation;
 
 /**
  * An enumeration of possible answers to a {@linkplain IConfirmationProvider request for confirmation}.
- * 
+ *
  * @author Christian W. Damus (CEA LIST)
  * @since 3.4
- * 
+ *
  * @see IConfirmationProvider
  */
 public enum Confirmation
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/IConfirmationProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/IConfirmationProvider.java
index 2f9cf5f2f2..8a920e72f3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/IConfirmationProvider.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/IConfirmationProvider.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -16,7 +16,7 @@ import java.util.Set;
 
 /**
  * A provider of user confirmation of some action.
- * 
+ *
  * @author Christian W. Damus (CEA LIST)
  * @since 3.4
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/package-info.java
index 2752a495fd..98b38ad74b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/confirmation/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 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) 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
  */
 
 /**
  * A framework for providing confirmation from users.
  */
 package org.eclipse.net4j.util.confirmation;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerDelta.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerDelta.java
index aed8310c11..be05b4f9e0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerDelta.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerDelta.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.container;
 
 /**
  * A default {@link IContainerDelta container delta} implementation.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
index c5422a712c..cc7175e75f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
@@ -21,7 +21,7 @@ import org.eclipse.net4j.util.security.RandomizerFactory;
 
 /**
  * Various static helper methods for dealing with {@link IContainer containers}.
- * 
+ *
  * @author Eike Stepper
  */
 public final class ContainerUtil
@@ -113,7 +113,7 @@ public final class ContainerUtil
   /**
    * Creates a new managed container that discovers factory and element processor
    * registrations in plug-in extensions.
-   * 
+   *
    * @since 3.3
    */
   public static IManagedContainer createPluginContainer()
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java
index ddbba0b531..67376333cc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/FactoryNotFoundException.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.factory.IFactoryKey;
 /**
  * An unchecked exception that indicates the absence of a {@link IFactory factory} identified by
  * {@link IFactoryKey#getProductGroup() product group} and {@link IFactoryKey#getType() type}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
  * @apiviz.exclude
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java
index 65533a7f82..7215c05bd9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.container;
 
 /**
  * Describes the addition or removal of a single element from a {@link IContainer container}.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IContainerDelta<E>
@@ -23,7 +23,7 @@ public interface IContainerDelta<E>
 
   /**
    * Enumerates the possible {@link IContainerDelta container delta} kinds {@link #ADDED} or {@link #REMOVED}.
-   * 
+   *
    * @author Eike Stepper
    * @apiviz.exclude
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java
index bf351f5e65..1ac6ae0292 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.util.event.IEvent;
 
 /**
  * An {@link IEvent event} fired from a {@link IContainer container} when its elements have changed.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java
index 16e2a0bdfa..e815b82079 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.container;
 
 /**
  * A callback interface for visiting {@link IContainerDelta container deltas}.
- * 
+ *
  * @see IContainerEvent#accept(IContainerEventVisitor)
  * @author Eike Stepper
  * @apiviz.exclude
@@ -26,7 +26,7 @@ public interface IContainerEventVisitor<E>
   /**
    * An extension interface for {@link IContainerEventVisitor container event visitors} that can {@link #filter(Object)
    * filter} deltas from being visited.
-   * 
+   *
    * @see IContainerEvent#accept(IContainerEventVisitor)
    * @author Eike Stepper
    * @apiviz.exclude
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java
index a81d59bd05..f23804f870 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.container;
 
 /**
  * Processes elements of a {@link IManagedContainer managed container} when they're added to the container.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IElementProcessor
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
index 007fbae6e1..9e95377bb6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -25,7 +25,7 @@ import java.util.Set;
 /**
  * A {@link IContainer container} that populates itself by means of element {@link #getFactoryRegistry() factories} and
  * {@link #getPostProcessors() post processors} .
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ISlow.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ISlow.java
index 8862b30c9f..0c6afd74cf 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ISlow.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ISlow.java
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.container;
 
 /**
  * A marker interface to indicate that some method calls may be slow.
- * 
+ *
  * @author Eike Stepper
  * @since 3.1
  * @apiviz.exclude
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/LifecycleEventConverter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/LifecycleEventConverter.java
index 5f8cb34300..ef40a4d531 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/LifecycleEventConverter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/LifecycleEventConverter.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
 /**
  * A delegating {@link IListener listener} that converts {@link ILifecycleEvent lifecycle events} into
  * {@link IContainerEvent container events}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java
index fbedc8134f..74080a805f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SetContainer.java
@@ -29,7 +29,7 @@ import java.util.Set;
  * @see IContainerSet
  * @see IContainerSortedSet
  */
-public class SetContainer<E> extends Container<E> implements IContainer.Modifiable<E>, IContainer.Persistable<E>
+public class SetContainer<E> extends Container<E>implements IContainer.Modifiable<E>, IContainer.Persistable<E>
 {
   private final Class<E> componentType;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/AbstractDelegator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/AbstractDelegator.java
index 21140dcf5b..e345960f05 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/AbstractDelegator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/AbstractDelegator.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
 
 /**
  * A delegating base class for {@link IContainer containers}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
@@ -82,7 +82,7 @@ public abstract class AbstractDelegator<E> extends Notifier implements IContaine
 
   /**
    * A delegating {@link Iterator iterator}.
-   * 
+   *
    * @author Eike Stepper
    * @apiviz.exclude
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.java
index afb823b150..232e24ed59 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.java
@@ -20,11 +20,11 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * A default implementation of a {@link IContainerBlockingQueue container blocking queue}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
-public class ContainerBlockingQueue<E> extends ContainerQueue<E> implements IContainerBlockingQueue<E>
+public class ContainerBlockingQueue<E> extends ContainerQueue<E>implements IContainerBlockingQueue<E>
 {
   public ContainerBlockingQueue(BlockingQueue<E> delegate)
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerCollection.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerCollection.java
index 53383f446c..d1c06cfb9d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerCollection.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerCollection.java
@@ -19,11 +19,11 @@ import java.util.Iterator;
 
 /**
  * A default implementation of a {@link IContainerCollection container collection}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
-public class ContainerCollection<E> extends AbstractDelegator<E> implements IContainerCollection<E>
+public class ContainerCollection<E> extends AbstractDelegator<E>implements IContainerCollection<E>
 {
   private Collection<E> delegate;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerList.java
index 496bba77ff..5ba30c1d24 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerList.java
@@ -20,11 +20,11 @@ import java.util.ListIterator;
 
 /**
  * A default implementation of a {@link IContainerList container list}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
-public class ContainerList<E> extends ContainerCollection<E> implements IContainerList<E>
+public class ContainerList<E> extends ContainerCollection<E>implements IContainerList<E>
 {
   public ContainerList(List<E> delegate)
   {
@@ -138,7 +138,7 @@ public class ContainerList<E> extends ContainerCollection<E> implements IContain
 
   /**
    * A delegating {@link ListIterator list iterator}.
-   * 
+   *
    * @author Eike Stepper
    * @apiviz.exclude
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java
index e2da02360f..79ffab4d13 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerMap.java
@@ -22,11 +22,11 @@ import java.util.Set;
 
 /**
  * A default implementation of a {@link IContainerMap container map}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
-public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> implements IContainerMap<K, V>
+public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>>implements IContainerMap<K, V>
 {
   private Map<K, V> delegate;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerQueue.java
index 7386e581b9..a650dc820f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerQueue.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerQueue.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,11 +14,11 @@ import java.util.Queue;
 
 /**
  * A default implementation of a {@link IContainerQueue container queue}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
-public class ContainerQueue<E> extends ContainerCollection<E> implements IContainerQueue<E>
+public class ContainerQueue<E> extends ContainerCollection<E>implements IContainerQueue<E>
 {
   public ContainerQueue(Queue<E> delegate)
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSet.java
index c9b5a44f86..86ddd5226d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSet.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSet.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,11 +14,11 @@ import java.util.Set;
 
 /**
  * A default implementation of a {@link IContainerSet container set}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
-public class ContainerSet<E> extends ContainerCollection<E> implements IContainerSet<E>
+public class ContainerSet<E> extends ContainerCollection<E>implements IContainerSet<E>
 {
   public ContainerSet(Set<E> delegate)
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.java
index cc613d4e0c..0ed5528a68 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.java
@@ -4,7 +4,7 @@
  * 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,11 +15,11 @@ import java.util.SortedSet;
 
 /**
  * A default implementation of a {@link IContainerSortedSet container sorted set}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
-public class ContainerSortedSet<E> extends ContainerSet<E> implements IContainerSortedSet<E>
+public class ContainerSortedSet<E> extends ContainerSet<E>implements IContainerSortedSet<E>
 {
   public ContainerSortedSet(SortedSet<E> delegate)
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java
index fbfaa6c263..bf9dc8cbeb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import java.util.Collection;
 
 /**
  * A {@link IContainer container} that is a {@link Collection}.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IContainerCollection<E> extends IContainer<E>, Collection<E>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerList.java
index 55a7bbc5e3..3fc91b2a2f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerList.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import java.util.List;
 
 /**
  * A {@link IContainer container} that is a {@link List}.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IContainerList<E> extends IContainerCollection<E>, List<E>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java
index 2efe99cd77..b8815cc34b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import java.util.Map;
 
 /**
  * A {@link IContainer container} (of {@link java.util.Map.Entry map entries}) that is a {@link Map}.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IContainerMap<K, V> extends IContainer<Map.Entry<K, V>>, Map<K, V>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java
index d5f094da0d..15c0894aa0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import java.util.Queue;
 
 /**
  * A {@link IContainer container} that is a {@link Queue}.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IContainerQueue<E> extends IContainerCollection<E>, Queue<E>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java
index 856203904d..d4398002f9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import java.util.SortedSet;
 
 /**
  * A {@link IContainer container} that is a {@link SortedSet}.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IContainerSortedSet<E> extends IContainerSet<E>, SortedSet<E>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/package-info.java
index f687a04e66..03244eb252 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Hybrid interfaces of notifying containers and the Java Collection Framework.
  */
 package org.eclipse.net4j.util.container.delegate;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/package-info.java
index 072a1d766b..a347d9c96d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * A framework of notifying collections and wiring containers.
  */
 package org.eclipse.net4j.util.container;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Event.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Event.java
index b23d64b1cb..fa20e59d3e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Event.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Event.java
@@ -15,7 +15,7 @@ import java.util.EventObject;
 
 /**
  * A default implementation of an {@link IEvent event}.
- * 
+ *
  * @author Eike Stepper
  */
 public class Event extends EventObject implements IEvent
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ExecutorServiceNotifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ExecutorServiceNotifier.java
index d7a69f6aa4..bf3a89bbd4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ExecutorServiceNotifier.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ExecutorServiceNotifier.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import java.util.concurrent.ExecutorService;
 
 /**
  * Deprecated.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @apiviz.exclude
@@ -41,7 +41,7 @@ public class ExecutorServiceNotifier extends Notifier
 
   /**
    * Deprecated.
-   * 
+   *
    * @author Eike Stepper
    * @apiviz.exclude
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java
index 0beeda675e..5d64092459 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.event;
 
 /**
  * An event that is fired from a {@link INotifier notifier} and can be handled by {@link IListener listeners}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.landmark
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java
index e50480e944..1ec900a7c2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import java.util.EventListener;
 
 /**
  * A callback interface that {@link INotifier notifiers} use to pass {@link IEvent events} to.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.landmark
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java
index 3d50419c3d..c1da331e0f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java
@@ -18,7 +18,7 @@ package org.eclipse.net4j.util.event;
  * to receive and handle.
  * <p>
  * Implementors may want to extend {@link Notifier} instead of implementing this interface directly.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.landmark
  * @apiviz.owns {@link IListener} - - listeners
@@ -41,7 +41,7 @@ public interface INotifier
 
   /**
    * Returns <code>true</code> if one or more listeners are registered with this notifier, <code>false</code> otherwise.
-   * 
+   *
    * @since 3.0
    */
   public boolean hasListeners();
@@ -50,7 +50,7 @@ public interface INotifier
    * Returns the listeners that are registered with this notifier.
    * <p>
    * Depending on the implementation duplicate listeners may be contained in the returned array.
-   * 
+   *
    * @since 3.0
    */
   public IListener[] getListeners();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueEvent.java
index c719e2ce71..6e05fca44b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueEvent.java
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.event;
 
 /**
  * An {@link IEvent} fired from {@link ValueNotifier value notifiers} after value changes.
- * 
+ *
  * @author Eike Stepper
  * @since 3.1
  * @noextend This class is not intended to be subclassed by clients.
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueNotifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueNotifier.java
index cf83ce435b..58b20160e9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueNotifier.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/ValueNotifier.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.ObjectUtil;
  * <ul>
  * <li> {@link ValueEvent} after value changes.
  * </ul>
- * 
+ *
  * @author Eike Stepper
  * @since 3.1
  * @apiviz.has {@link java.lang.Object} oneway - - value
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/package-info.java
index 3b72e39713..1a2c03846a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * A framework for sending of and listening to events.
  */
 package org.eclipse.net4j.util.event;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/Factory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/Factory.java
index 3890ac980b..d8846e5571 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/Factory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/Factory.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import java.text.MessageFormat;
 
 /**
  * A default implementation of a {@link IFactory factory}.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class Factory implements IFactory
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryCreationException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryCreationException.java
index 10a71ea975..9ca56e8971 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryCreationException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryCreationException.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.factory;
 
 /**
  * Thrown from {@link FactoryDescriptor#createFactory()} if a {@link IFactory factory} could not be created.
- * 
+ *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
  * @apiviz.exclude
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java
index 0f41daf7c0..47f1f970e6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IExtensionRegistry;
  * A {@link IFactory factory} that delegates to an {@link IExtensionRegistry extension registry} contribution.
  * <p>
  * Example contribution:
- * 
+ *
  * <pre>
  *    &lt;extension
  *          point="org.eclipse.net4j.util.factories">
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.IExtensionRegistry;
  *             type="daemon"/>
  *    &lt;/extension>
  * </pre>
- * 
+ *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
  * @apiviz.exclude
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java
index 5ad2b7fded..b3f87f2cf6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import java.text.MessageFormat;
 
 /**
  * A default implementation of a {@link IFactoryKey factory key}.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
index 2044823d56..7977f37f4e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
@@ -4,7 +4,7 @@
  * 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
  *    Christian W. Damus (CEA) - bug 399641: container-aware factories
@@ -19,11 +19,11 @@ import org.eclipse.net4j.util.container.IManagedContainerFactory;
  * <p>
  * If a factory is registered in an {@link IManagedContainer}, the {@link IManagedContainerFactory} extension interface
  * injects that container into the factory for it to reach back into to obtain dependencies.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.landmark
  * @apiviz.has {@link IFactoryKey}
- * 
+ *
  * @see IManagedContainerFactory
  */
 public interface IFactory
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java
index 5c4a732bd1..823b2a5069 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.factory;
 
 /**
  * Identifies a {@link IFactory factory} by {@link #getProductGroup() product group} and {@link #getType() type}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java
index 8b4b76f870..57648297d2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.net4j.util.factory;
 /**
  * An unchecked exception that may be thrown from {@link IFactory factories} to indicate the inability to create a
  * product.
- * 
+ *
  * @author Eike Stepper
  * @noextend This class is not intended to be subclassed by clients.
  * @apiviz.exclude
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/package-info.java
index cf0dd4d5f2..6a96e615a4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * A framework for factory based instance creation.
  */
 package org.eclipse.net4j.util.factory;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
index 333dc25de9..47f2cb75a4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
@@ -27,7 +27,7 @@ import java.text.MessageFormat;
  * <ul>
  * <li> {@link StateChangedEvent} after state changes of a <i>subject</i>.
  * </ul>
- * 
+ *
  * @author Eike Stepper
  * @apiviz.landmark
  * @apiviz.has {@link ITransition} oneway - - matrix
@@ -236,7 +236,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
 
   /**
    * A {@link ITransition transition} that does nothing.
-   * 
+   *
    * @author Eike Stepper
    * @deprecated Use {@link FiniteStateMachine#IGNORE}
    * @apiviz.exclude
@@ -258,7 +258,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
 
   /**
    * A {@link ITransition transition} that throws an {@link IllegalStateException}.
-   * 
+   *
    * @author Eike Stepper
    * @deprecated Use {@link FiniteStateMachine#FAIL}
    * @apiviz.exclude
@@ -280,7 +280,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
 
   /**
    * A {@link ITransition transition} that does nothing.
-   * 
+   *
    * @author Eike Stepper
    * @apiviz.exclude
    */
@@ -300,7 +300,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
 
   /**
    * A {@link ITransition transition} that throws an {@link IllegalStateException}.
-   * 
+   *
    * @author Eike Stepper
    * @apiviz.exclude
    */
@@ -320,7 +320,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
 
   /**
    * A {@link ITransition transition} that changes the {@link #getTargetState() state} of a <i>subject</i>.
-   * 
+   *
    * @author Eike Stepper
    */
   public class ChangeStateTransition implements ITransition<STATE, EVENT, SUBJECT, Object>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
index 6f5686afc5..406871893c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.fsm;
 
 /**
  * Encpsulates the logic to be executed when an <i>event</i> arrives for a <i>subject</i> in a particular <i>state</i>.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.landmark
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/package-info.java
index 4af69f5592..d7d508be57 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * A framework for <a href="http://en.wikipedia.org/wiki/Finite-state_machine">finite state machines</a>.
  */
 package org.eclipse.net4j.util.fsm;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java
index 2c4ff35a4d..a94d88a816 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java
index 51e79f97c3..c79e71fcea 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -23,7 +23,7 @@ import java.io.InputStream;
  * <b>Note:</b> The only difference to {@link java.io.FilterInputStream} is that <code>DelegatingInputStream</code> does
  * <b>not</b> override {@link #read(byte[])} or {@link #read(byte[], int, int)} but rather exposes the original
  * implementations of <code>InputStream</code> which call {@link #read()} instead of their delegate counterparts.
- * 
+ *
  * @author Eike Stepper
  */
 public class DelegatingInputStream extends InputStream
@@ -36,7 +36,7 @@ public class DelegatingInputStream extends InputStream
   /**
    * Creates a <code>DelegatingInputStream</code> by assigning the argument <code>in</code> to the field
    * <code>this.in</code> so as to remember it for later use.
-   * 
+   *
    * @param in
    *          the underlying input stream, or <code>null</code> if this instance is to be created without an underlying
    *          stream.
@@ -58,7 +58,7 @@ public class DelegatingInputStream extends InputStream
    * detected, or an exception is thrown.
    * <p>
    * This method simply performs <code>in.read()</code> and returns the result.
-   * 
+   *
    * @return the next byte of data, or <code>-1</code> if the end of the stream is reached.
    * @exception IOException
    *              if an I/O error occurs.
@@ -76,7 +76,7 @@ public class DelegatingInputStream extends InputStream
    * of bytes skipped is returned.
    * <p>
    * This method simply performs <code>in.skip(n)</code>.
-   * 
+   *
    * @param n
    *          the number of bytes to be skipped.
    * @return the actual number of bytes skipped.
@@ -93,7 +93,7 @@ public class DelegatingInputStream extends InputStream
    * Returns the number of bytes that can be read from this input stream without blocking.
    * <p>
    * This method simply performs <code>in.available()</code> and returns the result.
-   * 
+   *
    * @return the number of bytes that can be read from the input stream without blocking.
    * @exception IOException
    *              if an I/O error occurs.
@@ -108,7 +108,7 @@ public class DelegatingInputStream extends InputStream
   /**
    * Closes this input stream and releases any system resources associated with the stream. This method simply performs
    * <code>in.close()</code>.
-   * 
+   *
    * @exception IOException
    *              if an I/O error occurs.
    * @see DelegatingInputStream#in
@@ -127,7 +127,7 @@ public class DelegatingInputStream extends InputStream
    * position gets invalidated.
    * <p>
    * This method simply performs <code>in.mark(readlimit)</code>.
-   * 
+   *
    * @param readlimit
    *          the maximum limit of bytes that can be read before the mark position becomes invalid.
    * @see DelegatingInputStream#in
@@ -149,7 +149,7 @@ public class DelegatingInputStream extends InputStream
    * stream. Often this is most easily done by invoking some general parser. If the stream is of the type handled by the
    * parse, it just chugs along happily. If the stream is not of that type, the parser should toss an exception when it
    * fails. If this happens within readlimit bytes, it allows the outer code to reset the stream and try another parser.
-   * 
+   *
    * @exception IOException
    *              if the stream has not been marked or if the mark has been invalidated.
    * @see DelegatingInputStream#in
@@ -164,7 +164,7 @@ public class DelegatingInputStream extends InputStream
   /**
    * Tests if this input stream supports the <code>mark</code> and <code>reset</code> methods. This method simply
    * performs <code>in.markSupported()</code>.
-   * 
+   *
    * @return <code>true</code> if this stream type supports the <code>mark</code> and <code>reset</code> method;
    *         <code>false</code> otherwise.
    * @see DelegatingInputStream#in
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java
index 8a46d66602..4c61568351 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java
@@ -25,7 +25,7 @@ import java.io.OutputStream;
  * <b>Note:</b> The only difference to {@link java.io.FilterOutputStream} is that <code>DelegatingOutputStream</code>
  * does <b>not</b> override {@link #write(byte[])} or {@link #write(byte[], int, int)} but rather exposes the original
  * implementations of <code>InputStream</code> which call {@link #write(int)} instead of their delegate counterparts.
- * 
+ *
  * @author Eike Stepper
  */
 public class DelegatingOutputStream extends OutputStream
@@ -37,7 +37,7 @@ public class DelegatingOutputStream extends OutputStream
 
   /**
    * Creates an output stream filter built on top of the specified underlying output stream.
-   * 
+   *
    * @param out
    *          the underlying output stream to be assigned to the field <tt>this.out</tt> for later use, or
    *          <code>null</code> if this instance is to be created without an underlying stream.
@@ -59,7 +59,7 @@ public class DelegatingOutputStream extends OutputStream
    * underlying output stream, that is, it performs <tt>out.write(b)</tt>.
    * <p>
    * Implements the abstract <tt>write</tt> method of <tt>OutputStream</tt>.
-   * 
+   *
    * @param b
    *          the <code>byte</code>.
    * @exception IOException
@@ -76,7 +76,7 @@ public class DelegatingOutputStream extends OutputStream
    * <p>
    * The <code>flush</code> method of <code>DelegatingOutputStream</code> calls the <code>flush</code> method of its
    * underlying output stream.
-   * 
+   *
    * @exception IOException
    *              if an I/O error occurs.
    * @see DelegatingOutputStream#out
@@ -92,7 +92,7 @@ public class DelegatingOutputStream extends OutputStream
    * <p>
    * The <code>close</code> method of <code>DelegatingOutputStream</code> calls its <code>flush</code> method, and then
    * calls the <code>close</code> method of its underlying output stream.
-   * 
+   *
    * @exception IOException
    *              if an I/O error occurs.
    * @see DelegatingOutputStream#flush()
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java
index 5281cfcc08..c5c3ec7e22 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DigestWriter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DigestWriter.java
index e04da3ac21..b4d36cb1c5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DigestWriter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DigestWriter.java
@@ -30,7 +30,7 @@ public class DigestWriter extends FilterWriter
 
   /**
    * Creates a digest writer, using the specified writer and message digest.
-   * 
+   *
    * @param writer
    *          the writer.
    * @param digest
@@ -44,7 +44,7 @@ public class DigestWriter extends FilterWriter
 
   /**
    * Returns the message digest associated with this writer.
-   * 
+   *
    * @return the message digest associated with this writer.
    * @see #setMessageDigest(java.security.MessageDigest)
    */
@@ -55,7 +55,7 @@ public class DigestWriter extends FilterWriter
 
   /**
    * Associates the specified message digest with this writer.
-   * 
+   *
    * @param digest
    *          the message digest to be associated with this writer.
    * @see #getMessageDigest()
@@ -115,7 +115,7 @@ public class DigestWriter extends FilterWriter
   /**
    * Turns the digest function on or off. The default is on. When it is on, a call to one of the <code>write</code>
    * methods results in an update on the message digest. But when it is off, the message digest is not updated.
-   * 
+   *
    * @param on
    *          true to turn the digest function on, false to turn it off.
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOAdapter.java
index 2340caf7ce..dab50cb8b4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOAdapter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOAdapter.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOHandler.java
index 98b7f91672..8406572a9b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOHandler.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedInputHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedInputHandler.java
index 8e52fed19d..03673c4179 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedInputHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedInputHandler.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedOutputHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedOutputHandler.java
index c9ba329083..998f337432 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedOutputHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedOutputHandler.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/FileLock.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/FileLock.java
index 57dc632279..ec118f1db8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/FileLock.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/FileLock.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
index af132c20de..5f040bea14 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOFilter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOFilter.java
index bc5203a0ab..4d2cf79270 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOFilter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOFilter.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java
index dfb60ddd58..91b60391b2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
index 4821504970..7b98b329ae 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
@@ -940,7 +940,7 @@ public final class IOUtil
           return false;
         }
 
-        if (byte1 == -1)// Implies byte2 == -1
+        if (byte1 == -1) // Implies byte2 == -1
         {
           return true;
         }
@@ -969,7 +969,7 @@ public final class IOUtil
           return false;
         }
 
-        if (char1 == -1)// Implies char2 == -1
+        if (char1 == -1) // Implies char2 == -1
         {
           return true;
         }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOVisitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOVisitor.java
index 4e5d328166..a87c8cd7e9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOVisitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOVisitor.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java
index d307bd108c..3a4b36d876 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
index 03cd021968..753b4ec00d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
@@ -74,7 +74,7 @@ public final class NIOUtil
   /**
    * Copy source file to destination. If destination is a path then source file name is appended. If destination file
    * exists then: overwrite=true - destination file is replaced; overwite=false - exception is thrown.
-   * 
+   *
    * @param src
    *          source file
    * @param dst
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java
index 6d1158aea3..1c8a27fb72 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -196,22 +196,22 @@ public abstract class SortedFileMap<K extends Comparable<K>, V> implements Close
     while (low <= high)
     {
       long mid = low + high >> 1;
-      randomAccessFile.seek(getPosition(mid));
-      Comparable<K> midVal = readKey(input);
-      int cmp = midVal.compareTo(key);
+    randomAccessFile.seek(getPosition(mid));
+    Comparable<K> midVal = readKey(input);
+    int cmp = midVal.compareTo(key);
 
-      if (cmp < 0)
-      {
-        low = mid + 1;
-      }
-      else if (cmp > 0)
-      {
-        high = mid - 1;
-      }
-      else
-      {
-        return mid; // key found
-      }
+    if (cmp < 0)
+    {
+      low = mid + 1;
+    }
+    else if (cmp > 0)
+    {
+      high = mid - 1;
+    }
+    else
+    {
+      return mid; // key found
+    }
     }
 
     return -(low + 1); // key not found.
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java
index 790b4a7d4d..b11155ad47 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringCompressor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringCompressor.java
index e34f1b2574..290b39337a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringCompressor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringCompressor.java
@@ -60,7 +60,7 @@ public class StringCompressor implements StringIO
 
   /**
    * Creates a StringCompressor instance.
-   * 
+   *
    * @param client
    *          Must be different on both sides of the stream.
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringIO.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringIO.java
index 8105c023c2..1b9c3992c2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringIO.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringIO.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORInputStream.java
index 3abbb0fcf4..6f75bb21db 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORInputStream.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORInputStream.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XOROutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XOROutputStream.java
index 62c2434435..5da8a72e6c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XOROutputStream.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XOROutputStream.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java
index 5ad5712f10..10daf4be85 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package-info.java
index 7514961180..79bdb6e28b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * @apiviz.exclude .*
  */
 package org.eclipse.net4j.util.io;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java
index e1f9596514..902babd274 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.util.event.IEvent;
 /**
  * An {@link IEvent event} fired from an entity with a {@link ILifecycle lifecycle} when its lifecycle {@link Kind
  * state} has changed.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement Thi import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IEvent; import
@@ -33,7 +33,7 @@ public interface ILifecycleEvent extends IEvent
 
   /**
    * Enumerates the possible {@link ILifecycle#getLifecycleState() lifecycle state} changes of an entity.
-   * 
+   *
    * @author Eike Stepper
    */
   public enum Kind
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEventAdapter.java
index b5c6b76bb2..537e1c22bc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEventAdapter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleEventAdapter.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.event.IListener;
 /**
  * A {@link IListener listener} that dispatches lifecycle {@link ILifecycleEvent events} to methods that can be
  * overridden by extenders.
- * 
+ *
  * @author Eike Stepper
  * @apiviz.exclude
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleState.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleState.java
index a9cc78d885..49c881582f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleState.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleState.java
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.lifecycle;
 
 /**
  * Enumerates the possible lifecycle states of an entity with a {@link ILifecycle lifecycle}.
- * 
+ *
  * @author Eike Stepper
  * @since 3.0
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/package-info.java
index 8642d13d7e..00a511020e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/package-info.java
@@ -1,19 +1,14 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * A framework for components with a simple lifecycle.
- * Interfaces that describe the behaviour of objects with respect to their lifecycle. 
+ * Interfaces that describe the behaviour of objects with respect to their lifecycle.
  * A utility class to interact with such objects and an abstract class that can be
  * used to implement such objects are provided as well.
  */
 package org.eclipse.net4j.util.lifecycle;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
index 527a33ea45..e5d9ac00a9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
@@ -4,7 +4,7 @@
  * 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,7 +15,7 @@ import org.eclipse.net4j.internal.util.om.LegacyBundle;
 /**
  * Various static helper methods for dealing with {@link OMBundle bundles} if OSGi {@link OMPlatform#isOSGiRunning() is
  * not running}.
- * 
+ *
  * @author Eike Stepper
  */
 public final class LegacyUtil
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
index bc11d94553..2bfac274aa 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
@@ -21,7 +21,7 @@ import java.util.Properties;
 /**
  * Represents the platform that {@link OMBundle bundles} are deployed into, whether OSGi {@link #isOSGiRunning() is
  * running} or not.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
index 4335e3e8d9..6603d92477 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import java.util.concurrent.CountDownLatch;
 
 /**
  * A default implementation of an OSGi {@link IApplication application}.
- * 
+ *
  * @author Eike Stepper
  */
 public class OSGiApplication implements IApplication
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/package-info.java
index 3f42824eb7..b44168cf0a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Interfaces and classes for platform-independent logging.
  */
 package org.eclipse.net4j.util.om.log;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java
index 06dfc1feb4..6cafbbc6ee 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java
@@ -23,8 +23,8 @@ import java.util.TimerTask;
  */
 public abstract class AbstractMonitor implements OMMonitor
 {
-  private static final boolean CHECK_BEGIN = Boolean.parseBoolean(OMPlatform.INSTANCE.getProperty(
-      "org.eclipse.net4j.util.om.monitor.CheckBegin", "false"));
+  private static final boolean CHECK_BEGIN = Boolean
+      .parseBoolean(OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.util.om.monitor.CheckBegin", "false"));
 
   private static final long NOT_BEGUN = -1;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/DelegatingMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/DelegatingMonitor.java
index f2e2e8cdd2..a7476bfb75 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/DelegatingMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/DelegatingMonitor.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/EclipseMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/EclipseMonitor.java
index a6305c330a..1d2264c75f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/EclipseMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/EclipseMonitor.java
@@ -78,7 +78,7 @@ public class EclipseMonitor extends Monitor
 
   /**
    * A sub progress monitor that synchronizes all methods on the parent monitor instance.
-   * 
+   *
    * @author Eike Stepper
    * @since 3.0
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java
index 083c0158e6..bc9bc060c1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/MonitorCanceledException.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitor.java
index 91c712a1c0..b51e3f30f3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/OMMonitor.java
@@ -49,7 +49,7 @@ public interface OMMonitor extends OMMonitorProgress
 
   /**
    * Same as calling <code>begin(ONE)</code>.
-   * 
+   *
    * @since 2.0
    */
   public OMMonitor begin() throws MonitorCanceledException;
@@ -61,7 +61,7 @@ public interface OMMonitor extends OMMonitorProgress
 
   /**
    * Same as calling <code>worked(ONE)</code>.
-   * 
+   *
    * @since 2.0
    */
   public void worked() throws MonitorCanceledException;
@@ -73,7 +73,7 @@ public interface OMMonitor extends OMMonitorProgress
 
   /**
    * Same as calling <code>fork(ONE)</code>.
-   * 
+   *
    * @since 2.0
    */
   public OMMonitor fork();
@@ -85,7 +85,7 @@ public interface OMMonitor extends OMMonitorProgress
 
   /**
    * Same as calling <code>forkAsync(ONE)</code>.
-   * 
+   *
    * @since 2.0
    */
   public Async forkAsync();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProbingSubMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProbingSubMonitor.java
index 088814e3d6..3acc14faef 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProbingSubMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProbingSubMonitor.java
@@ -134,7 +134,7 @@ public final class ProbingSubMonitor extends org.eclipse.net4j.util.om.monitor.S
 
   ProbingSubMonitor(ProbingSubMonitor parent, RootInfo rootInfo, int totalWork, int availableToChildren, int flags,
       boolean full)
-  {
+      {
     super(rootInfo, totalWork, availableToChildren, flags | (full ? FULL_MODE : 0));
     this.parent = parent;
     totalTicks = totalWork;
@@ -146,7 +146,7 @@ public final class ProbingSubMonitor extends org.eclipse.net4j.util.om.monitor.S
 
     key = COUNTER.incrementAndGet();
     MAP.put(key, new KeyedWeakReference(key, this));
-  }
+      }
 
   @Override
   SubMonitor createSubMonitor(RootInfo rootInfo, int totalWork, int availableToChildren, int flags)
@@ -500,8 +500,8 @@ public final class ProbingSubMonitor extends org.eclipse.net4j.util.om.monitor.S
 
     private static final int DEFAULT_COLUMNS = 3;
 
-    private static final boolean SMOOTH_BORDERS = "smooth".equalsIgnoreCase(System
-        .getProperty("submonitor.probing.borders"));
+    private static final boolean SMOOTH_BORDERS = "smooth"
+        .equalsIgnoreCase(System.getProperty("submonitor.probing.borders"));
 
     private static final Dumper DUMPER = SMOOTH_BORDERS ? Dumper.UTF8 : Dumper.ASCII;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributable.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributable.java
index 4a1fbc7bf0..49151127b1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributable.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributable.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java
index 863312e896..57ce018d47 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/package-info.java
index 38c49ca4ca..e13a696373 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Interfaces and classes for platform-independent progress monitoring.
  */
 package org.eclipse.net4j.util.om.monitor;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/package-info.java
index 14a2a0bb76..f69dfbc6ef 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
  * Interfaces and classes for platform-independent <i>operations and maintenance</i> (O&amp;M).
  */
 package org.eclipse.net4j.util.om;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
index 14f1a98166..f421e72641 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java
index a51b0f60e8..2ed19c3128 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.util.event.IEvent;
 /**
  * An {@link IEvent event} fired from a {@link OMPreferences preferences} object when a {@link OMPreference preference}
  * value has changed.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/package-info.java
index dc3740d36e..897a8a26f5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Interfaces and classes for platform-independent preference management.
  */
 package org.eclipse.net4j.util.om.pref;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/Tracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/Tracer.java
index 3edecbea51..f16da30a48 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/Tracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/Tracer.java
@@ -29,8 +29,8 @@ public class Tracer implements OMTracer
    */
   public static final String PROP_DISABLE_TRACING = "org.eclipse.net4j.util.om.trace.disable";
 
-  private static final boolean isGloballyDisabled = Boolean.valueOf(OMPlatform.INSTANCE.getProperty(
-      PROP_DISABLE_TRACING, Boolean.FALSE.toString()));
+  private static final boolean isGloballyDisabled = Boolean
+      .valueOf(OMPlatform.INSTANCE.getProperty(PROP_DISABLE_TRACING, Boolean.FALSE.toString()));
 
   private OMBundle bundle;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/package-info.java
index 4ecf7d1eb6..f803de4f65 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Interfaces and classes for platform-independent tracing.
  */
 package org.eclipse.net4j.util.om.trace;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/IOptionsEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/IOptionsEvent.java
index 68b7a2515d..0f29ad364a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/IOptionsEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/IOptionsEvent.java
@@ -4,7 +4,7 @@
  * 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:
  *    Victor Roldan Betancort - initial API and implementation
  *    Eike Stepper - maintenance
@@ -15,7 +15,7 @@ import org.eclipse.net4j.util.event.IEvent;
 
 /**
  * A generic {@link IEvent event} fired from an {@link IOptions options} object when an option has changed.
- * 
+ *
  * @author Victor Roldan Betancort
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/package-info.java
index 7116be5f79..14dc27adf7 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * A framework for option containers that fire change events.
  */
 package org.eclipse.net4j.util.options;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/package-info.java
index b6c01cc8ee..b6cbef102d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Utility classes.
  */
 package org.eclipse.net4j.util;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/IProperties.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/IProperties.java
index 8b637c616d..37bb949bcc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/IProperties.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/IProperties.java
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.properties;
 
 /**
  * Contains a list of {@link Property properties}.
- * 
+ *
  * @author Eike Stepper
  * @since 3.2
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/IPropertyProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/IPropertyProvider.java
index 3f1c8f0b85..6395a5f249 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/IPropertyProvider.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/IPropertyProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * Provides a list of {@link Property property descriptors}.
- * 
+ *
  * @author Eike Stepper
  * @since 3.2
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/Properties.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/Properties.java
index 6dcf1d3f28..ca7e311def 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/Properties.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/Properties.java
@@ -17,7 +17,7 @@ import java.util.List;
 
 /**
  * Contains a list of {@link Property properties}.
- * 
+ *
  * @author Eike Stepper
  * @since 3.2
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/package-info.java
index 949d79646f..583277599e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/properties/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
- * A framework to describe and access properties of POJOs and to support Eclipse 
- * {@link org.eclipse.core.expressions.PropertyTester property testers} and 
+ * A framework to describe and access properties of POJOs and to support Eclipse
+ * {@link org.eclipse.core.expressions.PropertyTester property testers} and
  * <code>IPropertySources</code> in a uniform way.
  */
 package org.eclipse.net4j.util.properties;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/Interner.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/Interner.java
index 341d45395a..a02c64f1b1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/Interner.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/Interner.java
@@ -20,8 +20,8 @@ import java.lang.ref.WeakReference;
 public class Interner<E>
 {
   private static final int[] PRIME_CAPACITIES = new int[] { 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, 16411,
-      32771, 65537, 131101, 262147, 524309, 1048583, 2097169, 4194319, 8388617, 16777259, 33554467, 67108879,
-      134217757, 268435459, 536870923, 1073741827, 2147483629 };
+    32771, 65537, 131101, 262147, 524309, 1048583, 2097169, 4194319, 8388617, 16777259, 33554467, 67108879, 134217757,
+      268435459, 536870923, 1073741827, 2147483629 };
 
   private int size;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java
index 011e9f8c21..86f7f25820 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -17,7 +17,7 @@ import java.text.MessageFormat;
 /**
  * @author Eike Stepper
  */
-public class KeyedPhantomReference<K, T> extends PhantomReference<T> implements KeyedReference<K, T>
+public class KeyedPhantomReference<K, T> extends PhantomReference<T>implements KeyedReference<K, T>
 {
   private K key;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java
index 71b514478d..70980a1c26 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java
index 3c1cd09a46..8aec17e848 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -17,7 +17,7 @@ import java.text.MessageFormat;
 /**
  * @author Eike Stepper
  */
-public class KeyedSoftReference<K, T> extends SoftReference<T> implements KeyedReference<K, T>
+public class KeyedSoftReference<K, T> extends SoftReference<T>implements KeyedReference<K, T>
 {
   private K key;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java
index 459be46960..ce66f55d03 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java
index 4f76f98935..e990d5dac4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -17,7 +17,7 @@ import java.text.MessageFormat;
 /**
  * @author Eike Stepper
  */
-public class KeyedWeakReference<K, T> extends WeakReference<T> implements KeyedReference<K, T>
+public class KeyedWeakReference<K, T> extends WeakReference<T>implements KeyedReference<K, T>
 {
   private K key;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceType.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceType.java
index ca4a735962..f4aebbbb3e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceType.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceType.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java
index d8ece404a5..5e41580827 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java
@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentMap;
  *
  * @author Eike Stepper
  */
-public abstract class ReferenceValueMap<K, V> extends ReferenceValueMap2<K, V> implements ConcurrentMap<K, V>
+public abstract class ReferenceValueMap<K, V> extends ReferenceValueMap2<K, V>implements ConcurrentMap<K, V>
 {
   public ReferenceValueMap()
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/package-info.java
index 9bb61a26b5..548092042c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * A framework for memory-sensitive keyed references and value maps.
  */
 package org.eclipse.net4j.util.ref;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java
index e3b76fbedd..0977fd777b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/DelegatingRegistry.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -23,7 +23,7 @@ import java.util.Set;
  * {@link Map#entrySet()} as well as of {@link Map#keySet()}, i.e. they are disconnected sets and modifications applied
  * to them are not applied to their underlying AbstractDelegatingRegistry.
  * <p>
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class DelegatingRegistry<K, V> extends Registry<K, V>
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/HashMapDelegatingRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/HashMapDelegatingRegistry.java
index 637e1c7563..90d1f10456 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/HashMapDelegatingRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/HashMapDelegatingRegistry.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/HashMapRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/HashMapRegistry.java
index 8fd219d439..cf390d9751 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/HashMapRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/HashMapRegistry.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistry.java
index 8185bba593..54871d2003 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistry.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java
index 76a7339c0d..7665f33cdf 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java
@@ -24,7 +24,7 @@ import java.util.Set;
 /**
  * @author Eike Stepper
  */
-public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implements IRegistry<K, V>
+public abstract class Registry<K, V> extends Container<Map.Entry<K, V>>implements IRegistry<K, V>
 {
   private boolean autoCommit;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
index a949e48100..e53a760df5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/package-info.java
index 6de2e7e0c8..76523dc3b9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/package-info.java
@@ -1,23 +1,18 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Interfaces and classes for general purpose registries.
  * A registry is like a <code>Map</code> but has some additional features:
  * <ul>
- *   <li>It provides a descriptor framework for registry elements that 
- *   	  are to be instantiated lazily 
- *   <li>It provides a notification framework that enables clients to 
+ *   <li>It provides a descriptor framework for registry elements that
+ *   	  are to be instantiated lazily
+ *   <li>It provides a notification framework that enables clients to
  *       react on events (including the resolution of a lazy descriptor)
  * <ul>
  */
 package org.eclipse.net4j.util.registry;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorConfigurer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorConfigurer.java
index ec1d969632..4029de87a8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorConfigurer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorConfigurer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorFactory.java
index ed1563648d..c741a61cf0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java
index f5f3d389c8..dd92c8e40d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java
@@ -18,8 +18,8 @@ import java.nio.ByteBuffer;
 /**
  * @author Eike Stepper
  */
-public abstract class ChallengeResponseNegotiator extends
-    Negotiator<IChallengeResponse.State, IChallengeResponse.Event> implements IChallengeResponse
+public abstract class ChallengeResponseNegotiator extends Negotiator<IChallengeResponse.State, IChallengeResponse.Event>
+    implements IChallengeResponse
 {
   private String encryptionAlgorithmName = SecurityUtil.PBE_WITH_MD5_AND_DES;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Credentials.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Credentials.java
index cdebad6260..8535ad9d1e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Credentials.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Credentials.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/DiffieHellman.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/DiffieHellman.java
index af92857da2..8296385abd 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/DiffieHellman.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/DiffieHellman.java
@@ -325,20 +325,20 @@ public class DiffieHellman
      * The 1024 bit Diffie-Hellman modulus values used by SKIP
      */
     private static final byte skip1024ModulusBytes[] = { (byte)0xF4, (byte)0x88, (byte)0xFD, (byte)0x58, (byte)0x4E,
-        (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91, (byte)0x07,
-        (byte)0x36, (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
-        (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E, (byte)0xF6,
-        (byte)0xF3, (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
-        (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38, (byte)0xD3,
-        (byte)0x34, (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
-        (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF, (byte)0x3C,
-        (byte)0xE1, (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
-        (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19, (byte)0xC8,
-        (byte)0x07, (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
-        (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3, (byte)0x08,
-        (byte)0x3D, (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
-        (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2, (byte)0x5E,
-        (byte)0xC3, (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78, (byte)0xC7 };
+      (byte)0x49, (byte)0xDB, (byte)0xCD, (byte)0x20, (byte)0xB4, (byte)0x9D, (byte)0xE4, (byte)0x91, (byte)0x07,
+      (byte)0x36, (byte)0x6B, (byte)0x33, (byte)0x6C, (byte)0x38, (byte)0x0D, (byte)0x45, (byte)0x1D, (byte)0x0F,
+      (byte)0x7C, (byte)0x88, (byte)0xB3, (byte)0x1C, (byte)0x7C, (byte)0x5B, (byte)0x2D, (byte)0x8E, (byte)0xF6,
+      (byte)0xF3, (byte)0xC9, (byte)0x23, (byte)0xC0, (byte)0x43, (byte)0xF0, (byte)0xA5, (byte)0x5B, (byte)0x18,
+      (byte)0x8D, (byte)0x8E, (byte)0xBB, (byte)0x55, (byte)0x8C, (byte)0xB8, (byte)0x5D, (byte)0x38, (byte)0xD3,
+      (byte)0x34, (byte)0xFD, (byte)0x7C, (byte)0x17, (byte)0x57, (byte)0x43, (byte)0xA3, (byte)0x1D, (byte)0x18,
+      (byte)0x6C, (byte)0xDE, (byte)0x33, (byte)0x21, (byte)0x2C, (byte)0xB5, (byte)0x2A, (byte)0xFF, (byte)0x3C,
+      (byte)0xE1, (byte)0xB1, (byte)0x29, (byte)0x40, (byte)0x18, (byte)0x11, (byte)0x8D, (byte)0x7C, (byte)0x84,
+      (byte)0xA7, (byte)0x0A, (byte)0x72, (byte)0xD6, (byte)0x86, (byte)0xC4, (byte)0x03, (byte)0x19, (byte)0xC8,
+      (byte)0x07, (byte)0x29, (byte)0x7A, (byte)0xCA, (byte)0x95, (byte)0x0C, (byte)0xD9, (byte)0x96, (byte)0x9F,
+      (byte)0xAB, (byte)0xD0, (byte)0x0A, (byte)0x50, (byte)0x9B, (byte)0x02, (byte)0x46, (byte)0xD3, (byte)0x08,
+      (byte)0x3D, (byte)0x66, (byte)0xA4, (byte)0x5D, (byte)0x41, (byte)0x9F, (byte)0x9C, (byte)0x7C, (byte)0xBD,
+      (byte)0x89, (byte)0x4B, (byte)0x22, (byte)0x19, (byte)0x26, (byte)0xBA, (byte)0xAB, (byte)0xA2, (byte)0x5E,
+      (byte)0xC3, (byte)0x55, (byte)0xE9, (byte)0x2F, (byte)0x78, (byte)0xC7 };
 
     /**
      * The SKIP 1024 bit modulus
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManagerFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManagerFactory.java
index b82ca3336a..edbdc725f4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManagerFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManagerFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.security;
 
 /**
  * TODO Consider file attributes when creating initially empty file
- * 
+ *
  * @author Eike Stepper
  */
 public class FileUserManagerFactory extends UserManagerFactory
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IChallengeResponse.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IChallengeResponse.java
index 758c565c46..8a4270b717 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IChallengeResponse.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IChallengeResponse.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentials.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentials.java
index cb4028c1dc..5d40a70ffa 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentials.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentials.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentialsProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentialsProvider.java
index 81341a5e59..2b4a71e22f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentialsProvider.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ICredentialsProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiator.java
index 6c2f436032..4a0e7fc26b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiator.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiatorAware.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiatorAware.java
index e06302b4c3..2a7223a911 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiatorAware.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiatorAware.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentials.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentials.java
index 4e265c6420..3d2d5c8bfc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentials.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentials.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsProvider.java
index 84903227f3..16d29e450d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsProvider.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsProvider.java
@@ -4,7 +4,7 @@
  * 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
  *    Christian W. Damus (CEA LIST) - bug 418454
@@ -21,7 +21,7 @@ public interface IPasswordCredentialsProvider extends ICredentialsProvider
   /**
    * Interface implemented by protocol objects that can supply an
    * {@link IPasswordCredentialsProvider}.
-   * 
+   *
    * @author Christian W. Damus (CEA LIST)
    * @since 3.4
    */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsUpdate.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsUpdate.java
index 6f67662bd6..9966d6dbd6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsUpdate.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IPasswordCredentialsUpdate.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -13,7 +13,7 @@ package org.eclipse.net4j.util.security;
 /**
  * Password credentials with an update (new password) in addition to the usual
  * user ID and password for authentication of the password change.
- * 
+ *
  * @since 3.4
  * @author Christian W. Damus (CEA LIST)
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IRandomizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IRandomizer.java
index 4d0662cbae..00abfacf5d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IRandomizer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IRandomizer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserAware.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserAware.java
index aac8d0e050..50375ebcc1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserAware.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IUserAware.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiationException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiationException.java
index 44518758c4..7d93a44c0f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiationException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiationException.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java
index a889240e69..dad7fbb159 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -17,8 +17,8 @@ import java.nio.ByteBuffer;
 /**
  * @author Eike Stepper
  */
-public abstract class Negotiator<STATE extends Enum<?>, EVENT extends Enum<?>> extends
-    FiniteStateMachine<STATE, EVENT, INegotiationContext> implements INegotiator, INegotiationContext.Receiver
+public abstract class Negotiator<STATE extends Enum<?>, EVENT extends Enum<?>>
+    extends FiniteStateMachine<STATE, EVENT, INegotiationContext>implements INegotiator, INegotiationContext.Receiver
 {
   private transient STATE initialState;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiatorFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiatorFactory.java
index 68b3217cc7..e24298b4f7 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiatorFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiatorFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentials.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentials.java
index 8a812eac19..188935d497 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentials.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentials.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentialsUpdate.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentialsUpdate.java
index 47cd31e027..df47d197fa 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentialsUpdate.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/PasswordCredentialsUpdate.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.security;
 
 /**
  * Default implementation of the {@link IPasswordCredentialsUpdate} interface.
- * 
+ *
  * @since 3.4
  * @author Christian W. Damus (CEA LIST)
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Randomizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Randomizer.java
index 58bfd29eb9..3bd66fdab6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Randomizer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Randomizer.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/RandomizerFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/RandomizerFactory.java
index 826749c52c..efc98b7e03 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/RandomizerFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/RandomizerFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorFactory.java
index 76ec1bb13b..6c6a982950 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorInjector.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorInjector.java
index 346cdcd5f4..4de99ccb4b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorInjector.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorInjector.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
index 8eb7c7731a..8d2b9068ae 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
@@ -35,7 +35,7 @@ public final class SecurityUtil
    * @since 2.0
    */
   public static final byte[] DEFAULT_SALT = { (byte)0xc7, (byte)0x73, (byte)0x21, (byte)0x8c, (byte)0x7e, (byte)0xc8,
-      (byte)0xee, (byte)0x99 };
+    (byte)0xee, (byte)0x99 };
 
   /**
    * @since 2.0
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java
index 2ae3452e13..a5400b032e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerAuthenticator.java
@@ -117,8 +117,8 @@ public class UserManagerAuthenticator extends Lifecycle implements IAuthenticato
       byte[] cryptedTokenClient = SecurityUtil.encrypt(randomToken, password, encryptionAlgorithmName,
           encryptionSaltBytes, encryptionIterationCount);
 
-      byte[] cryptedTokenServer = userManager.encrypt(userID, randomToken, encryptionAlgorithmName,
-          encryptionSaltBytes, encryptionIterationCount);
+      byte[] cryptedTokenServer = userManager.encrypt(userID, randomToken, encryptionAlgorithmName, encryptionSaltBytes,
+          encryptionIterationCount);
 
       if (!Arrays.equals(cryptedTokenClient, cryptedTokenServer))
       {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/package-info.java
index 1241c9f6f5..689503c87e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
@@ -14,4 +10,3 @@
  * @apiviz.exclude .*
  */
 package org.eclipse.net4j.util.security;
-
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransaction.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransaction.java
index 3ffd259f58..b9790edfd2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransaction.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransactionalOperation.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransactionalOperation.java
index 058b92417c..731685d604 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransactionalOperation.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/ITransactionalOperation.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/Transaction.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/Transaction.java
index 1016b5eed9..510702aa85 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/Transaction.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/Transaction.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionException.java
index a7046ffda6..9954edc6c3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionException.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionException.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java
index be99a15aeb..a87f7d2ae4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/package-info.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/package-info.java
index e5115f5244..4070274390 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/package-info.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * A framework for transactional operations.
  */
 package org.eclipse.net4j.util.transaction;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java
index a2f5eac6fc..bbd66edd58 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferFactory.java
index 6b81649fa0..f95af1c11c 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -57,6 +57,6 @@ public class BufferFactory extends BufferProvider
   @Override
   public String toString()
   {
-    return MessageFormat.format("BufferFactory[{0}]", getBufferCapacity()); //$NON-NLS-1$ 
+    return MessageFormat.format("BufferFactory[{0}]", getBufferCapacity()); //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java
index 1d6b8986d8..3811b314ff 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
index d961c5aef2..93eaa80ca4 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
@@ -41,8 +41,8 @@ public abstract class OM
 
   public static final OMTracer DEBUG_SIGNAL = DEBUG.tracer("signal"); //$NON-NLS-1$
 
-  public static final boolean SET_SIGNAL_THREAD_NAME = BUNDLE.getDebugSupport().getDebugOption(
-      "set.signal.thread.name", false); //$NON-NLS-1$
+  public static final boolean SET_SIGNAL_THREAD_NAME = BUNDLE.getDebugSupport().getDebugOption("set.signal.thread.name", //$NON-NLS-1$
+      false);
 
   public static final OMLogger LOG = BUNDLE.logger();
 
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ContainerProtocolProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ContainerProtocolProvider.java
index 1950727924..49d2efce8c 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ContainerProtocolProvider.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ContainerProtocolProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -20,7 +20,7 @@ import org.eclipse.spi.net4j.ServerProtocolFactory;
 
 /**
  * Base class for container-based {@link IProtocolProvider protocol providers} like {@link Client} or {@link Server}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
@@ -56,7 +56,7 @@ public abstract class ContainerProtocolProvider implements IProtocolProvider
   /**
    * Container-based {@link IProtocolProvider protocol provider} for {@link ILocationAware.Location#CLIENT client}
    * protocols.
-   * 
+   *
    * @author Eike Stepper
    */
   public static class Client extends ContainerProtocolProvider
@@ -70,7 +70,7 @@ public abstract class ContainerProtocolProvider implements IProtocolProvider
   /**
    * Container-based {@link IProtocolProvider protocol provider} for {@link ILocationAware.Location#SERVER server}
    * protocols.
-   * 
+   *
    * @author Eike Stepper
    */
   public static class Server extends ContainerProtocolProvider
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/FactoriesProtocolProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/FactoriesProtocolProvider.java
index 8fc3ef434e..b5c481213f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/FactoriesProtocolProvider.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/FactoriesProtocolProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.registry.IRegistry;
 
 /**
  * Factory-based {@link IProtocolProvider protocol provider}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ILocationAware.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ILocationAware.java
index aa335b1fd9..d51bfe2768 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ILocationAware.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ILocationAware.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -13,7 +13,7 @@ package org.eclipse.net4j;
 /**
  * A concept that has a {@link Location location} in a {@link Location#CLIENT client}/{@link Location#SERVER server}
  * scenario.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
@@ -36,7 +36,7 @@ public interface ILocationAware
 
   /**
    * A {@link Location location} in a {@link Location#CLIENT client}/{@link Location#SERVER server} scenario.
-   * 
+   *
    * @author Eike Stepper
    * @since 2.0
    */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportConfig.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportConfig.java
index 026c8ced1a..2b471dfcc1 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportConfig.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportConfig.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService;
 /**
  * A common transport configuration that specifies basic dependencies for {@link IChannelMultiplexer channel
  * multiplexers}, {@link IConnector connectors} and {@link IAcceptor acceptors}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  * @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportConfigAware.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportConfigAware.java
index ce3b0b7a95..407b073001 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportConfigAware.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportConfigAware.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -17,7 +17,7 @@ import org.eclipse.net4j.connector.IConnector;
 /**
  * A concept that has a {@link ITransportConfig transport configuration}, typically a {@link IChannelMultiplexer channel
  * multiplexer}, {@link IConnector connector} or {@link IAcceptor acceptor}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java
index a3501e33b1..6f15841ee7 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java
@@ -61,8 +61,8 @@ public class TransportConfigurator
     return container;
   }
 
-  public IAcceptor[] configure(File configFile) throws ParserConfigurationException, SAXException, IOException,
-      CoreException
+  public IAcceptor[] configure(File configFile)
+      throws ParserConfigurationException, SAXException, IOException, CoreException
   {
     if (TRACER.isEnabled())
     {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportInjector.java
index 8169cac206..0b0b2d5d11 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportInjector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportInjector.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -27,7 +27,7 @@ import java.util.concurrent.ExecutorService;
 /**
  * An element post processor that injects a {@link ITransportConfig transport configuration} into the {@link IConnector
  * connectors} and {@link IAcceptor acceptors} of a {@link IManagedContainer managed container}.
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/IAcceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/IAcceptor.java
index 7018a5d8ba..99fac0ff7d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/IAcceptor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/IAcceptor.java
@@ -40,7 +40,7 @@ import org.eclipse.spi.net4j.Acceptor;
  * COORDS="485,75,564,105" HREF="IAcceptor.html"> <AREA SHAPE="RECT" COORDS="296,325,414,355" HREF="IConnector.html">
  * <AREA SHAPE="RECT" COORDS="64,426,444,506" HREF="ConnectorState.html#CONNECTING"> <AREA SHAPE="RECT"
  * COORDS="64,516,444,596" HREF="ConnectorState.html#NEGOTIATING"> </MAP>
- * 
+ *
  * @author Eike Stepper
  * @noimplement This interface is not intended to be implemented by clients.
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/package-info.java
index 1a6fc23480..68b505b0a8 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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 @@
  * <img src="doc-files/acceptors.png" title="Diagram Acceptors" border="0"/>
  */
 package org.eclipse.net4j.acceptor;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java
index 22c579c554..0f322730f4 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferInputStream.java
@@ -141,7 +141,7 @@ public class BufferInputStream extends InputStream implements IBufferHandler
     if (tracerEnabled)
     {
       TRACER.trace("<-- " + HexUtil.formatByte(result) //$NON-NLS-1$
-          + (result >= 32 ? " " + Character.toString((char)result) : "")); //$NON-NLS-1$ //$NON-NLS-2$
+      + (result >= 32 ? " " + Character.toString((char)result) : "")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     if (!byteBuffer.hasRemaining())
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferOutputStream.java
index ae2bd8c704..266e8800ad 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferOutputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferOutputStream.java
@@ -111,7 +111,7 @@ public class BufferOutputStream extends OutputStream
     if (tracerEnabled)
     {
       TRACER.trace("--> " + HexUtil.formatByte(b) //$NON-NLS-1$
-          + (b >= 32 ? " " + Character.toString((char)b) : "")); //$NON-NLS-1$ //$NON-NLS-2$
+      + (b >= 32 ? " " + Character.toString((char)b) : "")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     ByteBuffer buffer = currentBuffer.getByteBuffer();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferState.java
index be228c6130..9a478c51c1 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferState.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferState.java
@@ -24,7 +24,7 @@ import java.nio.channels.SocketChannel;
  * HREF="BufferState.html#WRITING"> <AREA SHAPE="RECT" COORDS="533,112,681,140" HREF="BufferState.html#READING_HEADER">
  * <AREA SHAPE="RECT" COORDS="533,271,680,295" HREF="BufferState.html#READING_BODY"> <AREA SHAPE="RECT"
  * COORDS="532,428,682,451" HREF="BufferState.html#GETTING"> </MAP>
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  */
@@ -96,14 +96,14 @@ public enum BufferState
 
   /**
    * Indicates that the {@link IBuffer} is owned by its {@link IBufferProvider}.
-   * 
+   *
    * @since 3.0
    */
   RELEASED,
 
   /**
    * Indicates that the {@link IBuffer} can not be used anymore.
-   * 
+   *
    * @since 3.0
    */
   DISPOSED
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferHandler.java
index 009297f583..0b15271955 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferHandler.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferHandler.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.buffer;
 
 /**
  * Provides clients with the ability to pass {@link IBuffer}s in for further buffer handling.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IBufferHandler
@@ -21,7 +21,7 @@ public interface IBufferHandler
    * Handles an {@link IBuffer} and optionally releases it. The implementor of this method takes over the ownership of
    * the buffer. Care must be taken to properly {@link IBuffer#release() release} the buffer if the ownership is not
    * explicitely passed to some further party.
-   * 
+   *
    * @param buffer
    *          The buffer to be handled and otionally released.
    */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferPool.java
index e1090742a3..4e106572d0 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferPool.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferPool.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,14 +12,14 @@ package org.eclipse.net4j.buffer;
 
 /**
  * Provides clients with the ability to obtain and retain pooled {@link IBuffer}s.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IBufferPool extends IBufferProvider
 {
   /**
    * Tries to remove a single buffer from this <code>BufferPool</code> and {@link IBuffer#release() release} it.
-   * 
+   *
    * @return <code>true</code> if a buffer could be evicted, <code>false</code> otherwise.
    */
   public boolean evictOne();
@@ -27,14 +27,14 @@ public interface IBufferPool extends IBufferProvider
   /**
    * Tries to remove as many buffers from this <code>BufferPool</code> and {@link IBuffer#release() release} them as are
    * needed to let a given maximum number of buffers survive in the pool.
-   * 
+   *
    * @return The number of buffers that could be evicted.
    */
   public int evict(int survivors);
 
   /**
    * Offers additional introspection features for {@link IBufferPool}s.
-   * 
+   *
    * @author Eike Stepper
    */
   public interface Introspection extends IBufferPool, IBufferProvider.Introspection
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferProvider.java
index 7d5fcd70c1..bb5b398a8c 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferProvider.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferProvider.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.buffer;
 
 /**
  * Provides clients with the ability to obtain and retain {@link IBuffer}s.
- * 
+ *
  * @author Eike Stepper
  */
 public interface IBufferProvider
@@ -34,7 +34,7 @@ public interface IBufferProvider
 
   /**
    * Offers additional introspection features for {@link IBufferProvider}s.
-   * 
+   *
    * @author Eike Stepper
    */
   public interface Introspection extends IBufferProvider
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/package-info.java
index c1cb7f004f..c7b308bd24 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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 @@
  * <img src="doc-files/buffers.png" title="Diagram Buffers" border="0"/>
  */
 package org.eclipse.net4j.buffer;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelException.java
index dbd3f7b3d6..64b64c7539 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelException.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelException.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.channel;
 
 /**
  * Thrown by an {@link IChannel} to indicate channel management problems.
- * 
+ *
  * @see IChannelMultiplexer
  * @author Eike Stepper
  * @since 2.0
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelOutputStream.java
index 243caf19e3..236ca5493d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelOutputStream.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelOutputStream.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -19,7 +19,7 @@ import java.io.OutputStream;
 /**
  * An {@link OutputStream output stream} that fragments the written byte sequence into fixed-sized {@link IBuffer
  * buffers} and passes them to configured {@link IChannel channel}.
- * 
+ *
  * @author Eike Stepper
  */
 public class ChannelOutputStream extends BufferOutputStream
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
index 8247f45f8d..488055764c 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
@@ -34,24 +34,24 @@ import org.eclipse.net4j.util.security.IUserAware;
  * <p>
  * An example for opening a channel on an {@link IConnector} and sending an {@link IBuffer}:
  * <p>
- * 
+ *
  * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
  * // Open a channel
  * IChannel channel = connector.openChannel();
  * short channelID = channel.getIndex();
- * 
+ *
  * // Fill a buffer
  * Buffer buffer = bufferProvider.getBuffer();
  * ByteBuffer byteBuffer = buffer.startPutting(channelID);
  * byteBuffer.putDouble(15.47);
- * 
+ *
  * // Let the channel send the buffer without blocking
  * channel.sendBuffer(buffer);
  * </pre>
  * <p>
  * An example for receiving {@link IBuffer}s from channels on an {@link IConnector}:
  * <p>
- * 
+ *
  * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
  * // Create a receive handler
  * final IBufferHandler receiveHandler = new IBufferHandler()
@@ -63,7 +63,7 @@ import org.eclipse.net4j.util.security.IUserAware;
  *     buffer.release();
  *   }
  * };
- * 
+ *
  * // Set the receive handler to all new channels
  * connector.addListener(new ContainerEventAdapter()
  * {
@@ -74,7 +74,7 @@ import org.eclipse.net4j.util.security.IUserAware;
  *   }
  * });
  * </pre>
- * 
+ *
  * @author Eike Stepper
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
@@ -84,7 +84,7 @@ public interface IChannel extends ILocationAware, IUserAware, IBufferHandler, IN
   /**
    * Returns the ID of this channel. The ID is unique at any time among all channels of the associated
    * {@link IChannelMultiplexer multiplexer}.
-   * 
+   *
    * @since 2.0
    */
   public short getID();
@@ -92,7 +92,7 @@ public interface IChannel extends ILocationAware, IUserAware, IBufferHandler, IN
   /**
    * Returns the multiplexer this channel is associated with. This channel multiplexer can be used, for example, to open
    * additional channels that will be multiplexed through the same transport medium.
-   * 
+   *
    * @since 2.0
    */
   public IChannelMultiplexer getMultiplexer();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannelMultiplexer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannelMultiplexer.java
index f5e049ec64..75acf75600 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannelMultiplexer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannelMultiplexer.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -22,7 +22,7 @@ import java.util.Collection;
 
 /**
  * Manages and multiplexes virtual data {@link IChannel channels} over a shared physical connection.
- * 
+ *
  * @author Eike Stepper
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
@@ -37,7 +37,7 @@ public interface IChannelMultiplexer extends ILocationAware, IContainer<IChannel
   /**
    * Indicates to use the timeout that is configured via debug property <code>open.channel.timeout</code> (see .options
    * file) which has a default of 10 seconds.
-   * 
+   *
    * @since 2.0
    */
   public static final long DEFAULT_OPEN_CHANNEL_TIMEOUT = -1;
@@ -48,7 +48,7 @@ public interface IChannelMultiplexer extends ILocationAware, IContainer<IChannel
    * peer {@link IChannel} can only be provided by externally provided channel {@link ILifecycle lifecycle}
    * {@link IListener listeners}.
    * <p>
-   * 
+   *
    * @see #openChannel(String, Object)
    * @see #openChannel(IProtocol)
    * @since 2.0
@@ -60,7 +60,7 @@ public interface IChannelMultiplexer extends ILocationAware, IContainer<IChannel
    * The peer connector will lookup a protocol {@link IFactory factory} with the protocol identifier, create a
    * {@link IBufferHandler} and inject it into the peer {@link IChannel}.
    * <p>
-   * 
+   *
    * @see #openChannel()
    * @see #openChannel(IProtocol)
    * @since 2.0
@@ -72,7 +72,7 @@ public interface IChannelMultiplexer extends ILocationAware, IContainer<IChannel
    * a protocol {@link IFactory factory} with the protocol identifier, create a {@link IBufferHandler} and inject it
    * into the peer channel.
    * <p>
-   * 
+   *
    * @see #openChannel()
    * @see #openChannel(String, Object)
    * @since 2.0
@@ -81,7 +81,7 @@ public interface IChannelMultiplexer extends ILocationAware, IContainer<IChannel
 
   /**
    * Returns a collection of currently open channels.
-   * 
+   *
    * @since 2.0
    */
   public Collection<IChannel> getChannels();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/package-info.java
index 9b684fdf66..a0c77efcc6 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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 @@
  * <img src="doc-files/channels.png" title="Diagram Channels" border="0"/>
  */
 package org.eclipse.net4j.channel;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorCredentialsInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorCredentialsInjector.java
index 40b966bfd8..9c75a4628e 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorCredentialsInjector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorCredentialsInjector.java
@@ -20,23 +20,23 @@ import org.eclipse.net4j.util.security.SecurityUtil;
  * Injects a configurable response negotiator into selected client connectors.
  * <p>
  * An example:
- * 
+ *
  * <pre>
  * IManagedContainer container = IPluginContainer.INSTANCE;
- * 
+ *
  * String connectorDescription = &quot;localhost:2036&quot;;
  * String userID = &quot;name&quot;;
  * String password = &quot;secret&quot;;
- * 
+ *
  * IPasswordCredentialsProvider credentialsProvider = new PasswordCredentialsProvider(userID, password);
- * 
+ *
  * container.addPostProcessor(new ConnectorCredentialsInjector(connectorDescription, credentialsProvider));
  * IConnector connector = (IConnector)container.getElement(&quot;org.eclipse.net4j.connectors&quot;, &quot;tcp&quot;, connectorDescription);
- * 
+ *
  * IChannel channel = connector.openChannel();
  * // ...
  * </pre>
- * 
+ *
  * @author Eike Stepper
  * @since 2.0
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorException.java
index 11a0a88121..7b135a4c96 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorException.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorException.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.connector;
 
 /**
  * Thrown by an {@link IConnector} to indicate connection problems.
- * 
+ *
  * @author Eike Stepper
  */
 public class ConnectorException extends RuntimeException
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorState.java
index 3e1e1a69fb..c2e292935d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorState.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorState.java
@@ -26,7 +26,7 @@ import org.eclipse.net4j.util.security.INegotiator;
  * HREF="../util/lifecycle/ILifecycle.html#isActive()"> <AREA SHAPE="POLYGON"
  * COORDS="429,10,428,262,597,263,597,30,483,29,483,10,428,11" HREF="../util/lifecycle/ILifecycle.html#isActive()">
  * </MAP>
- * 
+ *
  * @see IConnector#getState()
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
@@ -40,7 +40,7 @@ public enum ConnectorState
    * A connector is <code>DISCONNECTED</code> if and only if it is not
    * {@link org.eclipse.net4j.util.lifecycle.LifecycleUtil#isActive(Object) active}. A transition to {@link #CONNECTING}
    * can be triggered by calling {@link IConnector#connect(long)} or {@link IConnector#connectAsync()}.
-   * 
+   *
    * @see IConnector#getState()
    * @see org.eclipse.net4j.util.lifecycle.ILifecycle#isActive()
    */
@@ -53,7 +53,7 @@ public enum ConnectorState
    * A connector can only be <code>CONNECTING</code> if it is
    * {@link org.eclipse.net4j.util.lifecycle.LifecycleUtil#isActive(Object) active}. As soon as the underlying physical
    * connection is successfully established the state of the connector automatically transitions to {@link #NEGOTIATING}.
-   * 
+   *
    * @see IConnector#getState()
    * @see org.eclipse.net4j.util.lifecycle.ILifecycle#isActive()
    */
@@ -71,7 +71,7 @@ public enum ConnectorState
    * Negotiators can implement arbitrary handshake protocols, challenge-response sequences or other authentication
    * procedures. They can also be used to initially setup connection encryption if the connector implementation is not
    * able to do so.
-   * 
+   *
    * @see IConnector#getState()
    * @see org.eclipse.net4j.util.lifecycle.ILifecycle#isActive()
    */
@@ -84,7 +84,7 @@ public enum ConnectorState
    * A connector can only be <code>CONNECTED</code> if it is
    * {@link org.eclipse.net4j.util.lifecycle.LifecycleUtil#isActive(Object) active}. A transition to
    * {@link #DISCONNECTED} can be triggered by calling {@link IConnector#close()}.
-   * 
+   *
    * @see IConnector#getState()
    * @see org.eclipse.net4j.util.lifecycle.ILifecycle#isActive()
    */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java
index 15e6ba646f..32a02f52ea 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java
@@ -43,7 +43,7 @@ import org.eclipse.net4j.util.security.IUserAware;
  * COORDS="648,95,767,123" HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="509,254,608,283" HREF="IChannel.html">
  * <AREA SHAPE="RECT" COORDS="287,355,387,383" HREF="IChannel.html"> <AREA SHAPE="RECT" COORDS="818,195,897,222"
  * HREF="IProtocol.html"> </MAP>
- * 
+ *
  * @author Eike Stepper
  * @noimplement This interface is not intended to be implemented by clients.
  */
@@ -68,7 +68,7 @@ public interface IConnector extends IChannelMultiplexer, IUserAware, Closeable
 
   /**
    * Synchronous connect with infinite timeout value. Same as {@link #connect() connect(NO_TIMEOUT)}.
-   * 
+   *
    * @throws ConnectorException
    * @since 4.0
    */
@@ -76,7 +76,7 @@ public interface IConnector extends IChannelMultiplexer, IUserAware, Closeable
 
   /**
    * Synchronous connect. Blocks until <code>{@link #isConnected()} == true</code> or the given timeout expired.
-   * 
+   *
    * @param timeout
    *          The maximum number of milli seconds to block or {@link #NO_TIMEOUT} to block indefinetely in case no
    *          connection occurs.
@@ -88,7 +88,7 @@ public interface IConnector extends IChannelMultiplexer, IUserAware, Closeable
   /**
    * Asynchronous connect. May leave this {@link IConnector} in a state where <code>{@link #isConnected()} == false
    * </code>.
-   * 
+   *
    * @throws ConnectorException
    * @see #waitForConnection(long)
    * @see #connect(long)
@@ -97,7 +97,7 @@ public interface IConnector extends IChannelMultiplexer, IUserAware, Closeable
 
   /**
    * Blocks until <code>{@link #isConnected()} == true</code> or the given timeout expired.
-   * 
+   *
    * @param timeout
    *          The maximum number of milli seconds to block or {@link #NO_TIMEOUT} to block indefinetely in case no
    *          connection occurs.
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorEvent.java
index d43f9c0997..6921209920 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorEvent.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorEvent.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.util.event.IEvent;
 
 /**
  * A generic {@link IEvent event} fired from a {@link IConnector connector}.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
@@ -24,7 +24,7 @@ public interface IConnectorEvent extends IEvent
 {
   /**
    * The {@link IConnector} that sent this event.
-   * 
+   *
    * @see IContainerEvent#getSource()
    * @since 3.0
    */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java
index c2a2cffe9f..ce9105c6a6 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java
@@ -4,7 +4,7 @@
  * 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
  */
@@ -12,7 +12,7 @@ package org.eclipse.net4j.connector;
 
 /**
  * An event that is fired by an {@link IConnector} to indicate that its state has changed.
- * 
+ *
  * @author Eike Stepper
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/package-info.java
index 6c1f0026f3..9ec02d4038 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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 @@
  * <img src="doc-files/connectors.png" title="Diagram Connectors" border="0"/>
  */
 package org.eclipse.net4j.connector;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package-info.java
index ccc1c5a183..d942bd5738 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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
  */
 
 /**
@@ -24,4 +20,3 @@
  * 	</ul>
  */
 package org.eclipse.net4j;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/ProtocolVersionException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/ProtocolVersionException.java
index cf47d3f50b..947863f276 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/ProtocolVersionException.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/ProtocolVersionException.java
@@ -46,8 +46,8 @@ public class ProtocolVersionException extends IllegalStateException
     int actualVersion = Net4jUtil.getProtocolVersion(protocol);
     if (actualVersion != expectedVersion)
     {
-      throw new ProtocolVersionException("Protocol version " + actualVersion + " does not match expected version "
-          + expectedVersion);
+      throw new ProtocolVersionException(
+          "Protocol version " + actualVersion + " does not match expected version " + expectedVersion);
     }
   }
 }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/package-info.java
index 512321deaf..fb3d69f8af 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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 @@
  * <img src="doc-files/protocols.png" title="Diagram Protocols" border="0"/>
  */
 package org.eclipse.net4j.protocol;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SetTimeoutIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SetTimeoutIndication.java
index 08cd527569..baf22dcae2 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SetTimeoutIndication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SetTimeoutIndication.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SetTimeoutRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SetTimeoutRequest.java
index 24591651f1..4e07a93c99 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SetTimeoutRequest.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SetTimeoutRequest.java
@@ -4,7 +4,7 @@
  * 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
  */
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
index d84bbc0e81..1b4394e8bc 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
@@ -52,8 +52,8 @@ import java.util.concurrent.ExecutorService;
  *
  * @author Eike Stepper
  */
-public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> implements
-    ISignalProtocol<INFRA_STRUCTURE>
+public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE>
+    implements ISignalProtocol<INFRA_STRUCTURE>
 {
   /**
    * @since 2.0
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java
index d09ad552e6..7e763c8256 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationIndication.java
@@ -23,11 +23,11 @@ import org.eclipse.internal.net4j.bundle.OM;
 
 /**
  * @author Christian W. Damus (CEA LIST)
- * 
+ *
  * @since 4.3
  */
-public class ConfirmationIndication<PROTOCOL extends SignalProtocol<?> & IConfirmationProvider.Provider> extends
-    IndicationWithMonitoring
+public class ConfirmationIndication<PROTOCOL extends SignalProtocol<?> & IConfirmationProvider.Provider>
+    extends IndicationWithMonitoring
 {
   private ConfirmationPrompt prompt;
 
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationPrompt.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationPrompt.java
index 0ae123d57e..2aa4c042ce 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationPrompt.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationPrompt.java
@@ -4,7 +4,7 @@
  * 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:
  *    Christian W. Damus (CEA LIST) - initial API and implementation
  */
@@ -21,7 +21,7 @@ import java.util.Set;
 
 /**
  * @author Christian W. Damus (CEA LIST)
- * 
+ *
  * @since 4.3
  */
 public class ConfirmationPrompt
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationRequest.java
index 44518bedfe..fd184cc267 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationRequest.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/ConfirmationRequest.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.monitor.OMMonitor;
 
 /**
  * @author Christian W. Damus (CEA LIST)
- * 
+ *
  * @since 4.3
  */
 public class ConfirmationRequest extends RequestWithMonitoring<Confirmation>
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/package-info.java
index a9d2bd92d4..082a1b84b8 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/confirmation/package-info.java
@@ -1,18 +1,13 @@
 /*
- * Copyright (c) 2013 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:
- *    Christian W. Damus (CEA LIST) - initial API and implementation
+ * Copyright (c) 2013 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: Christian W. Damus (CEA LIST) - initial
+ * API and implementation
  */
 
 /**
  * Reusable implementation of a server-to-client confirmation signal and related API.
- * 
+ *
  * @since 4.3
  */
 package org.eclipse.net4j.signal.confirmation;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java
index 8d76a833ad..5b5b1069e7 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java
@@ -149,14 +149,14 @@ public class HeartBeatProtocol extends SignalProtocol<Object>
     if (signalID == SIGNAL_HEART_BEAT)
     {
       return new Indication(HeartBeatProtocol.this, SIGNAL_HEART_BEAT, "HeartBeat") //$NON-NLS-1$
-      {
+          {
         @Override
         protected void indicating(ExtendedDataInputStream in) throws Exception
         {
           checkState(in.readBoolean() == HEART_BEAT, "Invalid heart beat"); //$NON-NLS-1$
           timeouter.touch();
         }
-      };
+          };
     }
 
     return null;
@@ -236,13 +236,13 @@ public class HeartBeatProtocol extends SignalProtocol<Object>
       if (signalID == SIGNAL_START)
       {
         return new Indication(Server.this, SIGNAL_START, "Start") //$NON-NLS-1$
-        {
+            {
           @Override
           protected void indicating(ExtendedDataInputStream in) throws Exception
           {
             indicatingStart(in);
           }
-        };
+            };
       }
 
       return null;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/package-info.java
index 34435dcaf4..90ad099316 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * A signal protocol implementation that realizes a configurable heart beat protocol.
  */
 package org.eclipse.net4j.signal.heartbeat;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package-info.java
index 1b7105e81f..08d874d858 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package-info.java
@@ -1,12 +1,8 @@
 /*
- * Copyright (c) 2011, 2012 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 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 @@
  * <img src="doc-files/signals.png" title="Diagram Signals" border="0"/>
  */
 package org.eclipse.net4j.signal;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticatingSignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticatingSignalProtocol.java
index 083fdcb62d..22ccfc6f7b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticatingSignalProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticatingSignalProtocol.java
@@ -20,8 +20,8 @@ import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
  *
  * @since 4.3
  */
-public class AuthenticatingSignalProtocol<INFRA_STRUCTURE extends IPasswordCredentialsProvider.Provider> extends
-    SignalProtocol<INFRA_STRUCTURE> implements IPasswordCredentialsProvider.Provider
+public class AuthenticatingSignalProtocol<INFRA_STRUCTURE extends IPasswordCredentialsProvider.Provider>
+    extends SignalProtocol<INFRA_STRUCTURE>implements IPasswordCredentialsProvider.Provider
 {
   public AuthenticatingSignalProtocol(String type)
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticationRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticationRequest.java
index d836a60814..438987f258 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticationRequest.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/AuthenticationRequest.java
@@ -23,7 +23,7 @@ import org.eclipse.net4j.util.security.NotAuthenticatedException;
 
 /**
  * @author Eike Stepper
- * 
+ *
  * @since 4.3
  */
 public class AuthenticationRequest extends RequestWithMonitoring<Response>
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/package-info.java
index f0355e8470..d10582cbb2 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/security/package-info.java
@@ -1,19 +1,13 @@
 /*
- * Copyright (c) 2013 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
- *    Christian W. Damus (CEA LIST) - bug 418454: adapted from CDO Server
+ * Copyright (c) 2013 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 Christian W. Damus (CEA LIST) - bug 418454: adapted from CDO Server
  */
 
 /**
  * Reusable implementation of a server-to-client authentication signal and related API.
- * 
+ *
  * @since 4.3
  */
 package org.eclipse.net4j.signal.security;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/package-info.java
index ee2f6f1ee1..438bdcb9a6 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/wrapping/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
- * Some container injectors for use with signal protocols. 
+ * Some container injectors for use with signal protocols.
  */
 package org.eclipse.net4j.signal.wrapping;
-
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Acceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Acceptor.java
index 2d4eda767b..974393eaef 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Acceptor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Acceptor.java
@@ -34,7 +34,7 @@ import java.util.Set;
  * @author Eike Stepper
  * @since 2.0
  */
-public abstract class Acceptor extends Container<IConnector> implements InternalAcceptor
+public abstract class Acceptor extends Container<IConnector>implements InternalAcceptor
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_ACCEPTOR, Acceptor.class);
 
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
index ac65e27da4..06ae11e46d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
@@ -47,7 +47,7 @@ import java.util.concurrent.ConcurrentMap;
  * @author Eike Stepper
  * @since 2.0
  */
-public abstract class ChannelMultiplexer extends Container<IChannel> implements InternalChannelMultiplexer
+public abstract class ChannelMultiplexer extends Container<IChannel>implements InternalChannelMultiplexer
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CONNECTOR, ChannelMultiplexer.class);
 
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/package-info.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/package-info.java
index 45b856af19..a08472a06b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/package-info.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/package-info.java
@@ -1,16 +1,11 @@
 /*
- * Copyright (c) 2011-2013 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-2013 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
  */
 
 /**
  * Server service provider interfaces and useful base implementations for the Net4j transport layer.
  */
 package org.eclipse.spi.net4j;
-
diff --git a/plugins/org.gastro.business.edit/META-INF/MANIFEST.MF b/plugins/org.gastro.business.edit/META-INF/MANIFEST.MF
index 74439987a9..5d724d0948 100644
--- a/plugins/org.gastro.business.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.business.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.business.edit;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.gastro.business.provider.BusinessEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
index 7233816206..a7c17c79e8 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -43,7 +43,7 @@ import java.util.List;
  * @generated
  */
 public class BusinessDayItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -81,12 +81,12 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addDatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_BusinessDay_date_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
-        BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_BusinessDay_date_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_date_feature", "_UI_BusinessDay_type"),
+            BusinessPackage.Literals.BUSINESS_DAY__DATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -96,11 +96,11 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addMenuCardPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_BusinessDay_menuCard_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
-        BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_BusinessDay_menuCard_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_menuCard_feature", "_UI_BusinessDay_type"),
+            BusinessPackage.Literals.BUSINESS_DAY__MENU_CARD, true, false, true, null, null, null));
   }
 
   /**
@@ -110,12 +110,14 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addClosedPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_BusinessDay_closed_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature", "_UI_BusinessDay_type"),
-        BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_BusinessDay_closed_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_BusinessDay_closed_feature",
+                    "_UI_BusinessDay_type"),
+                BusinessPackage.Literals.BUSINESS_DAY__CLOSED, true, false, false,
+                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -184,7 +186,7 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -231,11 +233,11 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS,
-        BusinessFactory.eINSTANCE.createOrder()));
+    newChildDescriptors.add(
+        createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__ORDERS, BusinessFactory.eINSTANCE.createOrder()));
 
-    newChildDescriptors.add(createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS,
-        BusinessFactory.eINSTANCE.createWaiter()));
+    newChildDescriptors.add(
+        createChildParameter(BusinessPackage.Literals.BUSINESS_DAY__WAITERS, BusinessFactory.eINSTANCE.createWaiter()));
   }
 
   /**
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java
index 4327d49b3c..91a585b0f2 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
index 3ec079ae6f..f7b4dde36b 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,11 +38,11 @@ import java.util.Collection;
  * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable
+public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -63,7 +63,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -85,7 +85,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.business.BusinessDay} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected BusinessDayItemProvider businessDayItemProvider;
@@ -93,7 +93,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This creates an adapter for a {@link org.gastro.business.BusinessDay}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -134,7 +134,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.business.OrderDetail} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected OrderDetailItemProvider orderDetailItemProvider;
@@ -142,7 +142,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   /**
    * This creates an adapter for a {@link org.gastro.business.OrderDetail}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -232,7 +232,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
       {
         return adapter;
       }
@@ -278,20 +278,28 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This disposes all of the item providers created by this factory. 
+   * This disposes all of the item providers created by this factory.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void dispose()
   {
     if (businessDayItemProvider != null)
+    {
       businessDayItemProvider.dispose();
+    }
     if (orderItemProvider != null)
+    {
       orderItemProvider.dispose();
+    }
     if (orderDetailItemProvider != null)
+    {
       orderDetailItemProvider.dispose();
+    }
     if (waiterItemProvider != null)
+    {
       waiterItemProvider.dispose();
+    }
   }
 
 }
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
index 07ec8ea930..7bb22afff9 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -40,7 +40,7 @@ import java.util.List;
  * @generated
  */
 public class OrderDetailItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,11 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addOfferingPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_offering_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
-        BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_OrderDetail_offering_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_offering_feature", "_UI_OrderDetail_type"),
+            BusinessPackage.Literals.ORDER_DETAIL__OFFERING, true, false, true, null, null, null));
   }
 
   /**
@@ -93,12 +93,14 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addQuantityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_quantity_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature", "_UI_OrderDetail_type"),
-        BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_OrderDetail_quantity_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_quantity_feature",
+                    "_UI_OrderDetail_type"),
+                BusinessPackage.Literals.ORDER_DETAIL__QUANTITY, true, false, false,
+                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -108,12 +110,14 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addStatePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_state_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature", "_UI_OrderDetail_type"),
-        BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_OrderDetail_state_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_state_feature",
+                    "_UI_OrderDetail_type"),
+                BusinessPackage.Literals.ORDER_DETAIL__STATE, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -123,12 +127,14 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_price_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
-        BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_OrderDetail_price_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature",
+                    "_UI_OrderDetail_type"),
+                BusinessPackage.Literals.ORDER_DETAIL__PRICE, false, false, false,
+                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
@@ -164,15 +170,15 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
   public String getText(Object object)
   {
     OrderDetail orderDetail = (OrderDetail)object;
-    return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type") : orderDetail.getOffering().getName()
-        + " " + orderDetail.getQuantity();
+    return orderDetail.getOffering() == null ? getString("_UI_OrderDetail_type")
+        : orderDetail.getOffering().getName() + " " + orderDetail.getQuantity();
   }
 
   /**
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
index a54bb59ef4..fc769b052f 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -42,7 +42,7 @@ import java.util.List;
  * @generated
  */
 public class OrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,11 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addTablePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Order_table_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
-        BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Order_table_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Order_table_feature", "_UI_Order_type"),
+            BusinessPackage.Literals.ORDER__TABLE, true, false, true, null, null, null));
   }
 
   /**
@@ -93,12 +93,12 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
    */
   protected void addNumberPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Order_number_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
-        BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Order_number_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Order_number_feature", "_UI_Order_type"),
+            BusinessPackage.Literals.ORDER__NUMBER, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+            null, null));
   }
 
   /**
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
index 4dc932da3a..a4a99c09fa 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
@@ -40,7 +40,7 @@ import java.util.List;
  * @generated
  */
 public class WaiterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
@@ -79,11 +79,11 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addTablesPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Waiter_tables_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
-        BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Waiter_tables_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_tables_feature", "_UI_Waiter_type"),
+            BusinessPackage.Literals.WAITER__TABLES, true, false, true, null, null, null));
   }
 
   /**
@@ -93,11 +93,11 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addEmployeePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Waiter_employee_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
-        BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Waiter_employee_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_employee_feature", "_UI_Waiter_type"),
+            BusinessPackage.Literals.WAITER__EMPLOYEE, true, false, true, null, null, null));
   }
 
   /**
@@ -107,12 +107,12 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addFromPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Waiter_from_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
-        BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Waiter_from_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_from_feature", "_UI_Waiter_type"),
+            BusinessPackage.Literals.WAITER__FROM, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -122,12 +122,12 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
    */
   protected void addUntilPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Waiter_until_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
-        BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Waiter_until_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Waiter_until_feature", "_UI_Waiter_type"),
+            BusinessPackage.Literals.WAITER__UNTIL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -163,7 +163,7 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
diff --git a/plugins/org.gastro.business/META-INF/MANIFEST.MF b/plugins/org.gastro.business/META-INF/MANIFEST.MF
index acd41fd762..51cbd6f9a9 100644
--- a/plugins/org.gastro.business/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.business/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.business;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.business;version="4.0.300",
- org.gastro.business.impl;version="4.0.300",
- org.gastro.business.util;version="4.0.300"
+Export-Package: org.gastro.business;version="4.0.400",
+ org.gastro.business.impl;version="4.0.400",
+ org.gastro.business.util;version="4.0.400"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
diff --git a/plugins/org.gastro.business/src/org/gastro/business/BusinessDay.java b/plugins/org.gastro.business/src/org/gastro/business/BusinessDay.java
index 6da8ed65fe..07cc913f3d 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/BusinessDay.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/BusinessDay.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -60,7 +60,7 @@ public interface BusinessDay extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.BusinessDay#getDate <em>Date</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Date</em>' attribute.
    * @see #getDate()
@@ -87,7 +87,7 @@ public interface BusinessDay extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.BusinessDay#getMenuCard <em>Menu Card</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Menu Card</em>' reference.
    * @see #getMenuCard()
@@ -149,7 +149,7 @@ public interface BusinessDay extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.BusinessDay#isClosed <em>Closed</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Closed</em>' attribute.
    * @see #isClosed()
diff --git a/plugins/org.gastro.business/src/org/gastro/business/BusinessFactory.java b/plugins/org.gastro.business/src/org/gastro/business/BusinessFactory.java
index 44227c9eb2..134c3e66b0 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/BusinessFactory.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/BusinessFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/BusinessPackage.java b/plugins/org.gastro.business/src/org/gastro/business/BusinessPackage.java
index 76ca4ff404..94c8dbaca4 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/BusinessPackage.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/BusinessPackage.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -65,7 +65,7 @@ public interface BusinessPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.business.impl.BusinessDayImpl <em>Day</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.business.impl.BusinessDayImpl
    * @see org.gastro.business.impl.BusinessPackageImpl#getBusinessDay()
    * @generated
@@ -177,7 +177,7 @@ public interface BusinessPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.business.impl.OrderDetailImpl <em>Order Detail</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.business.impl.OrderDetailImpl
    * @see org.gastro.business.impl.BusinessPackageImpl#getOrderDetail()
    * @generated
@@ -227,7 +227,7 @@ public interface BusinessPackage extends EPackage
   /**
    * The number of structural features of the '<em>Order Detail</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -315,7 +315,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.BusinessDay#getDate <em>Date</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Date</em>'.
    * @see org.gastro.business.BusinessDay#getDate()
    * @see #getBusinessDay()
@@ -356,7 +356,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.BusinessDay#isClosed <em>Closed</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Closed</em>'.
    * @see org.gastro.business.BusinessDay#isClosed()
    * @see #getBusinessDay()
@@ -387,7 +387,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.business.Order#getTable <em>Table</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Table</em>'.
    * @see org.gastro.business.Order#getTable()
    * @see #getOrder()
@@ -408,7 +408,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.Order#getNumber <em>Number</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Number</em>'.
    * @see org.gastro.business.Order#getNumber()
    * @see #getOrder()
@@ -419,7 +419,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.business.OrderDetail <em>Order Detail</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Order Detail</em>'.
    * @see org.gastro.business.OrderDetail
    * @generated
@@ -459,7 +459,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.OrderDetail#getState <em>State</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>State</em>'.
    * @see org.gastro.business.OrderDetail#getState()
    * @see #getOrderDetail()
@@ -470,7 +470,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.OrderDetail#getPrice <em>Price</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Price</em>'.
    * @see org.gastro.business.OrderDetail#getPrice()
    * @see #getOrderDetail()
@@ -501,7 +501,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the reference list '{@link org.gastro.business.Waiter#getTables <em>Tables</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Tables</em>'.
    * @see org.gastro.business.Waiter#getTables()
    * @see #getWaiter()
@@ -512,7 +512,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.business.Waiter#getEmployee <em>Employee</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Employee</em>'.
    * @see org.gastro.business.Waiter#getEmployee()
    * @see #getWaiter()
@@ -523,7 +523,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.Waiter#getFrom <em>From</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>From</em>'.
    * @see org.gastro.business.Waiter#getFrom()
    * @see #getWaiter()
@@ -534,7 +534,7 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.Waiter#getUntil <em>Until</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Until</em>'.
    * @see org.gastro.business.Waiter#getUntil()
    * @see #getWaiter()
@@ -576,7 +576,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.business.impl.BusinessDayImpl <em>Day</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.business.impl.BusinessDayImpl
      * @see org.gastro.business.impl.BusinessPackageImpl#getBusinessDay()
      * @generated
@@ -626,7 +626,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.business.impl.OrderImpl <em>Order</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.business.impl.OrderImpl
      * @see org.gastro.business.impl.BusinessPackageImpl#getOrder()
      * @generated
@@ -652,7 +652,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Order Details</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails();
@@ -717,7 +717,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.business.impl.WaiterImpl <em>Waiter</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.business.impl.WaiterImpl
      * @see org.gastro.business.impl.BusinessPackageImpl#getWaiter()
      * @generated
@@ -767,7 +767,7 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.business.OrderState <em>Order State</em>}' enum. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.business.OrderState
      * @see org.gastro.business.impl.BusinessPackageImpl#getOrderState()
      * @generated
diff --git a/plugins/org.gastro.business/src/org/gastro/business/Order.java b/plugins/org.gastro.business/src/org/gastro/business/Order.java
index 2ae623955f..618a9c1a96 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/Order.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/Order.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/OrderDetail.java b/plugins/org.gastro.business/src/org/gastro/business/OrderDetail.java
index 585580d634..1c89d8284f 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/OrderDetail.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/OrderDetail.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -59,7 +59,7 @@ public interface OrderDetail extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.OrderDetail#getOrder <em>Order</em>}' container reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Order</em>' container reference.
    * @see #getOrder()
@@ -86,7 +86,7 @@ public interface OrderDetail extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.OrderDetail#getOffering <em>Offering</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Offering</em>' reference.
    * @see #getOffering()
@@ -113,7 +113,7 @@ public interface OrderDetail extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.OrderDetail#getQuantity <em>Quantity</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Quantity</em>' attribute.
    * @see #getQuantity()
@@ -141,7 +141,7 @@ public interface OrderDetail extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.OrderDetail#getState <em>State</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>State</em>' attribute.
    * @see org.gastro.business.OrderState
diff --git a/plugins/org.gastro.business/src/org/gastro/business/OrderState.java b/plugins/org.gastro.business/src/org/gastro/business/OrderState.java
index 0d0d324e60..0a3cd87ff9 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/OrderState.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/OrderState.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/Waiter.java b/plugins/org.gastro.business/src/org/gastro/business/Waiter.java
index c0bac1bbb9..27e10fc0d8 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/Waiter.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/Waiter.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -105,7 +105,7 @@ public interface Waiter extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.Waiter#getEmployee <em>Employee</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Employee</em>' reference.
    * @see #getEmployee()
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java
index 12ce36b444..e3ea70101d 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
index 16c66488c8..019192aa11 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -77,13 +77,13 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
     switch (eClass.getClassifierID())
     {
     case BusinessPackage.BUSINESS_DAY:
-      return (EObject)createBusinessDay();
+      return createBusinessDay();
     case BusinessPackage.ORDER:
-      return (EObject)createOrder();
+      return createOrder();
     case BusinessPackage.ORDER_DETAIL:
-      return (EObject)createOrderDetail();
+      return createOrderDetail();
     case BusinessPackage.WAITER:
-      return (EObject)createWaiter();
+      return createWaiter();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -169,8 +169,10 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
   {
     OrderState result = OrderState.get(initialValue);
     if (result == null)
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
+    {
+      throw new IllegalArgumentException(
+          "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
index 37e17bbc98..093ceaff84 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -72,7 +72,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.gastro.business.BusinessPackage#eNS_URI
    * @see #init()
@@ -91,7 +91,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link BusinessPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -104,11 +104,14 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
   public static BusinessPackage init()
   {
     if (isInited)
+    {
       return (BusinessPackage)EPackage.Registry.INSTANCE.getEPackage(BusinessPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BusinessPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new BusinessPackageImpl());
+    BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof BusinessPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new BusinessPackageImpl());
 
     isInited = true;
 
@@ -369,7 +372,9 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -419,7 +424,9 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -440,52 +447,52 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
     // Initialize classes and features; add operations and parameters
     initEClass(businessDayEClass, BusinessDay.class, "BusinessDay", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBusinessDay_Date(), ecorePackage.getEDate(), "date", null, 0, 1, BusinessDay.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1,
         BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Orders(), this.getOrder(), this.getOrder_BusinessDay(), "orders", null, 0, -1,
+    initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1,
         BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Waiters(), this.getWaiter(), this.getWaiter_BusinessDay(), "waiters", null, 1, -1,
+    initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1,
         BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_BusinessDay(), this.getBusinessDay(), this.getBusinessDay_Orders(), "businessDay", null, 1,
-        1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+    initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1,
+        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null,
-        1, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1,
+        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1,
-        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
     initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1,
         OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_State(), this.getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
+    initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
         IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(waiterEClass, Waiter.class, "Waiter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getWaiter_BusinessDay(), this.getBusinessDay(), this.getBusinessDay_Waiters(), "businessDay", null,
-        0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1,
+        Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java
index 452d755b5d..28685dc708 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -143,7 +143,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public float getPrice()
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java
index fa15aeb7f8..1416debcbb 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java
index 071434f87a..844e18ea44 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java b/plugins/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java
index 26299cc6e3..515c948521 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -129,7 +129,7 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.business.BusinessDay <em>Day</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.business.BusinessDay
    * @generated
@@ -143,7 +143,7 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.business.Order <em>Order</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.business.Order
    * @generated
@@ -157,7 +157,7 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.business.OrderDetail <em>Order Detail</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.business.OrderDetail
    * @generated
@@ -171,7 +171,7 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.business.Waiter <em>Waiter</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.business.Waiter
    * @generated
diff --git a/plugins/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java b/plugins/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java
index 98972aa110..1b90010bc4 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -29,7 +29,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.business.BusinessPackage
  * @generated
  */
@@ -37,14 +37,14 @@ public class BusinessSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static BusinessPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public BusinessSwitch()
@@ -58,7 +58,7 @@ public class BusinessSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -70,7 +70,7 @@ public class BusinessSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -90,7 +90,7 @@ public class BusinessSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -146,7 +146,7 @@ public class BusinessSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Day</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Day</em>'.
@@ -161,7 +161,7 @@ public class BusinessSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Order</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Order</em>'.
@@ -176,7 +176,7 @@ public class BusinessSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Order Detail</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Order Detail</em>'.
@@ -191,7 +191,7 @@ public class BusinessSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Waiter</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Waiter</em>'.
@@ -207,7 +207,7 @@ public class BusinessSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF b/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF
index e1b03189ea..b239ef8ab1 100644
--- a/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.inventory.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.inventory.edit;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.gastro.inventory.provider.InventoryEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
index 6eed6fd5c5..0114db4dca 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/DepartmentItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,15 +34,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Department} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class DepartmentItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public DepartmentItemProvider(AdapterFactory adapterFactory)
@@ -52,7 +52,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -89,7 +89,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -103,7 +103,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * This returns Department.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -114,7 +114,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -125,7 +125,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -138,7 +138,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -160,7 +160,7 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -168,14 +168,14 @@ public class DepartmentItemProvider extends StationItemProvider implements IEdit
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES,
-        InventoryFactory.eINSTANCE.createRecipe()));
+    newChildDescriptors.add(
+        createChildParameter(InventoryPackage.Literals.DEPARTMENT__RECIPES, InventoryFactory.eINSTANCE.createRecipe()));
 
     newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__EMPLOYEES,
         InventoryFactory.eINSTANCE.createEmployee()));
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS,
-        InventoryFactory.eINSTANCE.createStock()));
+    newChildDescriptors.add(
+        createChildParameter(InventoryPackage.Literals.DEPARTMENT__STOCKS, InventoryFactory.eINSTANCE.createStock()));
   }
 
 }
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
index f93a968ed6..cd9108b7a0 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/EmployeeItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Employee} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class EmployeeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EmployeeItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,22 +71,22 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Employee_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
-        InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Employee_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Employee_name_feature", "_UI_Employee_type"),
+            InventoryPackage.Literals.EMPLOYEE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -97,7 +97,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns Employee.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -108,7 +108,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -119,7 +119,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -132,7 +132,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -152,7 +152,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -163,7 +163,7 @@ public class EmployeeItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
index 1c47d3f764..f5382d0bdc 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/IngredientItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Ingredient} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class IngredientItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public IngredientItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -72,36 +72,38 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This adds a property descriptor for the Product feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Ingredient_product_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
-        InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Ingredient_product_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_product_feature", "_UI_Ingredient_type"),
+            InventoryPackage.Literals.INGREDIENT__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
    * This adds a property descriptor for the Quantity feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addQuantityPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Ingredient_quantity_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature", "_UI_Ingredient_type"),
-        InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_Ingredient_quantity_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_Ingredient_quantity_feature",
+                    "_UI_Ingredient_type"),
+                InventoryPackage.Literals.INGREDIENT__QUANTITY, true, false, false,
+                ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -112,7 +114,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns Ingredient.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -123,7 +125,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -134,21 +136,21 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
   public String getText(Object object)
   {
     Ingredient ingredient = (Ingredient)object;
-    return ingredient.getProduct() == null ? getString("_UI_Ingredient_type") : ingredient.getProduct().getName() + " "
-        + ingredient.getQuantity();
+    return ingredient.getProduct() == null ? getString("_UI_Ingredient_type")
+        : ingredient.getProduct().getName() + " " + ingredient.getQuantity();
   }
 
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -169,7 +171,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -180,7 +182,7 @@ public class IngredientItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryEditPlugin.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryEditPlugin.java
index cf52cf3fe2..2554609a41 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryEditPlugin.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryEditPlugin.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -18,28 +18,28 @@ import org.eclipse.emf.common.util.ResourceLocator;
 
 /**
  * This is the central singleton for the Inventory edit plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public final class InventoryEditPlugin extends EMFPlugin
 {
   /**
    * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static final InventoryEditPlugin INSTANCE = new InventoryEditPlugin();
 
   /**
    * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static Implementation plugin;
 
   /**
    * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryEditPlugin()
@@ -49,7 +49,7 @@ public final class InventoryEditPlugin extends EMFPlugin
 
   /**
    * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the singleton instance.
    * @generated
    */
@@ -61,7 +61,7 @@ public final class InventoryEditPlugin extends EMFPlugin
 
   /**
    * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the singleton instance.
    * @generated
    */
@@ -72,14 +72,14 @@ public final class InventoryEditPlugin extends EMFPlugin
 
   /**
    * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static class Implementation extends EclipsePlugin
   {
     /**
      * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public Implementation()
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
index 3b24cd96ec..b99c0871b7 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,16 +38,16 @@ import java.util.Collection;
  * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
-public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory implements ComposeableAdapterFactory,
-    IChangeNotifier, IDisposable
+public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
+    implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
 {
   /**
    * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -63,14 +63,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
   /**
    * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryItemProviderAdapterFactory()
@@ -85,14 +85,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Stock} instances. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StockItemProvider stockItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Stock}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -109,7 +109,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.StockProduct} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StockProductItemProvider stockProductItemProvider;
@@ -117,7 +117,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This creates an adapter for a {@link org.gastro.inventory.StockProduct}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -134,14 +134,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Recipe} instances. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected RecipeItemProvider recipeItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Recipe}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -158,7 +158,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Ingredient} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IngredientItemProvider ingredientItemProvider;
@@ -166,7 +166,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Ingredient}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -183,14 +183,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.MenuCard} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected MenuCardItemProvider menuCardItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.MenuCard}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -207,7 +207,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Restaurant} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected RestaurantItemProvider restaurantItemProvider;
@@ -215,7 +215,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Restaurant}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -232,7 +232,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Department} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected DepartmentItemProvider departmentItemProvider;
@@ -240,7 +240,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Department}. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -257,14 +257,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Offering} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected OfferingItemProvider offeringItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Offering}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -281,14 +281,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Table} instances. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TableItemProvider tableItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Table}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -305,14 +305,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Employee} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected EmployeeItemProvider employeeItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Employee}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -329,14 +329,14 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This keeps track of the one adapter used for all {@link org.gastro.inventory.Section} instances. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected SectionItemProvider sectionItemProvider;
 
   /**
    * This creates an adapter for a {@link org.gastro.inventory.Section}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -352,7 +352,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ComposeableAdapterFactory getRootAdapterFactory()
@@ -362,7 +362,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
@@ -372,7 +372,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -384,7 +384,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -395,7 +395,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -404,7 +404,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
       {
         return adapter;
       }
@@ -415,7 +415,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void addListener(INotifyChangedListener notifyChangedListener)
@@ -425,7 +425,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void removeListener(INotifyChangedListener notifyChangedListener)
@@ -436,7 +436,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   /**
    * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void fireNotifyChanged(Notification notification)
@@ -451,33 +451,55 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
 
   /**
    * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void dispose()
   {
     if (stockItemProvider != null)
+    {
       stockItemProvider.dispose();
+    }
     if (stockProductItemProvider != null)
+    {
       stockProductItemProvider.dispose();
+    }
     if (recipeItemProvider != null)
+    {
       recipeItemProvider.dispose();
+    }
     if (ingredientItemProvider != null)
+    {
       ingredientItemProvider.dispose();
+    }
     if (menuCardItemProvider != null)
+    {
       menuCardItemProvider.dispose();
+    }
     if (restaurantItemProvider != null)
+    {
       restaurantItemProvider.dispose();
+    }
     if (departmentItemProvider != null)
+    {
       departmentItemProvider.dispose();
+    }
     if (offeringItemProvider != null)
+    {
       offeringItemProvider.dispose();
+    }
     if (tableItemProvider != null)
+    {
       tableItemProvider.dispose();
+    }
     if (employeeItemProvider != null)
+    {
       employeeItemProvider.dispose();
+    }
     if (sectionItemProvider != null)
+    {
       sectionItemProvider.dispose();
+    }
   }
 
 }
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
index 48f32943d1..a92cb3fdf4 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/MenuCardItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,15 +38,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.MenuCard} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class MenuCardItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public MenuCardItemProvider(AdapterFactory adapterFactory)
@@ -56,7 +56,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,17 +73,17 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_MenuCard_title_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
-        InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_MenuCard_title_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_MenuCard_title_feature", "_UI_MenuCard_type"),
+            InventoryPackage.Literals.MENU_CARD__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -91,7 +91,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -107,7 +107,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -121,7 +121,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -132,7 +132,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns MenuCard.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -143,7 +143,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -154,7 +154,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -167,7 +167,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -190,7 +190,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -204,7 +204,7 @@ public class MenuCardItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
index 5169a6206e..576d12190d 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/OfferingItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Offering} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class OfferingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public OfferingItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -74,66 +74,68 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This adds a property descriptor for the Product feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addProductPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Offering_product_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
-        InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Offering_product_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Offering_product_feature", "_UI_Offering_type"),
+            InventoryPackage.Literals.OFFERING__PRODUCT, true, false, true, null, null, null));
   }
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Offering_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
-        InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Offering_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Offering_name_feature", "_UI_Offering_type"),
+            InventoryPackage.Literals.OFFERING__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addDescriptionPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Offering_description_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature", "_UI_Offering_type"),
-        InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false,
-        ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_Offering_description_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_Offering_description_feature",
+                    "_UI_Offering_type"),
+                InventoryPackage.Literals.OFFERING__DESCRIPTION, true, false, false,
+                ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
    * This adds a property descriptor for the Price feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addPricePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Offering_price_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
-        InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Offering_price_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Offering_price_feature", "_UI_Offering_type"),
+            InventoryPackage.Literals.OFFERING__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -144,7 +146,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns Offering.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -155,7 +157,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -166,7 +168,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -179,7 +181,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -201,7 +203,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -212,7 +214,7 @@ public class OfferingItemProvider extends ItemProviderAdapter implements IEditin
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
index 0ed6b643fc..71b0444b44 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/ProductItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Product} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ProductItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public ProductItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,22 +71,22 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Product_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
-        InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_name_feature", "_UI_Product_type"),
+            InventoryPackage.Literals.PRODUCT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -97,7 +97,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -108,7 +108,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -121,7 +121,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -141,7 +141,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -152,7 +152,7 @@ public class ProductItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
index 81c17e36d7..c4a6e304f5 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RecipeItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Recipe} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class RecipeItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public RecipeItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,17 +71,17 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * This adds a property descriptor for the Cost feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addCostPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Recipe_cost_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
-        InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Recipe_cost_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Recipe_cost_feature", "_UI_Recipe_type"),
+            InventoryPackage.Literals.RECIPE__COST, false, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -89,7 +89,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -105,7 +105,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -119,7 +119,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * This returns Recipe.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -130,7 +130,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -141,7 +141,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -154,7 +154,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -177,7 +177,7 @@ public class RecipeItemProvider extends ProductItemProvider implements IEditingD
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
index 2063cb8f15..eaf325c722 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/RestaurantItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,15 +38,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Restaurant} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class RestaurantItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public RestaurantItemProvider(AdapterFactory adapterFactory)
@@ -56,7 +56,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -74,31 +74,31 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Restaurant_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
-        InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Restaurant_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_name_feature", "_UI_Restaurant_type"),
+            InventoryPackage.Literals.RESTAURANT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This adds a property descriptor for the Stations feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addStationsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Restaurant_stations_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
-        InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Restaurant_stations_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Restaurant_stations_feature", "_UI_Restaurant_type"),
+            InventoryPackage.Literals.RESTAURANT__STATIONS, false, false, false, null, null, null));
   }
 
   /**
@@ -106,7 +106,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -124,7 +124,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -138,7 +138,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -149,7 +149,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns Restaurant.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -160,7 +160,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -171,7 +171,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -184,7 +184,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -209,7 +209,7 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -223,13 +223,13 @@ public class RestaurantItemProvider extends ItemProviderAdapter implements IEdit
     newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__MENU_CARDS,
         InventoryFactory.eINSTANCE.createMenuCard()));
 
-    newChildDescriptors.add(createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES,
-        InventoryFactory.eINSTANCE.createTable()));
+    newChildDescriptors.add(
+        createChildParameter(InventoryPackage.Literals.RESTAURANT__TABLES, InventoryFactory.eINSTANCE.createTable()));
   }
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
index 8f3d5ca278..129eed0f74 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/SectionItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,15 +38,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Section} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class SectionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public SectionItemProvider(AdapterFactory adapterFactory)
@@ -56,7 +56,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -74,32 +74,32 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This adds a property descriptor for the Title feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addTitlePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Section_title_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
-        InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Section_title_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Section_title_feature", "_UI_Section_type"),
+            InventoryPackage.Literals.SECTION__TITLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This adds a property descriptor for the Text feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addTextPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Section_text_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
-        InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Section_text_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Section_text_feature", "_UI_Section_type"),
+            InventoryPackage.Literals.SECTION__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+            null, null));
   }
 
   /**
@@ -107,7 +107,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -123,7 +123,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -137,7 +137,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -148,7 +148,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns Section.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -159,7 +159,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -170,7 +170,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -183,7 +183,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -207,7 +207,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -221,7 +221,7 @@ public class SectionItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
index 459f9b770c..ba07e0337e 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StationItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,15 +36,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Station} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class StationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public StationItemProvider(AdapterFactory adapterFactory)
@@ -54,7 +54,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,22 +71,22 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This adds a property descriptor for the Station ID feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addStationIDPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Station_stationID_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
-        InventoryPackage.Literals.STATION__STATION_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Station_stationID_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Station_stationID_feature", "_UI_Station_type"),
+            InventoryPackage.Literals.STATION__STATION_ID, true, false, false,
+            ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -97,7 +97,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -108,7 +108,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -121,7 +121,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -141,7 +141,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -152,7 +152,7 @@ public class StationItemProvider extends ItemProviderAdapter implements IEditing
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
index e07070c8f3..e4d6aeb08c 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,15 +38,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Stock} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class StockItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public StockItemProvider(AdapterFactory adapterFactory)
@@ -56,7 +56,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,17 +73,17 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addNamePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Stock_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
-        InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Stock_name_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Stock_name_feature", "_UI_Stock_type"),
+            InventoryPackage.Literals.STOCK__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
+            null));
   }
 
   /**
@@ -91,7 +91,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
    * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -107,7 +107,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -121,7 +121,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -132,7 +132,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * This returns Stock.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -143,7 +143,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -154,7 +154,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -167,7 +167,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -190,7 +190,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -204,7 +204,7 @@ public class StockItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
index d7870ae615..44bab02b6c 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/StockProductItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,15 +34,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.StockProduct} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class StockProductItemProvider extends ProductItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public StockProductItemProvider(AdapterFactory adapterFactory)
@@ -52,7 +52,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,54 +71,56 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
 
   /**
    * This adds a property descriptor for the Cost feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addCostPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_StockProduct_cost_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature", "_UI_StockProduct_type"),
-        InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-        null, null));
+    itemPropertyDescriptors
+        .add(
+            createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                getResourceLocator(), getString("_UI_StockProduct_cost_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_cost_feature",
+                    "_UI_StockProduct_type"),
+                InventoryPackage.Literals.STOCK_PRODUCT__COST, true, false, false,
+                ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
   }
 
   /**
    * This adds a property descriptor for the Available feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addAvailablePropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_StockProduct_available_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature", "_UI_StockProduct_type"),
-        InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false,
-        ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_StockProduct_available_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_available_feature",
+                "_UI_StockProduct_type"),
+            InventoryPackage.Literals.STOCK_PRODUCT__AVAILABLE, true, false, false,
+            ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
    * This adds a property descriptor for the Order Limit feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addOrderLimitPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(
-            ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-            getResourceLocator(),
-            getString("_UI_StockProduct_orderLimit_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature",
-                "_UI_StockProduct_type"), InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false,
+    .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+        getResourceLocator(), getString("_UI_StockProduct_orderLimit_feature"),
+        getString("_UI_PropertyDescriptor_description", "_UI_StockProduct_orderLimit_feature",
+            "_UI_StockProduct_type"),
+            InventoryPackage.Literals.STOCK_PRODUCT__ORDER_LIMIT, true, false, false,
             ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
   }
 
   /**
    * This returns StockProduct.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -129,7 +131,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -140,7 +142,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -153,7 +155,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -175,7 +177,7 @@ public class StockProductItemProvider extends ProductItemProvider implements IEd
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
index 9aa11b674f..ff6b6643c2 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/TableItemProvider.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,15 +34,15 @@ import java.util.List;
 /**
  * This is the item provider adapter for a {@link org.gastro.inventory.Table} object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class TableItemProvider extends StationItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public TableItemProvider(AdapterFactory adapterFactory)
@@ -52,7 +52,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
 
   /**
    * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -69,22 +69,22 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
 
   /**
    * This adds a property descriptor for the Seats feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected void addSeatsPropertyDescriptor(Object object)
   {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Table_seats_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
-        InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null,
-        null));
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Table_seats_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Table_seats_feature", "_UI_Table_type"),
+            InventoryPackage.Literals.TABLE__SEATS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+            null, null));
   }
 
   /**
    * This returns Table.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -95,7 +95,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -106,7 +106,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
 
   /**
    * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
@@ -119,7 +119,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
   /**
    * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
    * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -139,7 +139,7 @@ public class TableItemProvider extends StationItemProvider implements IEditingDo
   /**
    * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
    * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.inventory/META-INF/MANIFEST.MF b/plugins/org.gastro.inventory/META-INF/MANIFEST.MF
index 5938f42e08..3463c7e000 100644
--- a/plugins/org.gastro.inventory/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.inventory/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.inventory;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.gastro.inventory;version="4.0.300",
- org.gastro.inventory.impl;version="4.0.300",
- org.gastro.inventory.util;version="4.0.300"
+Export-Package: org.gastro.inventory;version="4.0.400",
+ org.gastro.inventory.impl;version="4.0.400",
+ org.gastro.inventory.util;version="4.0.400"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Department.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Department.java
index a347f500dc..a4c547a532 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Department.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Department.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -26,7 +26,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Department#getStocks <em>Stocks</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getDepartment()
  * @model
  * @generated
@@ -42,7 +42,7 @@ public interface Department extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Recipes</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getDepartment_Recipes()
    * @see org.gastro.inventory.Recipe#getDepartment
@@ -59,7 +59,7 @@ public interface Department extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Restaurant</em>' container reference.
    * @see #setRestaurant(Restaurant)
    * @see org.gastro.inventory.InventoryPackage#getDepartment_Restaurant()
@@ -72,7 +72,7 @@ public interface Department extends Station
   /**
    * Sets the value of the '{@link org.gastro.inventory.Department#getRestaurant <em>Restaurant</em>}' container
    * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Restaurant</em>' container reference.
    * @see #getRestaurant()
@@ -89,7 +89,7 @@ public interface Department extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Employees</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getDepartment_Employees()
    * @see org.gastro.inventory.Employee#getDepartment
@@ -107,7 +107,7 @@ public interface Department extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Stocks</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getDepartment_Stocks()
    * @see org.gastro.inventory.Stock#getDepartment
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Employee.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Employee.java
index 7e80a920ce..78f36531f8 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Employee.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Employee.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -24,7 +24,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Employee#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getEmployee()
  * @model
  * @extends CDOObject
@@ -40,7 +40,7 @@ public interface Employee extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Department</em>' container reference.
    * @see #setDepartment(Department)
    * @see org.gastro.inventory.InventoryPackage#getEmployee_Department()
@@ -53,7 +53,7 @@ public interface Employee extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Employee#getDepartment <em>Department</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Department</em>' reference.
    * @see #getDepartment()
@@ -67,7 +67,7 @@ public interface Employee extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getEmployee_Name()
@@ -79,7 +79,7 @@ public interface Employee extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Employee#getName <em>Name</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Ingredient.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Ingredient.java
index 41e4255236..7e57789dd2 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Ingredient.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Ingredient.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -25,7 +25,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Ingredient#getQuantity <em>Quantity</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getIngredient()
  * @model
  * @extends CDOObject
@@ -41,7 +41,7 @@ public interface Ingredient extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Recipe</em>' container reference.
    * @see #setRecipe(Recipe)
    * @see org.gastro.inventory.InventoryPackage#getIngredient_Recipe()
@@ -54,7 +54,7 @@ public interface Ingredient extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Ingredient#getRecipe <em>Recipe</em>}' container reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Recipe</em>' container reference.
    * @see #getRecipe()
@@ -69,7 +69,7 @@ public interface Ingredient extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Product</em>' reference.
    * @see #setProduct(Product)
    * @see org.gastro.inventory.InventoryPackage#getIngredient_Product()
@@ -81,7 +81,7 @@ public interface Ingredient extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Ingredient#getProduct <em>Product</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Product</em>' reference.
    * @see #getProduct()
@@ -96,7 +96,7 @@ public interface Ingredient extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Quantity</em>' attribute.
    * @see #setQuantity(int)
    * @see org.gastro.inventory.InventoryPackage#getIngredient_Quantity()
@@ -108,7 +108,7 @@ public interface Ingredient extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Ingredient#getQuantity <em>Quantity</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Quantity</em>' attribute.
    * @see #getQuantity()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/InventoryFactory.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/InventoryFactory.java
index 37130977d8..ec347db9ef 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/InventoryFactory.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/InventoryFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage
  * @generated
  */
@@ -26,14 +26,14 @@ public interface InventoryFactory extends EFactory
 {
   /**
    * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   InventoryFactory eINSTANCE = org.gastro.inventory.impl.InventoryFactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Stock</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Stock</em>'.
    * @generated
    */
@@ -41,7 +41,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Stock Product</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Stock Product</em>'.
    * @generated
    */
@@ -49,7 +49,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Recipe</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Recipe</em>'.
    * @generated
    */
@@ -57,7 +57,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Ingredient</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Ingredient</em>'.
    * @generated
    */
@@ -65,7 +65,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Menu Card</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Menu Card</em>'.
    * @generated
    */
@@ -73,7 +73,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Restaurant</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Restaurant</em>'.
    * @generated
    */
@@ -81,7 +81,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Department</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Department</em>'.
    * @generated
    */
@@ -89,7 +89,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Offering</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Offering</em>'.
    * @generated
    */
@@ -97,7 +97,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Table</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Table</em>'.
    * @generated
    */
@@ -105,7 +105,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Employee</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Employee</em>'.
    * @generated
    */
@@ -113,7 +113,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns a new object of class '<em>Section</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return a new object of class '<em>Section</em>'.
    * @generated
    */
@@ -121,7 +121,7 @@ public interface InventoryFactory extends EFactory
 
   /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/InventoryPackage.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/InventoryPackage.java
index 29b4af7e1c..1bb4a562ca 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/InventoryPackage.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/InventoryPackage.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.inventory.InventoryFactory
  * @model kind="package"
  * @generated
@@ -36,28 +36,28 @@ public interface InventoryPackage extends EPackage
 {
   /**
    * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNAME = "inventory";
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_URI = "http://www.gastro.org/inventory/1.0";
 
   /**
    * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   String eNS_PREFIX = "inventory";
 
   /**
    * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   InventoryPackage eINSTANCE = org.gastro.inventory.impl.InventoryPackageImpl.init();
@@ -65,7 +65,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.StockImpl <em>Stock</em>}' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.StockImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getStock()
    * @generated
@@ -75,7 +75,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Products</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -83,7 +83,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -92,7 +92,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Department</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -100,7 +100,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Stock</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -109,7 +109,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.ProductImpl <em>Product</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.ProductImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getProduct()
    * @generated
@@ -118,7 +118,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -126,7 +126,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Product</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -135,7 +135,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.StockProductImpl <em>Stock Product</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.StockProductImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getStockProduct()
    * @generated
@@ -144,7 +144,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -152,7 +152,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Stock</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -160,7 +160,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Cost</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -168,7 +168,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Available</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -176,7 +176,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Order Limit</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -185,7 +185,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The number of structural features of the '<em>Stock Product</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -194,7 +194,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.RecipeImpl <em>Recipe</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.RecipeImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getRecipe()
    * @generated
@@ -203,7 +203,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -212,7 +212,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Ingredients</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -221,7 +221,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Department</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -229,7 +229,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Cost</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -237,7 +237,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Recipe</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -246,7 +246,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.IngredientImpl <em>Ingredient</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.IngredientImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getIngredient()
    * @generated
@@ -255,7 +255,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Recipe</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -263,7 +263,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -271,7 +271,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Quantity</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -279,7 +279,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Ingredient</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -288,7 +288,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.MenuCardImpl <em>Menu Card</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.MenuCardImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getMenuCard()
    * @generated
@@ -297,7 +297,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -306,7 +306,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Restaurant</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -315,7 +315,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Sections</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -323,7 +323,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Menu Card</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -332,7 +332,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.RestaurantImpl <em>Restaurant</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.RestaurantImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getRestaurant()
    * @generated
@@ -341,7 +341,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -350,7 +350,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Departments</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -359,7 +359,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Menu Cards</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -368,7 +368,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Tables</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -376,7 +376,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Stations</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -384,7 +384,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Restaurant</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -393,7 +393,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.StationImpl <em>Station</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.StationImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getStation()
    * @generated
@@ -402,7 +402,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Station ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -410,7 +410,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Station</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -419,7 +419,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.DepartmentImpl <em>Department</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.DepartmentImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getDepartment()
    * @generated
@@ -428,7 +428,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Station ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -437,7 +437,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Recipes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -446,7 +446,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Restaurant</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -455,7 +455,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Employees</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -464,7 +464,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Stocks</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -472,7 +472,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Department</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -481,7 +481,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.OfferingImpl <em>Offering</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.OfferingImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getOffering()
    * @generated
@@ -490,7 +490,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -498,7 +498,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -506,7 +506,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Description</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -514,7 +514,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -522,7 +522,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Section</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -530,7 +530,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Offering</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -539,7 +539,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.TableImpl <em>Table</em>}' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.TableImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getTable()
    * @generated
@@ -548,7 +548,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Station ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -556,7 +556,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Seats</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -565,7 +565,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Restaurant</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -573,7 +573,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Table</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -582,7 +582,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.EmployeeImpl <em>Employee</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.EmployeeImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getEmployee()
    * @generated
@@ -592,7 +592,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Department</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -600,7 +600,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -608,7 +608,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Employee</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -617,7 +617,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The meta object id for the '{@link org.gastro.inventory.impl.SectionImpl <em>Section</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.gastro.inventory.impl.SectionImpl
    * @see org.gastro.inventory.impl.InventoryPackageImpl#getSection()
    * @generated
@@ -627,7 +627,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Menu Card</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -636,7 +636,7 @@ public interface InventoryPackage extends EPackage
   /**
    * The feature id for the '<em><b>Offerings</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -644,7 +644,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -652,7 +652,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The feature id for the '<em><b>Text</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -660,7 +660,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * The number of structural features of the '<em>Section</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -669,7 +669,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Stock <em>Stock</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Stock</em>'.
    * @see org.gastro.inventory.Stock
    * @generated
@@ -679,7 +679,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Stock#getProducts
    * <em>Products</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Products</em>'.
    * @see org.gastro.inventory.Stock#getProducts()
    * @see #getStock()
@@ -690,7 +690,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Stock#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Stock#getName()
    * @see #getStock()
@@ -701,7 +701,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Stock#getDepartment
    * <em>Department</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Department</em>'.
    * @see org.gastro.inventory.Stock#getDepartment()
    * @see #getStock()
@@ -712,7 +712,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Product <em>Product</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Product</em>'.
    * @see org.gastro.inventory.Product
    * @generated
@@ -722,7 +722,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Product#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Product#getName()
    * @see #getProduct()
@@ -733,7 +733,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.StockProduct <em>Stock Product</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Stock Product</em>'.
    * @see org.gastro.inventory.StockProduct
    * @generated
@@ -743,7 +743,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.StockProduct#getStock
    * <em>Stock</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Stock</em>'.
    * @see org.gastro.inventory.StockProduct#getStock()
    * @see #getStockProduct()
@@ -754,7 +754,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.StockProduct#getCost <em>Cost</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Cost</em>'.
    * @see org.gastro.inventory.StockProduct#getCost()
    * @see #getStockProduct()
@@ -765,7 +765,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.StockProduct#getAvailable
    * <em>Available</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Available</em>'.
    * @see org.gastro.inventory.StockProduct#getAvailable()
    * @see #getStockProduct()
@@ -776,7 +776,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.StockProduct#getOrderLimit
    * <em>Order Limit</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Order Limit</em>'.
    * @see org.gastro.inventory.StockProduct#getOrderLimit()
    * @see #getStockProduct()
@@ -787,7 +787,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Recipe <em>Recipe</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Recipe</em>'.
    * @see org.gastro.inventory.Recipe
    * @generated
@@ -797,7 +797,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Recipe#getIngredients
    * <em>Ingredients</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Ingredients</em>'.
    * @see org.gastro.inventory.Recipe#getIngredients()
    * @see #getRecipe()
@@ -808,7 +808,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Recipe#getDepartment
    * <em>Department</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Department</em>'.
    * @see org.gastro.inventory.Recipe#getDepartment()
    * @see #getRecipe()
@@ -819,7 +819,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Recipe#getCost <em>Cost</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Cost</em>'.
    * @see org.gastro.inventory.Recipe#getCost()
    * @see #getRecipe()
@@ -830,7 +830,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Ingredient <em>Ingredient</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Ingredient</em>'.
    * @see org.gastro.inventory.Ingredient
    * @generated
@@ -840,7 +840,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Ingredient#getRecipe
    * <em>Recipe</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Recipe</em>'.
    * @see org.gastro.inventory.Ingredient#getRecipe()
    * @see #getIngredient()
@@ -851,7 +851,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.inventory.Ingredient#getProduct <em>Product</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Product</em>'.
    * @see org.gastro.inventory.Ingredient#getProduct()
    * @see #getIngredient()
@@ -862,7 +862,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Ingredient#getQuantity <em>Quantity</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Quantity</em>'.
    * @see org.gastro.inventory.Ingredient#getQuantity()
    * @see #getIngredient()
@@ -873,7 +873,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.MenuCard <em>Menu Card</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Menu Card</em>'.
    * @see org.gastro.inventory.MenuCard
    * @generated
@@ -883,7 +883,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.MenuCard#getTitle <em>Title</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Title</em>'.
    * @see org.gastro.inventory.MenuCard#getTitle()
    * @see #getMenuCard()
@@ -894,7 +894,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.MenuCard#getRestaurant
    * <em>Restaurant</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Restaurant</em>'.
    * @see org.gastro.inventory.MenuCard#getRestaurant()
    * @see #getMenuCard()
@@ -905,7 +905,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.MenuCard#getSections
    * <em>Sections</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Sections</em>'.
    * @see org.gastro.inventory.MenuCard#getSections()
    * @see #getMenuCard()
@@ -916,7 +916,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Restaurant <em>Restaurant</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Restaurant</em>'.
    * @see org.gastro.inventory.Restaurant
    * @generated
@@ -926,7 +926,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Restaurant#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Restaurant#getName()
    * @see #getRestaurant()
@@ -937,7 +937,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Restaurant#getDepartments
    * <em>Departments</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Departments</em>'.
    * @see org.gastro.inventory.Restaurant#getDepartments()
    * @see #getRestaurant()
@@ -948,7 +948,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Restaurant#getMenuCards
    * <em>Menu Cards</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Menu Cards</em>'.
    * @see org.gastro.inventory.Restaurant#getMenuCards()
    * @see #getRestaurant()
@@ -959,7 +959,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Restaurant#getTables
    * <em>Tables</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Tables</em>'.
    * @see org.gastro.inventory.Restaurant#getTables()
    * @see #getRestaurant()
@@ -970,7 +970,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the reference list '{@link org.gastro.inventory.Restaurant#getStations
    * <em>Stations</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Stations</em>'.
    * @see org.gastro.inventory.Restaurant#getStations()
    * @see #getRestaurant()
@@ -981,7 +981,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Department <em>Department</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Department</em>'.
    * @see org.gastro.inventory.Department
    * @generated
@@ -991,7 +991,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Department#getRecipes
    * <em>Recipes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Recipes</em>'.
    * @see org.gastro.inventory.Department#getRecipes()
    * @see #getDepartment()
@@ -1002,7 +1002,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Department#getRestaurant
    * <em>Restaurant</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Restaurant</em>'.
    * @see org.gastro.inventory.Department#getRestaurant()
    * @see #getDepartment()
@@ -1013,7 +1013,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Department#getEmployees
    * <em>Employees</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Employees</em>'.
    * @see org.gastro.inventory.Department#getEmployees()
    * @see #getDepartment()
@@ -1024,7 +1024,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Department#getStocks
    * <em>Stocks</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Stocks</em>'.
    * @see org.gastro.inventory.Department#getStocks()
    * @see #getDepartment()
@@ -1035,7 +1035,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Offering <em>Offering</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Offering</em>'.
    * @see org.gastro.inventory.Offering
    * @generated
@@ -1045,7 +1045,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.inventory.Offering#getProduct <em>Product</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference '<em>Product</em>'.
    * @see org.gastro.inventory.Offering#getProduct()
    * @see #getOffering()
@@ -1056,7 +1056,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Offering#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Offering#getName()
    * @see #getOffering()
@@ -1067,7 +1067,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Offering#getDescription
    * <em>Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Description</em>'.
    * @see org.gastro.inventory.Offering#getDescription()
    * @see #getOffering()
@@ -1078,7 +1078,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Offering#getPrice <em>Price</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Price</em>'.
    * @see org.gastro.inventory.Offering#getPrice()
    * @see #getOffering()
@@ -1089,7 +1089,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Offering#getSection
    * <em>Section</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Section</em>'.
    * @see org.gastro.inventory.Offering#getSection()
    * @see #getOffering()
@@ -1100,7 +1100,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Table <em>Table</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Table</em>'.
    * @see org.gastro.inventory.Table
    * @generated
@@ -1110,7 +1110,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Table#getSeats <em>Seats</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Seats</em>'.
    * @see org.gastro.inventory.Table#getSeats()
    * @see #getTable()
@@ -1121,7 +1121,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Table#getRestaurant
    * <em>Restaurant</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Restaurant</em>'.
    * @see org.gastro.inventory.Table#getRestaurant()
    * @see #getTable()
@@ -1132,7 +1132,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Employee <em>Employee</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Employee</em>'.
    * @see org.gastro.inventory.Employee
    * @generated
@@ -1142,7 +1142,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Employee#getDepartment
    * <em>Department</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Department</em>'.
    * @see org.gastro.inventory.Employee#getDepartment()
    * @see #getEmployee()
@@ -1153,7 +1153,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Employee#getName <em>Name</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.gastro.inventory.Employee#getName()
    * @see #getEmployee()
@@ -1164,7 +1164,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Station <em>Station</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Station</em>'.
    * @see org.gastro.inventory.Station
    * @generated
@@ -1174,7 +1174,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Station#getStationID <em>Station ID</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Station ID</em>'.
    * @see org.gastro.inventory.Station#getStationID()
    * @see #getStation()
@@ -1185,7 +1185,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.gastro.inventory.Section <em>Section</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Section</em>'.
    * @see org.gastro.inventory.Section
    * @generated
@@ -1195,7 +1195,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the container reference '{@link org.gastro.inventory.Section#getMenuCard
    * <em>Menu Card</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the container reference '<em>Menu Card</em>'.
    * @see org.gastro.inventory.Section#getMenuCard()
    * @see #getSection()
@@ -1206,7 +1206,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the containment reference list '{@link org.gastro.inventory.Section#getOfferings
    * <em>Offerings</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the containment reference list '<em>Offerings</em>'.
    * @see org.gastro.inventory.Section#getOfferings()
    * @see #getSection()
@@ -1217,7 +1217,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Section#getTitle <em>Title</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Title</em>'.
    * @see org.gastro.inventory.Section#getTitle()
    * @see #getSection()
@@ -1228,7 +1228,7 @@ public interface InventoryPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.inventory.Section#getText <em>Text</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the attribute '<em>Text</em>'.
    * @see org.gastro.inventory.Section#getText()
    * @see #getSection()
@@ -1238,7 +1238,7 @@ public interface InventoryPackage extends EPackage
 
   /**
    * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -1253,7 +1253,7 @@ public interface InventoryPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   interface Literals
@@ -1261,7 +1261,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.StockImpl <em>Stock</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.StockImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getStock()
      * @generated
@@ -1271,7 +1271,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference STOCK__PRODUCTS = eINSTANCE.getStock_Products();
@@ -1279,7 +1279,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STOCK__NAME = eINSTANCE.getStock_Name();
@@ -1287,7 +1287,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Department</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference STOCK__DEPARTMENT = eINSTANCE.getStock_Department();
@@ -1295,7 +1295,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.ProductImpl <em>Product</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.ProductImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getProduct()
      * @generated
@@ -1305,7 +1305,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute PRODUCT__NAME = eINSTANCE.getProduct_Name();
@@ -1313,7 +1313,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.StockProductImpl <em>Stock Product</em>}'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.StockProductImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getStockProduct()
      * @generated
@@ -1323,7 +1323,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Stock</b></em>' container reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference STOCK_PRODUCT__STOCK = eINSTANCE.getStockProduct_Stock();
@@ -1331,7 +1331,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Cost</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STOCK_PRODUCT__COST = eINSTANCE.getStockProduct_Cost();
@@ -1339,7 +1339,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Available</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STOCK_PRODUCT__AVAILABLE = eINSTANCE.getStockProduct_Available();
@@ -1347,7 +1347,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Order Limit</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STOCK_PRODUCT__ORDER_LIMIT = eINSTANCE.getStockProduct_OrderLimit();
@@ -1355,7 +1355,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.RecipeImpl <em>Recipe</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.RecipeImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getRecipe()
      * @generated
@@ -1365,7 +1365,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Ingredients</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RECIPE__INGREDIENTS = eINSTANCE.getRecipe_Ingredients();
@@ -1373,7 +1373,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Department</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RECIPE__DEPARTMENT = eINSTANCE.getRecipe_Department();
@@ -1381,7 +1381,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Cost</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute RECIPE__COST = eINSTANCE.getRecipe_Cost();
@@ -1389,7 +1389,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.IngredientImpl <em>Ingredient</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.IngredientImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getIngredient()
      * @generated
@@ -1399,7 +1399,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Recipe</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference INGREDIENT__RECIPE = eINSTANCE.getIngredient_Recipe();
@@ -1407,7 +1407,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference INGREDIENT__PRODUCT = eINSTANCE.getIngredient_Product();
@@ -1415,7 +1415,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Quantity</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute INGREDIENT__QUANTITY = eINSTANCE.getIngredient_Quantity();
@@ -1423,7 +1423,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.MenuCardImpl <em>Menu Card</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.MenuCardImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getMenuCard()
      * @generated
@@ -1433,7 +1433,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Title</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute MENU_CARD__TITLE = eINSTANCE.getMenuCard_Title();
@@ -1441,7 +1441,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Restaurant</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference MENU_CARD__RESTAURANT = eINSTANCE.getMenuCard_Restaurant();
@@ -1449,7 +1449,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Sections</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference MENU_CARD__SECTIONS = eINSTANCE.getMenuCard_Sections();
@@ -1457,7 +1457,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.RestaurantImpl <em>Restaurant</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.RestaurantImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getRestaurant()
      * @generated
@@ -1467,7 +1467,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute RESTAURANT__NAME = eINSTANCE.getRestaurant_Name();
@@ -1475,7 +1475,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Departments</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RESTAURANT__DEPARTMENTS = eINSTANCE.getRestaurant_Departments();
@@ -1483,7 +1483,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Menu Cards</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RESTAURANT__MENU_CARDS = eINSTANCE.getRestaurant_MenuCards();
@@ -1491,7 +1491,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Tables</b></em>' containment reference list feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RESTAURANT__TABLES = eINSTANCE.getRestaurant_Tables();
@@ -1499,7 +1499,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Stations</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference RESTAURANT__STATIONS = eINSTANCE.getRestaurant_Stations();
@@ -1507,7 +1507,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.DepartmentImpl <em>Department</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.DepartmentImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getDepartment()
      * @generated
@@ -1517,7 +1517,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Recipes</b></em>' containment reference list feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DEPARTMENT__RECIPES = eINSTANCE.getDepartment_Recipes();
@@ -1525,7 +1525,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Restaurant</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DEPARTMENT__RESTAURANT = eINSTANCE.getDepartment_Restaurant();
@@ -1533,7 +1533,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Employees</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DEPARTMENT__EMPLOYEES = eINSTANCE.getDepartment_Employees();
@@ -1541,7 +1541,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Stocks</b></em>' containment reference list feature. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference DEPARTMENT__STOCKS = eINSTANCE.getDepartment_Stocks();
@@ -1549,7 +1549,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.OfferingImpl <em>Offering</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.OfferingImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getOffering()
      * @generated
@@ -1559,7 +1559,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference OFFERING__PRODUCT = eINSTANCE.getOffering_Product();
@@ -1567,7 +1567,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute OFFERING__NAME = eINSTANCE.getOffering_Name();
@@ -1575,7 +1575,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Description</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute OFFERING__DESCRIPTION = eINSTANCE.getOffering_Description();
@@ -1583,7 +1583,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute OFFERING__PRICE = eINSTANCE.getOffering_Price();
@@ -1591,7 +1591,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Section</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference OFFERING__SECTION = eINSTANCE.getOffering_Section();
@@ -1599,7 +1599,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.TableImpl <em>Table</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.TableImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getTable()
      * @generated
@@ -1609,7 +1609,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Seats</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute TABLE__SEATS = eINSTANCE.getTable_Seats();
@@ -1617,7 +1617,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Restaurant</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference TABLE__RESTAURANT = eINSTANCE.getTable_Restaurant();
@@ -1625,7 +1625,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.EmployeeImpl <em>Employee</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.EmployeeImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getEmployee()
      * @generated
@@ -1635,7 +1635,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Department</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference EMPLOYEE__DEPARTMENT = eINSTANCE.getEmployee_Department();
@@ -1643,7 +1643,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute EMPLOYEE__NAME = eINSTANCE.getEmployee_Name();
@@ -1651,7 +1651,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.StationImpl <em>Station</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.StationImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getStation()
      * @generated
@@ -1661,7 +1661,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Station ID</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute STATION__STATION_ID = eINSTANCE.getStation_StationID();
@@ -1669,7 +1669,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.inventory.impl.SectionImpl <em>Section</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.gastro.inventory.impl.SectionImpl
      * @see org.gastro.inventory.impl.InventoryPackageImpl#getSection()
      * @generated
@@ -1679,7 +1679,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Menu Card</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference SECTION__MENU_CARD = eINSTANCE.getSection_MenuCard();
@@ -1687,7 +1687,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Offerings</b></em>' containment reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference SECTION__OFFERINGS = eINSTANCE.getSection_Offerings();
@@ -1695,7 +1695,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Title</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute SECTION__TITLE = eINSTANCE.getSection_Title();
@@ -1703,7 +1703,7 @@ public interface InventoryPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Text</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     EAttribute SECTION__TEXT = eINSTANCE.getSection_Text();
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/MenuCard.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/MenuCard.java
index 3f5d4387cf..55a0523ba6 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/MenuCard.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/MenuCard.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.MenuCard#getSections <em>Sections</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getMenuCard()
  * @model
  * @extends CDOObject
@@ -41,7 +41,7 @@ public interface MenuCard extends CDOObject
    * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Title</em>' attribute.
    * @see #setTitle(String)
    * @see org.gastro.inventory.InventoryPackage#getMenuCard_Title()
@@ -53,7 +53,7 @@ public interface MenuCard extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.MenuCard#getTitle <em>Title</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Title</em>' attribute.
    * @see #getTitle()
@@ -69,7 +69,7 @@ public interface MenuCard extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Restaurant</em>' container reference.
    * @see #setRestaurant(Restaurant)
    * @see org.gastro.inventory.InventoryPackage#getMenuCard_Restaurant()
@@ -82,7 +82,7 @@ public interface MenuCard extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.MenuCard#getRestaurant <em>Restaurant</em>}' container
    * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Restaurant</em>' container reference.
    * @see #getRestaurant()
@@ -99,7 +99,7 @@ public interface MenuCard extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Sections</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getMenuCard_Sections()
    * @see org.gastro.inventory.Section#getMenuCard
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Offering.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Offering.java
index 45ad058a8c..5dddb58c93 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Offering.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Offering.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Offering#getSection <em>Section</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getOffering()
  * @model
  * @extends CDOObject
@@ -42,7 +42,7 @@ public interface Offering extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Product</em>' reference.
    * @see #setProduct(Product)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Product()
@@ -54,7 +54,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getProduct <em>Product</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Product</em>' reference.
    * @see #getProduct()
@@ -68,7 +68,7 @@ public interface Offering extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Name()
@@ -80,7 +80,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getName <em>Name</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -95,7 +95,7 @@ public interface Offering extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Description</em>' attribute.
    * @see #setDescription(String)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Description()
@@ -107,7 +107,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getDescription <em>Description</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Description</em>' attribute.
    * @see #getDescription()
@@ -121,7 +121,7 @@ public interface Offering extends CDOObject
    * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Price</em>' attribute.
    * @see #setPrice(float)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Price()
@@ -133,7 +133,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getPrice <em>Price</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Price</em>' attribute.
    * @see #getPrice()
@@ -149,7 +149,7 @@ public interface Offering extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Section</em>' container reference.
    * @see #setSection(Section)
    * @see org.gastro.inventory.InventoryPackage#getOffering_Section()
@@ -162,7 +162,7 @@ public interface Offering extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Offering#getSection <em>Section</em>}' container reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Section</em>' container reference.
    * @see #getSection()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Product.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Product.java
index a5c4fac441..b72af9a28b 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Product.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Product.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Product#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getProduct()
  * @model abstract="true"
  * @extends CDOObject
@@ -37,7 +37,7 @@ public interface Product extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getProduct_Name()
@@ -49,7 +49,7 @@ public interface Product extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Product#getName <em>Name</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -59,7 +59,7 @@ public interface Product extends CDOObject
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @model kind="operation"
    * @generated
    */
@@ -67,7 +67,7 @@ public interface Product extends CDOObject
 
   /**
    * TODO Should be modeled as EOperation!
-   * 
+   *
    * @ADDED
    */
   public Department getDepartment();
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Recipe.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Recipe.java
index 98fcad5d19..c4ac4b5a5c 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Recipe.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Recipe.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Recipe#getCost <em>Cost</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getRecipe()
  * @model
  * @generated
@@ -41,7 +41,7 @@ public interface Recipe extends Product
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Ingredients</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getRecipe_Ingredients()
    * @see org.gastro.inventory.Ingredient#getRecipe
@@ -58,7 +58,7 @@ public interface Recipe extends Product
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Department</em>' container reference.
    * @see #setDepartment(Department)
    * @see org.gastro.inventory.InventoryPackage#getRecipe_Department()
@@ -71,7 +71,7 @@ public interface Recipe extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.Recipe#getDepartment <em>Department</em>}' reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Department</em>' reference.
    * @see #getDepartment()
@@ -85,7 +85,7 @@ public interface Recipe extends Product
    * If the meaning of the '<em>Cost</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Cost</em>' attribute.
    * @see org.gastro.inventory.InventoryPackage#getRecipe_Cost()
    * @model transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Restaurant.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Restaurant.java
index ec5f1a8b67..bdd3ba8228 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Restaurant.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Restaurant.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -29,7 +29,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Restaurant#getStations <em>Stations</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getRestaurant()
  * @model
  * @extends CDOObject
@@ -43,7 +43,7 @@ public interface Restaurant extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_Name()
@@ -55,7 +55,7 @@ public interface Restaurant extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Restaurant#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -72,7 +72,7 @@ public interface Restaurant extends CDOObject
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Departments</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_Departments()
    * @see org.gastro.inventory.Department#getRestaurant
@@ -90,7 +90,7 @@ public interface Restaurant extends CDOObject
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Menu Cards</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_MenuCards()
    * @see org.gastro.inventory.MenuCard#getRestaurant
@@ -108,7 +108,7 @@ public interface Restaurant extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Tables</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_Tables()
    * @see org.gastro.inventory.Table#getRestaurant
@@ -125,7 +125,7 @@ public interface Restaurant extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Stations</em>' reference list.
    * @see org.gastro.inventory.InventoryPackage#getRestaurant_Stations()
    * @model transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Section.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Section.java
index 8d429fca1b..5ad775ea57 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Section.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Section.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -28,7 +28,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Section#getText <em>Text</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getSection()
  * @model
  * @extends CDOObject
@@ -44,7 +44,7 @@ public interface Section extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Menu Card</em>' container reference.
    * @see #setMenuCard(MenuCard)
    * @see org.gastro.inventory.InventoryPackage#getSection_MenuCard()
@@ -57,7 +57,7 @@ public interface Section extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Section#getMenuCard <em>Menu Card</em>}' container reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Menu Card</em>' container reference.
    * @see #getMenuCard()
@@ -74,7 +74,7 @@ public interface Section extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Offerings</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getSection_Offerings()
    * @see org.gastro.inventory.Offering#getSection
@@ -89,7 +89,7 @@ public interface Section extends CDOObject
    * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Title</em>' attribute.
    * @see #setTitle(String)
    * @see org.gastro.inventory.InventoryPackage#getSection_Title()
@@ -101,7 +101,7 @@ public interface Section extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Section#getTitle <em>Title</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Title</em>' attribute.
    * @see #getTitle()
@@ -115,7 +115,7 @@ public interface Section extends CDOObject
    * If the meaning of the '<em>Text</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Text</em>' attribute.
    * @see #setText(String)
    * @see org.gastro.inventory.InventoryPackage#getSection_Text()
@@ -127,7 +127,7 @@ public interface Section extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Section#getText <em>Text</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Text</em>' attribute.
    * @see #getText()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Station.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Station.java
index f7d4b108f3..c03fcaa4b5 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Station.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Station.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.CDOObject;
  * <li>{@link org.gastro.inventory.Station#getStationID <em>Station ID</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getStation()
  * @model abstract="true"
  * @extends CDOObject
@@ -38,7 +38,7 @@ public interface Station extends CDOObject
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Station ID</em>' attribute.
    * @see #setStationID(String)
    * @see org.gastro.inventory.InventoryPackage#getStation_StationID()
@@ -50,7 +50,7 @@ public interface Station extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Station#getStationID <em>Station ID</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Station ID</em>' attribute.
    * @see #getStationID()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Stock.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Stock.java
index f23dcf94fc..8a776093cd 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Stock.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Stock.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -27,7 +27,7 @@ import org.eclipse.emf.common.util.EList;
  * <li>{@link org.gastro.inventory.Stock#getDepartment <em>Department</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getStock()
  * @model
  * @extends CDOObject
@@ -44,7 +44,7 @@ public interface Stock extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Products</em>' containment reference list.
    * @see org.gastro.inventory.InventoryPackage#getStock_Products()
    * @see org.gastro.inventory.StockProduct#getStock
@@ -59,7 +59,7 @@ public interface Stock extends CDOObject
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.gastro.inventory.InventoryPackage#getStock_Name()
@@ -71,7 +71,7 @@ public interface Stock extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Stock#getName <em>Name</em>}' attribute. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
@@ -87,7 +87,7 @@ public interface Stock extends CDOObject
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Department</em>' container reference.
    * @see #setDepartment(Department)
    * @see org.gastro.inventory.InventoryPackage#getStock_Department()
@@ -100,7 +100,7 @@ public interface Stock extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.inventory.Stock#getDepartment <em>Department</em>}' container reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Department</em>' container reference.
    * @see #getDepartment()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java
index c98327c6e1..bae8650e19 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/StockProduct.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -24,7 +24,7 @@ package org.gastro.inventory;
  * <li>{@link org.gastro.inventory.StockProduct#getOrderLimit <em>Order Limit</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getStockProduct()
  * @model
  * @generated
@@ -39,7 +39,7 @@ public interface StockProduct extends Product
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Stock</em>' container reference.
    * @see #setStock(Stock)
    * @see org.gastro.inventory.InventoryPackage#getStockProduct_Stock()
@@ -52,7 +52,7 @@ public interface StockProduct extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.StockProduct#getStock <em>Stock</em>}' container reference. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Stock</em>' container reference.
    * @see #getStock()
@@ -66,7 +66,7 @@ public interface StockProduct extends Product
    * If the meaning of the '<em>Cost</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Cost</em>' attribute.
    * @see #setCost(float)
    * @see org.gastro.inventory.InventoryPackage#getStockProduct_Cost()
@@ -78,7 +78,7 @@ public interface StockProduct extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.StockProduct#getCost <em>Cost</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Cost</em>' attribute.
    * @see #getCost()
@@ -93,7 +93,7 @@ public interface StockProduct extends Product
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Available</em>' attribute.
    * @see #setAvailable(int)
    * @see org.gastro.inventory.InventoryPackage#getStockProduct_Available()
@@ -105,7 +105,7 @@ public interface StockProduct extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.StockProduct#getAvailable <em>Available</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Available</em>' attribute.
    * @see #getAvailable()
@@ -120,7 +120,7 @@ public interface StockProduct extends Product
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Order Limit</em>' attribute.
    * @see #setOrderLimit(int)
    * @see org.gastro.inventory.InventoryPackage#getStockProduct_OrderLimit()
@@ -132,7 +132,7 @@ public interface StockProduct extends Product
   /**
    * Sets the value of the '{@link org.gastro.inventory.StockProduct#getOrderLimit <em>Order Limit</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Order Limit</em>' attribute.
    * @see #getOrderLimit()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/Table.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/Table.java
index e11402af93..815f0e659d 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/Table.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/Table.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -22,7 +22,7 @@ package org.gastro.inventory;
  * <li>{@link org.gastro.inventory.Table#getRestaurant <em>Restaurant</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage#getTable()
  * @model
  * @generated
@@ -35,7 +35,7 @@ public interface Table extends Station
    * If the meaning of the '<em>Seats</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Seats</em>' attribute.
    * @see #setSeats(int)
    * @see org.gastro.inventory.InventoryPackage#getTable_Seats()
@@ -47,7 +47,7 @@ public interface Table extends Station
   /**
    * Sets the value of the '{@link org.gastro.inventory.Table#getSeats <em>Seats</em>}' attribute. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Seats</em>' attribute.
    * @see #getSeats()
@@ -63,7 +63,7 @@ public interface Table extends Station
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
+   *
    * @return the value of the '<em>Restaurant</em>' container reference.
    * @see #setRestaurant(Restaurant)
    * @see org.gastro.inventory.InventoryPackage#getTable_Restaurant()
@@ -76,7 +76,7 @@ public interface Table extends Station
   /**
    * Sets the value of the '{@link org.gastro.inventory.Table#getRestaurant <em>Restaurant</em>}' container reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Restaurant</em>' container reference.
    * @see #getRestaurant()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java
index 42c5c2d171..6cec90e060 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/DepartmentImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,14 +34,14 @@ import org.gastro.inventory.Stock;
  * <li>{@link org.gastro.inventory.impl.DepartmentImpl#getStocks <em>Stocks</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class DepartmentImpl extends StationImpl implements Department
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected DepartmentImpl()
@@ -51,7 +51,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -62,7 +62,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -73,7 +73,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Restaurant getRestaurant()
@@ -83,7 +83,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setRestaurant(Restaurant newRestaurant)
@@ -93,7 +93,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -104,7 +104,7 @@ public class DepartmentImpl extends StationImpl implements Department
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java
index 3f91881162..ca0ea277e7 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/EmployeeImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -30,14 +30,14 @@ import org.gastro.inventory.InventoryPackage;
  * <li>{@link org.gastro.inventory.impl.EmployeeImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EmployeeImpl extends CDOObjectImpl implements Employee
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected EmployeeImpl()
@@ -47,7 +47,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -58,7 +58,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -69,7 +69,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Department getDepartment()
@@ -79,7 +79,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setDepartment(Department newDepartment)
@@ -89,7 +89,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -99,7 +99,7 @@ public class EmployeeImpl extends CDOObjectImpl implements Employee
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java
index e0088398ee..3b91d3e692 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/IngredientImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -32,14 +32,14 @@ import org.gastro.inventory.Recipe;
  * <li>{@link org.gastro.inventory.impl.IngredientImpl#getQuantity <em>Quantity</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class IngredientImpl extends CDOObjectImpl implements Ingredient
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected IngredientImpl()
@@ -49,7 +49,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -60,7 +60,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -71,7 +71,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Recipe getRecipe()
@@ -81,7 +81,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setRecipe(Recipe newRecipe)
@@ -91,7 +91,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Product getProduct()
@@ -101,7 +101,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setProduct(Product newProduct)
@@ -111,7 +111,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public int getQuantity()
@@ -121,7 +121,7 @@ public class IngredientImpl extends CDOObjectImpl implements Ingredient
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setQuantity(int newQuantity)
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
index 335ea1978e..42f45b3925 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -35,14 +35,14 @@ import org.gastro.inventory.Table;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFactory
 {
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public static InventoryFactory init()
@@ -65,7 +65,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryFactoryImpl()
@@ -75,7 +75,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -84,27 +84,27 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
     switch (eClass.getClassifierID())
     {
     case InventoryPackage.STOCK:
-      return (EObject)createStock();
+      return createStock();
     case InventoryPackage.STOCK_PRODUCT:
-      return (EObject)createStockProduct();
+      return createStockProduct();
     case InventoryPackage.RECIPE:
-      return (EObject)createRecipe();
+      return createRecipe();
     case InventoryPackage.INGREDIENT:
-      return (EObject)createIngredient();
+      return createIngredient();
     case InventoryPackage.MENU_CARD:
-      return (EObject)createMenuCard();
+      return createMenuCard();
     case InventoryPackage.RESTAURANT:
-      return (EObject)createRestaurant();
+      return createRestaurant();
     case InventoryPackage.DEPARTMENT:
-      return (EObject)createDepartment();
+      return createDepartment();
     case InventoryPackage.OFFERING:
-      return (EObject)createOffering();
+      return createOffering();
     case InventoryPackage.TABLE:
-      return (EObject)createTable();
+      return createTable();
     case InventoryPackage.EMPLOYEE:
-      return (EObject)createEmployee();
+      return createEmployee();
     case InventoryPackage.SECTION:
-      return (EObject)createSection();
+      return createSection();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -112,7 +112,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Stock createStock()
@@ -123,7 +123,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public StockProduct createStockProduct()
@@ -134,7 +134,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Recipe createRecipe()
@@ -145,7 +145,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Ingredient createIngredient()
@@ -156,7 +156,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public MenuCard createMenuCard()
@@ -167,7 +167,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Restaurant createRestaurant()
@@ -178,7 +178,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Department createDepartment()
@@ -189,7 +189,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Offering createOffering()
@@ -200,7 +200,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Table createTable()
@@ -211,7 +211,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Employee createEmployee()
@@ -222,7 +222,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Section createSection()
@@ -233,7 +233,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryPackage getInventoryPackage()
@@ -243,7 +243,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
index 088c795df8..44bceae6c4 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -37,98 +37,98 @@ import org.gastro.inventory.Table;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class InventoryPackageImpl extends EPackageImpl implements InventoryPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass stockEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass productEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass stockProductEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass recipeEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass ingredientEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass menuCardEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass restaurantEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass departmentEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass offeringEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass tableEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass employeeEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass stationEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private EClass sectionEClass = null;
@@ -140,7 +140,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.gastro.inventory.InventoryPackage#eNS_URI
    * @see #init()
@@ -153,7 +153,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private static boolean isInited = false;
@@ -164,7 +164,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
    * This method is used to initialize {@link InventoryPackage#eINSTANCE} when that field is accessed. Clients should
    * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
+   *
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -173,11 +173,14 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
   public static InventoryPackage init()
   {
     if (isInited)
+    {
       return (InventoryPackage)EPackage.Registry.INSTANCE.getEPackage(InventoryPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InventoryPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new InventoryPackageImpl());
+    InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof InventoryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new InventoryPackageImpl());
 
     isInited = true;
 
@@ -197,7 +200,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getStock()
@@ -207,7 +210,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getStock_Products()
@@ -217,7 +220,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStock_Name()
@@ -227,7 +230,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getStock_Department()
@@ -237,7 +240,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getProduct()
@@ -247,7 +250,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getProduct_Name()
@@ -257,7 +260,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getStockProduct()
@@ -267,7 +270,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getStockProduct_Stock()
@@ -277,7 +280,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStockProduct_Cost()
@@ -287,7 +290,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStockProduct_Available()
@@ -297,7 +300,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStockProduct_OrderLimit()
@@ -307,7 +310,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getRecipe()
@@ -317,7 +320,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRecipe_Ingredients()
@@ -327,7 +330,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRecipe_Department()
@@ -337,7 +340,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getRecipe_Cost()
@@ -347,7 +350,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getIngredient()
@@ -357,7 +360,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getIngredient_Recipe()
@@ -367,7 +370,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getIngredient_Product()
@@ -377,7 +380,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getIngredient_Quantity()
@@ -387,7 +390,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getMenuCard()
@@ -397,7 +400,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getMenuCard_Title()
@@ -407,7 +410,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getMenuCard_Restaurant()
@@ -417,7 +420,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getMenuCard_Sections()
@@ -427,7 +430,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getRestaurant()
@@ -437,7 +440,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getRestaurant_Name()
@@ -447,7 +450,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRestaurant_Departments()
@@ -457,7 +460,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRestaurant_MenuCards()
@@ -467,7 +470,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRestaurant_Tables()
@@ -477,7 +480,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getRestaurant_Stations()
@@ -487,7 +490,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getDepartment()
@@ -497,7 +500,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDepartment_Recipes()
@@ -507,7 +510,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDepartment_Restaurant()
@@ -517,7 +520,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDepartment_Employees()
@@ -527,7 +530,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getDepartment_Stocks()
@@ -537,7 +540,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getOffering()
@@ -547,7 +550,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getOffering_Product()
@@ -557,7 +560,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getOffering_Name()
@@ -567,7 +570,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getOffering_Description()
@@ -577,7 +580,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getOffering_Price()
@@ -587,7 +590,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getOffering_Section()
@@ -597,7 +600,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getTable()
@@ -607,7 +610,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getTable_Seats()
@@ -617,7 +620,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getTable_Restaurant()
@@ -627,7 +630,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getEmployee()
@@ -637,7 +640,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getEmployee_Department()
@@ -647,7 +650,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getEmployee_Name()
@@ -657,7 +660,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getStation()
@@ -667,7 +670,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getStation_StationID()
@@ -677,7 +680,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EClass getSection()
@@ -687,7 +690,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getSection_MenuCard()
@@ -697,7 +700,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EReference getSection_Offerings()
@@ -707,7 +710,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getSection_Title()
@@ -717,7 +720,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public EAttribute getSection_Text()
@@ -727,7 +730,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryFactory getInventoryFactory()
@@ -737,7 +740,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isCreated = false;
@@ -745,13 +748,15 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
   /**
    * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
    * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -824,7 +829,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   private boolean isInitialized = false;
@@ -832,13 +837,15 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
   /**
    * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
    * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -851,19 +858,19 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    stockProductEClass.getESuperTypes().add(this.getProduct());
-    recipeEClass.getESuperTypes().add(this.getProduct());
-    departmentEClass.getESuperTypes().add(this.getStation());
-    tableEClass.getESuperTypes().add(this.getStation());
+    stockProductEClass.getESuperTypes().add(getProduct());
+    recipeEClass.getESuperTypes().add(getProduct());
+    departmentEClass.getESuperTypes().add(getStation());
+    tableEClass.getESuperTypes().add(getStation());
 
     // Initialize classes and features; add operations and parameters
     initEClass(stockEClass, Stock.class, "Stock", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStock_Products(), this.getStockProduct(), this.getStockProduct_Stock(), "products", null, 0, -1,
+    initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1,
         Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getStock_Department(), this.getDepartment(), this.getDepartment_Stocks(), "department", null, 1, 1,
+    initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1,
         Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -875,9 +882,9 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
     initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStockProduct_Stock(), this.getStock(), this.getStock_Products(), "stock", null, 1, 1,
-        StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
     initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class,
@@ -886,93 +893,93 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(recipeEClass, Recipe.class, "Recipe", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRecipe_Ingredients(), this.getIngredient(), this.getIngredient_Recipe(), "ingredients", null, 0,
-        -1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRecipe_Department(), this.getDepartment(), this.getDepartment_Recipes(), "department", null, 0,
-        1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1,
+        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1,
+        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT,
         IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIngredient_Recipe(), this.getRecipe(), this.getRecipe_Ingredients(), "recipe", null, 1, 1,
-        Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getIngredient_Product(), this.getProduct(), null, "product", null, 1, 1, Ingredient.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+    initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1, Ingredient.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
+    initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(menuCardEClass, MenuCard.class, "MenuCard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Restaurant(), this.getRestaurant(), this.getRestaurant_MenuCards(), "restaurant", null,
-        1, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Sections(), this.getSection(), this.getSection_MenuCard(), "sections", null, 1, -1,
-        MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+    initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1,
+        MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1, MenuCard.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(restaurantEClass, Restaurant.class, "Restaurant", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Departments(), this.getDepartment(), this.getDepartment_Restaurant(), "departments",
-        null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_MenuCards(), this.getMenuCard(), this.getMenuCard_Restaurant(), "menuCards", null, 0,
-        -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Tables(), this.getTable(), this.getTable_Restaurant(), "tables", null, 0, -1,
-        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Stations(), this.getStation(), null, "stations", null, 0, -1, Restaurant.class,
+    initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0, -1,
+        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1,
+        Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class,
         IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         IS_DERIVED, IS_ORDERED);
 
     initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDepartment_Recipes(), this.getRecipe(), this.getRecipe_Department(), "recipes", null, 0, -1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Restaurant(), this.getRestaurant(), this.getRestaurant_Departments(), "restaurant",
-        null, 1, 1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Employees(), this.getEmployee(), this.getEmployee_Department(), "employees", null, 0,
-        -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Stocks(), this.getStock(), this.getStock_Department(), "stocks", null, 1, -1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1,
+        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1,
+        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1,
+        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(offeringEClass, Offering.class, "Offering", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOffering_Product(), this.getProduct(), null, "product", null, 1, 1, Offering.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOffering_Section(), this.getSection(), this.getSection_Offerings(), "section", null, 1, 1,
-        Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTable_Restaurant(), this.getRestaurant(), this.getRestaurant_Tables(), "restaurant", null, 1, 1,
+    initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1,
         Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(employeeEClass, Employee.class, "Employee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEmployee_Department(), this.getDepartment(), this.getDepartment_Employees(), "department", null,
-        0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1,
+        Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -981,10 +988,10 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(sectionEClass, Section.class, "Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSection_MenuCard(), this.getMenuCard(), this.getMenuCard_Sections(), "menuCard", null, 1, 1,
-        Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSection_Offerings(), this.getOffering(), this.getOffering_Section(), "offerings", null, 1, -1,
+    initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1,
         Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT,
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java
index bdc71e2078..5137d1001d 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/MenuCardImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -33,14 +33,14 @@ import org.gastro.inventory.Section;
  * <li>{@link org.gastro.inventory.impl.MenuCardImpl#getSections <em>Sections</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected MenuCardImpl()
@@ -50,7 +50,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -61,7 +61,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -72,7 +72,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getTitle()
@@ -82,7 +82,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setTitle(String newTitle)
@@ -92,7 +92,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Restaurant getRestaurant()
@@ -102,7 +102,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setRestaurant(Restaurant newRestaurant)
@@ -112,7 +112,7 @@ public class MenuCardImpl extends CDOObjectImpl implements MenuCard
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java
index 54566ec61a..6e221130c7 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/OfferingImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,14 +34,14 @@ import org.gastro.inventory.Section;
  * <li>{@link org.gastro.inventory.impl.OfferingImpl#getSection <em>Section</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class OfferingImpl extends CDOObjectImpl implements Offering
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected OfferingImpl()
@@ -51,7 +51,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -62,7 +62,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,7 +73,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Product getProduct()
@@ -83,7 +83,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setProduct(Product newProduct)
@@ -93,7 +93,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -103,7 +103,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -113,7 +113,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getDescription()
@@ -123,7 +123,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setDescription(String newDescription)
@@ -133,7 +133,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public float getPrice()
@@ -143,7 +143,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setPrice(float newPrice)
@@ -153,7 +153,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Section getSection()
@@ -163,7 +163,7 @@ public class OfferingImpl extends CDOObjectImpl implements Offering
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setSection(Section newSection)
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java
index 3e19efce37..d465aae64b 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/ProductImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -28,14 +28,14 @@ import org.gastro.inventory.Product;
  * <li>{@link org.gastro.inventory.impl.ProductImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class ProductImpl extends CDOObjectImpl implements Product
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected ProductImpl()
@@ -45,7 +45,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -56,7 +56,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -67,7 +67,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -77,7 +77,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -87,7 +87,7 @@ public abstract class ProductImpl extends CDOObjectImpl implements Product
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public abstract float getCost();
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java
index 7ebc9e3eb9..e8c2af07b4 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/RecipeImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -31,14 +31,14 @@ import org.gastro.inventory.Recipe;
  * <li>{@link org.gastro.inventory.impl.RecipeImpl#getCost <em>Cost</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class RecipeImpl extends ProductImpl implements Recipe
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected RecipeImpl()
@@ -48,7 +48,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -59,7 +59,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -70,7 +70,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Department getDepartment()
@@ -80,7 +80,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setDepartment(Department newDepartment)
@@ -90,7 +90,7 @@ public class RecipeImpl extends ProductImpl implements Recipe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   @Override
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java
index 215b89ecf7..1f188ff6ba 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/RestaurantImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,14 +38,14 @@ import org.gastro.inventory.Table;
  * <li>{@link org.gastro.inventory.impl.RestaurantImpl#getStations <em>Stations</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected RestaurantImpl()
@@ -55,7 +55,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -66,7 +66,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -77,7 +77,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -87,7 +87,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -97,7 +97,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -108,7 +108,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -119,7 +119,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -130,7 +130,7 @@ public class RestaurantImpl extends CDOObjectImpl implements Restaurant
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public EList<Station> getStations()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java
index 12ef48c8fe..6340fd4dfa 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/SectionImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -34,14 +34,14 @@ import org.gastro.inventory.Section;
  * <li>{@link org.gastro.inventory.impl.SectionImpl#getText <em>Text</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class SectionImpl extends CDOObjectImpl implements Section
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected SectionImpl()
@@ -51,7 +51,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -62,7 +62,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -73,7 +73,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public MenuCard getMenuCard()
@@ -83,7 +83,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setMenuCard(MenuCard newMenuCard)
@@ -93,7 +93,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -104,7 +104,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getTitle()
@@ -114,7 +114,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setTitle(String newTitle)
@@ -124,7 +124,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getText()
@@ -134,7 +134,7 @@ public class SectionImpl extends CDOObjectImpl implements Section
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setText(String newText)
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java
index 6182a98b50..bcf2eb9c24 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StationImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -28,14 +28,14 @@ import org.gastro.inventory.Station;
  * <li>{@link org.gastro.inventory.impl.StationImpl#getStationID <em>Station ID</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class StationImpl extends CDOObjectImpl implements Station
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StationImpl()
@@ -45,7 +45,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -56,7 +56,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -67,7 +67,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getStationID()
@@ -77,7 +77,7 @@ public abstract class StationImpl extends CDOObjectImpl implements Station
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setStationID(String newStationID)
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java
index 63dd49ee7c..c4ee294fab 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StockImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -33,14 +33,14 @@ import org.gastro.inventory.StockProduct;
  * <li>{@link org.gastro.inventory.impl.StockImpl#getDepartment <em>Department</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StockImpl extends CDOObjectImpl implements Stock
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StockImpl()
@@ -50,7 +50,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -61,7 +61,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -72,7 +72,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -83,7 +83,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public String getName()
@@ -93,7 +93,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setName(String newName)
@@ -103,7 +103,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Department getDepartment()
@@ -113,7 +113,7 @@ public class StockImpl extends CDOObjectImpl implements Stock
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setDepartment(Department newDepartment)
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java
index 3fa605f67d..9c12fdc6b0 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/StockProductImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -31,14 +31,14 @@ import org.gastro.inventory.StockProduct;
  * <li>{@link org.gastro.inventory.impl.StockProductImpl#getOrderLimit <em>Order Limit</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StockProductImpl extends ProductImpl implements StockProduct
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected StockProductImpl()
@@ -48,7 +48,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -59,7 +59,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Stock getStock()
@@ -69,7 +69,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setStock(Stock newStock)
@@ -79,7 +79,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -90,7 +90,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setCost(float newCost)
@@ -100,7 +100,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public int getAvailable()
@@ -110,7 +110,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setAvailable(int newAvailable)
@@ -120,7 +120,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public int getOrderLimit()
@@ -130,7 +130,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setOrderLimit(int newOrderLimit)
@@ -140,7 +140,7 @@ public class StockProductImpl extends ProductImpl implements StockProduct
 
   /**
    * TODO Should be modeled as derived EReference!
-   * 
+   *
    * @ADDED
    */
   public Department getDepartment()
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java
index c24b954c93..3e0ac50a75 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/TableImpl.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -28,14 +28,14 @@ import org.gastro.inventory.Table;
  * <li>{@link org.gastro.inventory.impl.TableImpl#getRestaurant <em>Restaurant</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TableImpl extends StationImpl implements Table
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected TableImpl()
@@ -45,7 +45,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   @Override
@@ -56,7 +56,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public int getSeats()
@@ -66,7 +66,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setSeats(int newSeats)
@@ -76,7 +76,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Restaurant getRestaurant()
@@ -86,7 +86,7 @@ public class TableImpl extends StationImpl implements Table
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public void setRestaurant(Restaurant newRestaurant)
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventoryAdapterFactory.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventoryAdapterFactory.java
index 585f4c7e0d..d0e8851a1a 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventoryAdapterFactory.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventoryAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -36,7 +36,7 @@ import org.gastro.inventory.Table;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage
  * @generated
  */
@@ -44,14 +44,14 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
 {
   /**
    * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static InventoryPackage modelPackage;
 
   /**
    * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventoryAdapterFactory()
@@ -66,7 +66,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
+   *
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -86,7 +86,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
 
   /**
    * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected InventorySwitch<Adapter> modelSwitch = new InventorySwitch<Adapter>()
@@ -178,7 +178,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
 
   /**
    * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param target
    *          the object to adapt.
    * @return the adapter for the <code>target</code>.
@@ -194,7 +194,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Stock <em>Stock</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Stock
    * @generated
@@ -208,7 +208,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Product <em>Product</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Product
    * @generated
@@ -222,7 +222,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.StockProduct <em>Stock Product</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.StockProduct
    * @generated
@@ -236,7 +236,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Recipe <em>Recipe</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Recipe
    * @generated
@@ -250,7 +250,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Ingredient <em>Ingredient</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Ingredient
    * @generated
@@ -264,7 +264,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.MenuCard <em>Menu Card</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.MenuCard
    * @generated
@@ -278,7 +278,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Restaurant <em>Restaurant</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Restaurant
    * @generated
@@ -292,7 +292,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Department <em>Department</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Department
    * @generated
@@ -306,7 +306,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Offering <em>Offering</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Offering
    * @generated
@@ -320,7 +320,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Table <em>Table</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Table
    * @generated
@@ -334,7 +334,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Employee <em>Employee</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Employee
    * @generated
@@ -348,7 +348,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Station <em>Station</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Station
    * @generated
@@ -362,7 +362,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.gastro.inventory.Section <em>Section</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.gastro.inventory.Section
    * @generated
@@ -375,7 +375,7 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl
   /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java
index 44055ec9f8..3da3e1a832 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -38,7 +38,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.gastro.inventory.InventoryPackage
  * @generated
  */
@@ -46,14 +46,14 @@ public class InventorySwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static InventoryPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public InventorySwitch()
@@ -67,7 +67,7 @@ public class InventorySwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -79,7 +79,7 @@ public class InventorySwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -99,7 +99,7 @@ public class InventorySwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -261,7 +261,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Stock</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Stock</em>'.
@@ -276,7 +276,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Product</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Product</em>'.
@@ -291,7 +291,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Stock Product</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Stock Product</em>'.
@@ -306,7 +306,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Recipe</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Recipe</em>'.
@@ -321,7 +321,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Ingredient</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Ingredient</em>'.
@@ -336,7 +336,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Menu Card</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Menu Card</em>'.
@@ -351,7 +351,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Restaurant</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Restaurant</em>'.
@@ -366,7 +366,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Department</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Department</em>'.
@@ -381,7 +381,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Offering</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Offering</em>'.
@@ -396,7 +396,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Table</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Table</em>'.
@@ -411,7 +411,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Employee</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Employee</em>'.
@@ -426,7 +426,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Station</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Station</em>'.
@@ -441,7 +441,7 @@ public class InventorySwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Section</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Section</em>'.
@@ -457,7 +457,7 @@ public class InventorySwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
index 1fc0cc4518..205b6faf64 100644
--- a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Electronic Restaurant Example RCP Department
 Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Activator: org.gastro.rcp.internal.department.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.department;version="4.0.300";x-internal:=true
+ org.gastro.rcp.internal.department;version="4.0.400";x-internal:=true
diff --git a/plugins/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java b/plugins/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
index 0108e7a07e..7741200880 100644
--- a/plugins/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
+++ b/plugins/org.gastro.rcp.department/src/com/swtdesigner/ResourceManager.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * <p>
  * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
  * All Rights Reserved
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -39,11 +39,11 @@ public class ResourceManager extends SWTResourceManager
   // Image
   //
   // //////////////////////////////////////////////////////////////////////////
-  private static Map/* <ImageDescriptor,Image> */m_descriptorImageMap = new HashMap();
+  private static Map/* <ImageDescriptor,Image> */ m_descriptorImageMap = new HashMap();
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *          the {@link Class} relative to which to find the image descriptor.
    * @param path
@@ -57,7 +57,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *          the path to the image file.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
@@ -76,7 +76,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
-   * 
+   *
    * @param descriptor
    *          the {@link ImageDescriptor} for the {@link Image}.
    * @return the {@link Image} based on the specified {@link ImageDescriptor}.
@@ -101,11 +101,11 @@ public class ResourceManager extends SWTResourceManager
   /**
    * Maps images to decorated images.
    */
-  private static Map[]/* <Image,Map<Image,Image>> */m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+  private static Map[]/* <Image,Map<Image,Image>> */ m_decoratedImageMap = new Map[LAST_CORNER_KEY];
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated.
    * @param decorator
@@ -119,7 +119,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated.
    * @param decorator
@@ -251,7 +251,7 @@ public class ResourceManager extends SWTResourceManager
   /**
    * Maps URL to images.
    */
-  private static Map/* <URL,Image> */m_URLImageMap = new HashMap();
+  private static Map/* <URL,Image> */ m_URLImageMap = new HashMap();
 
   /**
    * Provider for plugin resources, used by WindowBuilder at design time.
@@ -268,7 +268,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the image
    * @param name
@@ -297,7 +297,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *          the symbolic name of the {@link Bundle}.
    * @param path
@@ -366,7 +366,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the image.
    * @param name
@@ -399,7 +399,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *          the symbolic name of the {@link Bundle}.
    * @param path
@@ -450,7 +450,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link URL} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the file path.
    * @param name
diff --git a/plugins/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java b/plugins/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java
index a7451b5226..93af75d608 100644
--- a/plugins/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java
+++ b/plugins/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java
@@ -31,7 +31,7 @@ import java.util.Map;
  * <p>
  * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
  * All Rights Reserved
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -43,11 +43,11 @@ public class SWTResourceManager
   // Color
   //
   // //////////////////////////////////////////////////////////////////////////
-  private static Map/* <RGB,Color> */m_colorMap = new HashMap();
+  private static Map/* <RGB,Color> */ m_colorMap = new HashMap();
 
   /**
    * Returns the system {@link Color} matching the specific ID.
-   * 
+   *
    * @param systemColorID
    *          the ID value for the color
    * @return the system {@link Color} matching the specific ID
@@ -60,7 +60,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its red, green and blue component values.
-   * 
+   *
    * @param r
    *          the red component of the color
    * @param g
@@ -76,7 +76,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its RGB value.
-   * 
+   *
    * @param rgb
    *          the {@link RGB} value of the color
    * @return the {@link Color} matching the RGB value
@@ -115,11 +115,11 @@ public class SWTResourceManager
   /**
    * Maps image paths to images.
    */
-  private static Map/* <String,Image> */m_imageMap = new HashMap();
+  private static Map/* <String,Image> */ m_imageMap = new HashMap();
 
   /**
    * Returns an {@link Image} encoded by the specified {@link InputStream}.
-   * 
+   *
    * @param stream
    *          the {@link InputStream} encoding the image data
    * @return the {@link Image} encoded by the specified input stream
@@ -145,7 +145,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *          the path to the image file
    * @return the {@link Image} stored in the file at the specified path
@@ -172,7 +172,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *          the {@link Class} relative to which to find the image
    * @param path
@@ -245,11 +245,11 @@ public class SWTResourceManager
   /**
    * Maps images to decorated images.
    */
-  private static Map[]/* <Image,Map<Image,Image>> */m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+  private static Map[]/* <Image,Map<Image,Image>> */ m_decoratedImageMap = new Map[LAST_CORNER_KEY];
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated
    * @param decorator
@@ -263,7 +263,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated
    * @param decorator
@@ -374,16 +374,16 @@ public class SWTResourceManager
   /**
    * Maps font names to fonts.
    */
-  private static Map/* <String,Font> */m_fontMap = new HashMap();
+  private static Map/* <String,Font> */ m_fontMap = new HashMap();
 
   /**
    * Maps fonts to their bold versions.
    */
-  private static Map/* <Font,Font> */m_fontToBoldFontMap = new HashMap();
+  private static Map/* <Font,Font> */ m_fontToBoldFontMap = new HashMap();
 
   /**
    * Returns a {@link Font} based on its name, height and style.
-   * 
+   *
    * @param name
    *          the name of the font
    * @param height
@@ -400,7 +400,7 @@ public class SWTResourceManager
   /**
    * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline flags are also
    * supported.
-   * 
+   *
    * @param name
    *          the name of the font
    * @param size
@@ -454,7 +454,7 @@ public class SWTResourceManager
 
   /**
    * Returns a bold version of the given {@link Font}.
-   * 
+   *
    * @param baseFont
    *          the {@link Font} for which a bold version is desired
    * @return the bold version of the given {@link Font}
diff --git a/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java b/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
index 0eb211f3f7..30ae9d55ab 100644
--- a/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
+++ b/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 
 /**
  * The activator class controls the plug-in life cycle
- * 
+ *
  * @author Eike Stepper
  */
 public class Activator extends AbstractUIPlugin
@@ -65,7 +65,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns the shared instance
-   * 
+   *
    * @return the shared instance
    */
   public static Activator getDefault()
@@ -75,7 +75,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns an image descriptor for the image file at the given plug-in relative path
-   * 
+   *
    * @param path
    *          the path
    * @return the image descriptor
diff --git a/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java b/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
index 3458421efb..2e7bdb9191 100644
--- a/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
+++ b/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/OrdersView.java
@@ -130,8 +130,8 @@ public class OrdersView extends ViewPart
             {
               public Object execute(OrderDetail orderDetail)
               {
-                orderDetail.setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED
-                    : OrderState.ORDERED);
+                orderDetail
+                    .setState(orderDetail.getState() == OrderState.ORDERED ? OrderState.SERVED : OrderState.ORDERED);
                 return null;
               }
             });
diff --git a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
index 71b17b4b01..704ff8844c 100644
--- a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Electronic Restaurant Example RCP Table
 Bundle-SymbolicName: org.gastro.rcp.table; singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-Activator: org.gastro.rcp.internal.table.Activator
 Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: com.swtdesigner;version="4.0.300";x-internal:=true,
- org.gastro.rcp.internal.table;version="4.0.300";x-internal:=true
+ org.gastro.rcp.internal.table;version="4.0.400";x-internal:=true
diff --git a/plugins/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java b/plugins/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
index 5c23fb04fd..72ed9ff70a 100644
--- a/plugins/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
+++ b/plugins/org.gastro.rcp.table/src/com/swtdesigner/ResourceManager.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * <p>
  * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
  * All Rights Reserved
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -39,11 +39,11 @@ public class ResourceManager extends SWTResourceManager
   // Image
   //
   // //////////////////////////////////////////////////////////////////////////
-  private static Map/* <ImageDescriptor,Image> */m_descriptorImageMap = new HashMap();
+  private static Map/* <ImageDescriptor,Image> */ m_descriptorImageMap = new HashMap();
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *          the {@link Class} relative to which to find the image descriptor.
    * @param path
@@ -57,7 +57,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *          the path to the image file.
    * @return the {@link ImageDescriptor} stored in the file at the specified path.
@@ -76,7 +76,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
-   * 
+   *
    * @param descriptor
    *          the {@link ImageDescriptor} for the {@link Image}.
    * @return the {@link Image} based on the specified {@link ImageDescriptor}.
@@ -101,11 +101,11 @@ public class ResourceManager extends SWTResourceManager
   /**
    * Maps images to decorated images.
    */
-  private static Map[]/* <Image,Map<Image,Image>> */m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+  private static Map[]/* <Image,Map<Image,Image>> */ m_decoratedImageMap = new Map[LAST_CORNER_KEY];
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated.
    * @param decorator
@@ -119,7 +119,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated.
    * @param decorator
@@ -251,7 +251,7 @@ public class ResourceManager extends SWTResourceManager
   /**
    * Maps URL to images.
    */
-  private static Map/* <URL,Image> */m_URLImageMap = new HashMap();
+  private static Map/* <URL,Image> */ m_URLImageMap = new HashMap();
 
   /**
    * Provider for plugin resources, used by WindowBuilder at design time.
@@ -268,7 +268,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the image
    * @param name
@@ -297,7 +297,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *          the symbolic name of the {@link Bundle}.
    * @param path
@@ -366,7 +366,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the image.
    * @param name
@@ -399,7 +399,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-   * 
+   *
    * @param symbolicName
    *          the symbolic name of the {@link Bundle}.
    * @param path
@@ -450,7 +450,7 @@ public class ResourceManager extends SWTResourceManager
 
   /**
    * Returns an {@link URL} based on a plugin and file path.
-   * 
+   *
    * @param plugin
    *          the plugin {@link Object} containing the file path.
    * @param name
diff --git a/plugins/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java b/plugins/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java
index d00071980f..243b287d9e 100644
--- a/plugins/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java
+++ b/plugins/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java
@@ -31,7 +31,7 @@ import java.util.Map;
  * <p>
  * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
  * All Rights Reserved
- * 
+ *
  * @author scheglov_ke
  * @author Dan Rubel
  */
@@ -43,11 +43,11 @@ public class SWTResourceManager
   // Color
   //
   // //////////////////////////////////////////////////////////////////////////
-  private static Map/* <RGB,Color> */m_colorMap = new HashMap();
+  private static Map/* <RGB,Color> */ m_colorMap = new HashMap();
 
   /**
    * Returns the system {@link Color} matching the specific ID.
-   * 
+   *
    * @param systemColorID
    *          the ID value for the color
    * @return the system {@link Color} matching the specific ID
@@ -60,7 +60,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its red, green and blue component values.
-   * 
+   *
    * @param r
    *          the red component of the color
    * @param g
@@ -76,7 +76,7 @@ public class SWTResourceManager
 
   /**
    * Returns a {@link Color} given its RGB value.
-   * 
+   *
    * @param rgb
    *          the {@link RGB} value of the color
    * @return the {@link Color} matching the RGB value
@@ -115,11 +115,11 @@ public class SWTResourceManager
   /**
    * Maps image paths to images.
    */
-  private static Map/* <String,Image> */m_imageMap = new HashMap();
+  private static Map/* <String,Image> */ m_imageMap = new HashMap();
 
   /**
    * Returns an {@link Image} encoded by the specified {@link InputStream}.
-   * 
+   *
    * @param stream
    *          the {@link InputStream} encoding the image data
    * @return the {@link Image} encoded by the specified input stream
@@ -145,7 +145,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path.
-   * 
+   *
    * @param path
    *          the path to the image file
    * @return the {@link Image} stored in the file at the specified path
@@ -172,7 +172,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
-   * 
+   *
    * @param clazz
    *          the {@link Class} relative to which to find the image
    * @param path
@@ -245,11 +245,11 @@ public class SWTResourceManager
   /**
    * Maps images to decorated images.
    */
-  private static Map[]/* <Image,Map<Image,Image>> */m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+  private static Map[]/* <Image,Map<Image,Image>> */ m_decoratedImageMap = new Map[LAST_CORNER_KEY];
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated
    * @param decorator
@@ -263,7 +263,7 @@ public class SWTResourceManager
 
   /**
    * Returns an {@link Image} composed of a base image decorated by another image.
-   * 
+   *
    * @param baseImage
    *          the base {@link Image} that should be decorated
    * @param decorator
@@ -375,16 +375,16 @@ public class SWTResourceManager
   /**
    * Maps font names to fonts.
    */
-  private static Map/* <String,Font> */m_fontMap = new HashMap();
+  private static Map/* <String,Font> */ m_fontMap = new HashMap();
 
   /**
    * Maps fonts to their bold versions.
    */
-  private static Map/* <Font,Font> */m_fontToBoldFontMap = new HashMap();
+  private static Map/* <Font,Font> */ m_fontToBoldFontMap = new HashMap();
 
   /**
    * Returns a {@link Font} based on its name, height and style.
-   * 
+   *
    * @param name
    *          the name of the font
    * @param height
@@ -401,7 +401,7 @@ public class SWTResourceManager
   /**
    * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline flags are also
    * supported.
-   * 
+   *
    * @param name
    *          the name of the font
    * @param size
@@ -455,7 +455,7 @@ public class SWTResourceManager
 
   /**
    * Returns a bold version of the given {@link Font}.
-   * 
+   *
    * @param baseFont
    *          the {@link Font} for which a bold version is desired
    * @return the bold version of the given {@link Font}
diff --git a/plugins/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java b/plugins/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
index bd3646fb60..bfe6e07a26 100644
--- a/plugins/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
+++ b/plugins/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 
 /**
  * The activator class controls the plug-in life cycle
- * 
+ *
  * @author Eike Stepper
  */
 public class Activator extends AbstractUIPlugin
@@ -65,7 +65,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns the shared instance
-   * 
+   *
    * @return the shared instance
    */
   public static Activator getDefault()
@@ -75,7 +75,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns an image descriptor for the image file at the given plug-in relative path
-   * 
+   *
    * @param path
    *          the path
    * @return the image descriptor
diff --git a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
index f54ffa1889..713ef91c70 100644
--- a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
+++ b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
@@ -24,7 +24,7 @@ import java.util.Properties;
 
 /**
  * The activator class controls the plug-in life cycle
- * 
+ *
  * @author Eike Stepper
  */
 public class Activator extends AbstractUIPlugin
@@ -83,7 +83,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns the shared instance
-   * 
+   *
    * @return the shared instance
    */
   public static Activator getDefault()
@@ -93,7 +93,7 @@ public class Activator extends AbstractUIPlugin
 
   /**
    * Returns an image descriptor for the image file at the given plug-in relative path
-   * 
+   *
    * @param path
    *          the path
    * @return the image descriptor
diff --git a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java
index 83b99bfc33..2ecfb5226e 100644
--- a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java
+++ b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java
@@ -21,7 +21,7 @@ import org.eclipse.ui.PlatformUI;
 
 /**
  * This class controls all aspects of the application's execution
- * 
+ *
  * @author Eike Stepper
  */
 public class Application implements IApplication
diff --git a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/ApplicationActionBarAdvisor.java b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/ApplicationActionBarAdvisor.java
index e21132d87d..92ad24c914 100644
--- a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/ApplicationActionBarAdvisor.java
+++ b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/ApplicationActionBarAdvisor.java
@@ -22,7 +22,7 @@ import org.eclipse.ui.application.IActionBarConfigurer;
 /**
  * An action bar advisor is responsible for creating, adding, and disposing of the actions added to a workbench window.
  * Each window will be populated with new actions.
- * 
+ *
  * @author Eike Stepper
  */
 public class ApplicationActionBarAdvisor extends ActionBarAdvisor
diff --git a/plugins/org.gastro.server.web/src/org/gastro/server/internal/web/GastroServlet.java b/plugins/org.gastro.server.web/src/org/gastro/server/internal/web/GastroServlet.java
index d971906bde..cd5ba77e44 100644
--- a/plugins/org.gastro.server.web/src/org/gastro/server/internal/web/GastroServlet.java
+++ b/plugins/org.gastro.server.web/src/org/gastro/server/internal/web/GastroServlet.java
@@ -33,8 +33,6 @@ import org.gastro.business.BusinessDay;
 import org.gastro.inventory.MenuCard;
 import org.gastro.server.GastroServer;
 
-import templates.MenuCardTemplate;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -48,6 +46,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
 
+import templates.MenuCardTemplate;
+
 /**
  * @author Eike Stepper
  */
diff --git a/plugins/org.gastro.server.web/src/org/gastro/server/internal/web/OM.java b/plugins/org.gastro.server.web/src/org/gastro/server/internal/web/OM.java
index 61c575e790..7f09310cbe 100644
--- a/plugins/org.gastro.server.web/src/org/gastro/server/internal/web/OM.java
+++ b/plugins/org.gastro.server.web/src/org/gastro/server/internal/web/OM.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */
@@ -21,7 +21,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
 
 /**
  * The <em>Operations & Maintenance</em> class of this bundle.
- * 
+ *
  * @author Eike Stepper
  */
 public abstract class OM
diff --git a/plugins/org.gastro.server/META-INF/MANIFEST.MF b/plugins/org.gastro.server/META-INF/MANIFEST.MF
index cb6b8c2533..47c23721fc 100644
--- a/plugins/org.gastro.server/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Electronic Restaurant Example Server
 Bundle-SymbolicName: org.gastro.server;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
@@ -17,6 +17,6 @@ Import-Package: org.h2;version="[1.0.0,2.0.0)",
  org.h2.tools;version="[1.0.0,2.0.0)",
  org.h2.util;version="[1.0.0,2.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.gastro.internal.server;version="4.0.300";x-internal:=true,
- org.gastro.server;version="4.0.300"
+Export-Package: org.gastro.internal.server;version="4.0.400";x-internal:=true,
+ org.gastro.server;version="4.0.400"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.gastro.server/src/org/gastro/server/GastroServer.java b/plugins/org.gastro.server/src/org/gastro/server/GastroServer.java
index bd13707309..d76e3cd619 100644
--- a/plugins/org.gastro.server/src/org/gastro/server/GastroServer.java
+++ b/plugins/org.gastro.server/src/org/gastro/server/GastroServer.java
@@ -4,10 +4,10 @@
  * 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
- *    
+ *
  *  Initial Publication:
  *    Eclipse Magazin - http://www.eclipse-magazin.de
  */