*** empty log message ***

2 files changed, 18 insertions, 36 deletions

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 ead0e6a99a..86b17eafb5 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
@@ -153,8 +153,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
    */
   public static Model1Package init()
   {
-    if (isInited)
-      return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI);
+    if (isInited) return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI);
 
     // Obtain or create and register package
     Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE
@@ -531,8 +530,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
    */
   public void createPackageContents()
   {
-    if (isCreated)
-      return;
+    if (isCreated) return;
     isCreated = true;
 
     // Create classes and their features
@@ -596,8 +594,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
    */
   public void initializePackageContents()
   {
-    if (isInitialized)
-      return;
+    if (isInitialized) return;
     isInitialized = true;
 
     // Initialize package
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 0ba62a95c7..e46117641f 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
@@ -110,90 +110,75 @@ public class Model1Switch<T>
     {
       Address address = (Address)theEObject;
       T result = caseAddress(address);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     case Model1Package.COMPANY:
     {
       Company company = (Company)theEObject;
       T result = caseCompany(company);
-      if (result == null)
-        result = caseAddress(company);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = caseAddress(company);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     case Model1Package.SUPPLIER:
     {
       Supplier supplier = (Supplier)theEObject;
       T result = caseSupplier(supplier);
-      if (result == null)
-        result = caseAddress(supplier);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = caseAddress(supplier);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     case Model1Package.CUSTOMER:
     {
       Customer customer = (Customer)theEObject;
       T result = caseCustomer(customer);
-      if (result == null)
-        result = caseAddress(customer);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = caseAddress(customer);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     case Model1Package.ORDER:
     {
       Order order = (Order)theEObject;
       T result = caseOrder(order);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     case Model1Package.ORDER_DETAIL:
     {
       OrderDetail orderDetail = (OrderDetail)theEObject;
       T result = caseOrderDetail(orderDetail);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     case Model1Package.PURCHASE_ORDER:
     {
       PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject;
       T result = casePurchaseOrder(purchaseOrder);
-      if (result == null)
-        result = caseOrder(purchaseOrder);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = caseOrder(purchaseOrder);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     case Model1Package.SALES_ORDER:
     {
       SalesOrder salesOrder = (SalesOrder)theEObject;
       T result = caseSalesOrder(salesOrder);
-      if (result == null)
-        result = caseOrder(salesOrder);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = caseOrder(salesOrder);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     case Model1Package.CATEGORY:
     {
       Category category = (Category)theEObject;
       T result = caseCategory(category);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     case Model1Package.PRODUCT:
     {
       Product product = (Product)theEObject;
       T result = caseProduct(product);
-      if (result == null)
-        result = defaultCase(theEObject);
+      if (result == null) result = defaultCase(theEObject);
       return result;
     }
     default: