fixed warnings

8 files changed, 34 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java
index 553b728641..dfe84b432c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java
@@ -73,7 +73,9 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
   public static BasePackage init()
   {
     if (isInited)
+    {
       return (BasePackage)EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     BasePackageImpl theBasePackage = (BasePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BasePackageImpl ? EPackage.Registry.INSTANCE
@@ -142,7 +144,9 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -166,7 +170,9 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
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 6c1b068c70..ceaab178b7 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
@@ -97,7 +97,9 @@ public class BaseSwitch<T>
       BaseClass baseClass = (BaseClass)theEObject;
       T result = caseBaseClass(baseClass);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java
index 13cdd12f3a..5cef3afe96 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java
@@ -73,7 +73,9 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
   public static DerivedPackage init()
   {
     if (isInited)
+    {
       return (DerivedPackage)EPackage.Registry.INSTANCE.getEPackage(DerivedPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     DerivedPackageImpl theDerivedPackage = (DerivedPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DerivedPackageImpl ? EPackage.Registry.INSTANCE
@@ -135,7 +137,9 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -158,7 +162,9 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java
index 4b456ce4cd..669b75b3d7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java
@@ -98,9 +98,13 @@ public class DerivedSwitch<T>
       DerivedClass derivedClass = (DerivedClass)theEObject;
       T result = caseDerivedClass(derivedClass);
       if (result == null)
+      {
         result = caseBaseClass(derivedClass);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
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 0fda8209f5..ac4c5773fb 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
@@ -73,7 +73,9 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
   public static InterfacePackage init()
   {
     if (isInited)
+    {
       return (InterfacePackage)EPackage.Registry.INSTANCE.getEPackage(InterfacePackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     InterfacePackageImpl theInterfacePackage = (InterfacePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InterfacePackageImpl ? EPackage.Registry.INSTANCE
@@ -142,7 +144,9 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -166,7 +170,9 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java
index 9d14d082d5..b0539de7ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java
@@ -97,7 +97,9 @@ public class InterfaceSwitch<T>
       IInterface iInterface = (IInterface)theEObject;
       T result = caseIInterface(iInterface);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java
index b5020089a9..783fe6b5dc 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java
@@ -74,7 +74,9 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
   public static ReferencePackage init()
   {
     if (isInited)
+    {
       return (ReferencePackage)EPackage.Registry.INSTANCE.getEPackage(ReferencePackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     ReferencePackageImpl theReferencePackage = (ReferencePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReferencePackageImpl ? EPackage.Registry.INSTANCE
@@ -146,7 +148,9 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -170,7 +174,9 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java
index 87ee55c612..043e42d176 100644
--- a/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java
@@ -97,7 +97,9 @@ public class ReferenceSwitch<T>
       Reference reference = (Reference)theEObject;
       T result = caseReference(reference);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default: