formatting

6 files changed, 40 insertions, 16 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java
index 60c6b86eb7..88bfb48a38 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Model3FactoryImpl.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
+ * $Id: Model3FactoryImpl.java,v 1.2 2008-08-11 05:11:48 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.impl;
 
@@ -67,7 +67,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
     switch (eClass.getClassifierID())
     {
     case Model3Package.CLASS1:
-      return (EObject)createClass1();
+      return createClass1();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
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 7f51dd4e14..41d529d04e 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Model3PackageImpl.java,v 1.2 2008-06-03 06:41:22 estepper Exp $
+ * $Id: Model3PackageImpl.java,v 1.3 2008-08-11 05:11:48 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.impl;
 
@@ -76,7 +76,10 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
    */
   public static Model3Package init()
   {
-    if (isInited) return (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI);
+    if (isInited)
+    {
+      return (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI);
+    }
 
     // Obtain or create and register package
     Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
@@ -149,7 +152,10 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
    */
   public void createPackageContents()
   {
-    if (isCreated) return;
+    if (isCreated)
+    {
+      return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -172,7 +178,10 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
    */
   public void initializePackageContents()
   {
-    if (isInitialized) return;
+    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/impl/SubpackageFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java
index ea5ffb9a48..68f3b9e37f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SubpackageFactoryImpl.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
+ * $Id: SubpackageFactoryImpl.java,v 1.2 2008-08-11 05:11:48 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.subpackage.impl;
 
@@ -67,7 +67,7 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac
     switch (eClass.getClassifierID())
     {
     case SubpackagePackage.CLASS2:
-      return (EObject)createClass2();
+      return createClass2();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
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 05ae555740..ba3dda0e83 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SubpackagePackageImpl.java,v 1.2 2008-06-03 06:41:22 estepper Exp $
+ * $Id: SubpackagePackageImpl.java,v 1.3 2008-08-11 05:11:48 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.subpackage.impl;
 
@@ -76,7 +76,10 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
    */
   public static SubpackagePackage init()
   {
-    if (isInited) return (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI);
+    if (isInited)
+    {
+      return (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
@@ -149,7 +152,10 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
    */
   public void createPackageContents()
   {
-    if (isCreated) return;
+    if (isCreated)
+    {
+      return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -172,7 +178,10 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
    */
   public void initializePackageContents()
   {
-    if (isInitialized) return;
+    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/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java
index edb7e65d7e..7f7d6ff7d9 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SubpackageSwitch.java,v 1.2 2008-06-03 06:41:22 estepper Exp $
+ * $Id: SubpackageSwitch.java,v 1.3 2008-08-11 05:11:48 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.subpackage.util;
 
@@ -92,7 +92,10 @@ public class SubpackageSwitch<T>
     {
       Class2 class2 = (Class2)theEObject;
       T result = caseClass2(class2);
-      if (result == null) result = defaultCase(theEObject);
+      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/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java
index 9c2d364bc9..5b3bf3118d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Model3Switch.java,v 1.2 2008-06-03 06:41:22 estepper Exp $
+ * $Id: Model3Switch.java,v 1.3 2008-08-11 05:11:48 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.util;
 
@@ -92,7 +92,10 @@ public class Model3Switch<T>
     {
       Class1 class1 = (Class1)theEObject;
       T result = caseClass1(class1);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     default: