fixed warnings

1 files changed, 5 insertions, 41 deletions

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 388692af06..ae9d825db9 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
@@ -91,9 +91,11 @@ public class CompanySwitch<T>
     {
       return doSwitch(theEClass.getClassifierID(), theEObject);
     }
-
-    List<EClass> eSuperTypes = theEClass.getESuperTypes();
-    return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+    }
   }
 
   /**
@@ -112,9 +114,7 @@ public class CompanySwitch<T>
       Address address = (Address)theEObject;
       T result = caseAddress(address);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case CompanyPackage.COMPANY:
@@ -122,13 +122,9 @@ public class CompanySwitch<T>
       Company company = (Company)theEObject;
       T result = caseCompany(company);
       if (result == null)
-      {
         result = caseAddress(company);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case CompanyPackage.SUPPLIER:
@@ -136,13 +132,9 @@ public class CompanySwitch<T>
       Supplier supplier = (Supplier)theEObject;
       T result = caseSupplier(supplier);
       if (result == null)
-      {
         result = caseAddress(supplier);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case CompanyPackage.CUSTOMER:
@@ -150,13 +142,9 @@ public class CompanySwitch<T>
       Customer customer = (Customer)theEObject;
       T result = caseCustomer(customer);
       if (result == null)
-      {
         result = caseAddress(customer);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case CompanyPackage.ORDER:
@@ -164,9 +152,7 @@ public class CompanySwitch<T>
       Order order = (Order)theEObject;
       T result = caseOrder(order);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case CompanyPackage.ORDER_DETAIL:
@@ -174,9 +160,7 @@ public class CompanySwitch<T>
       OrderDetail orderDetail = (OrderDetail)theEObject;
       T result = caseOrderDetail(orderDetail);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case CompanyPackage.ORDER_ADDRESS:
@@ -184,21 +168,13 @@ public class CompanySwitch<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 CompanyPackage.PURCHASE_ORDER:
@@ -206,13 +182,9 @@ 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:
@@ -220,13 +192,9 @@ 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:
@@ -234,9 +202,7 @@ public class CompanySwitch<T>
       Category category = (Category)theEObject;
       T result = caseCategory(category);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case CompanyPackage.PRODUCT:
@@ -244,9 +210,7 @@ public class CompanySwitch<T>
       Product product = (Product)theEObject;
       T result = caseProduct(product);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     default: