diff options
74 files changed, 885 insertions, 373 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java index 23a6fa7827..870efe6462 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java @@ -32,7 +32,7 @@ public interface CDORevisionDelta * Specify the version of the object BEFORE it was modified. */ public int getOriginVersion(); - + /** * Specify the version of the object AFTER it was modified. */ diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java index ffb9d09753..f62a38faae 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDNullImpl.java @@ -66,16 +66,19 @@ public final class CDOIDNullImpl extends AbstractCDOID implements CDOIDMeta, CDO return "NULL"; } + @Override public void read(String fragmentPart) { // Do nothing } + @Override public void read(ExtendedDataInput in) throws IOException { // Do nothing } + @Override public void write(ExtendedDataOutput out) throws IOException { // Do nothing diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/query/CDOQueryInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/query/CDOQueryInfoImpl.java index 6dad77be74..9f4f6f0789 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/query/CDOQueryInfoImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/query/CDOQueryInfoImpl.java @@ -39,7 +39,7 @@ public class CDOQueryInfoImpl implements CDOQueryInfo public CDOQueryInfoImpl(String language, String queryString) { - this.queryLanguage = language; + queryLanguage = language; this.queryString = queryString; } @@ -81,7 +81,7 @@ public class CDOQueryInfoImpl implements CDOQueryInfo public String getQueryLanguage() { - return this.queryLanguage; + return queryLanguage; } public Map<String, Object> getParameters() diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java index 6159982699..35bd518dc4 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java @@ -90,18 +90,21 @@ public abstract class CDORevisionResolverImpl extends Lifecycle implements CDORe public List<CDORevision> getRevisions() { ArrayList<CDORevision> currentRevisions = new ArrayList<CDORevision>(); - + for (RevisionHolder holder : revisions.values()) { CDORevision revision = holder.getRevision(false); - if (revision != null && revision.isCurrent()); + if (revision != null && revision.isCurrent()) + { + ; + } { currentRevisions.add(revision); } } return currentRevisions; } - + public CDOClass getObjectType(CDOID id) { RevisionHolder holder = revisions.get(id); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDInteger.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDInteger.java index bec44bda22..ac34f569fc 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDInteger.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOIDInteger.java @@ -55,16 +55,19 @@ public abstract class AbstractCDOIDInteger extends AbstractCDOID implements Comp /** * @since 2.0 */ + @Override public void read(String fragmentPart) { value = Integer.valueOf(fragmentPart); } + @Override public void read(ExtendedDataInput in) throws IOException { value = in.readInt(); } + @Override public void write(ExtendedDataOutput out) throws IOException { out.writeInt(value); 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 c6cf41d0ae..7c2ca9f185 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 @@ -172,7 +172,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory 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; } @@ -254,7 +254,10 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory */ public void dispose() { - if (cdoResourceItemProvider != null) cdoResourceItemProvider.dispose(); + if (cdoResourceItemProvider != null) + { + cdoResourceItemProvider.dispose(); + } } } diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java index b4682e94f4..d1a2c9fbfb 100644 --- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java +++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/actions/MigrateAction.java @@ -101,7 +101,8 @@ public class MigrateAction implements IObjectActionDelegate } catch (Exception ex) { - return new Status(IStatus.ERROR, "org.eclipse.emf.cdo.internal.migrator", "Problem while migrating EMF model", ex); + return new Status(IStatus.ERROR, "org.eclipse.emf.cdo.internal.migrator", + "Problem while migrating EMF model", ex); } return Status.OK_STATUS; diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java index 8dd075c98b..fedc46aadf 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java @@ -261,7 +261,7 @@ public abstract class MappingStrategy extends Lifecycle implements IMappingStrat } } } - + return null; } }; 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 23d49b4bb0..7031f17cae 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 @@ -293,7 +293,8 @@ public class HibernateStore extends Store implements IHibernateStore { public IDLibraryProvider() { - addLibrary(CDOIDHibernateLibraryHandler.LIBRARY_NAME, org.eclipse.emf.cdo.server.hibernate.internal.id.bundle.OM.BUNDLE); + addLibrary(CDOIDHibernateLibraryHandler.LIBRARY_NAME, + org.eclipse.emf.cdo.server.hibernate.internal.id.bundle.OM.BUNDLE); } } } diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreQueryIterator.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreQueryIterator.java index 38d5d6ec9e..b98feff35a 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreQueryIterator.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStoreQueryIterator.java @@ -78,8 +78,10 @@ public class MEMStoreQueryIterator implements CloseableIterator<Object> try { if (nextObject == null) + { throw new NoSuchElementException(); - + } + return nextObject; } finally diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java index 56e4acfb2f..5d19fde200 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java @@ -25,21 +25,25 @@ public class NOOPStore extends LongIDStore super(TYPE); } + @Override public boolean hasBranchingSupport() { return false; } + @Override public boolean hasWriteDeltaSupport() { return true; } + @Override public boolean hasAuditingSupport() { return true; } + @Override public void repairAfterCrash() { } 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 5e8c4d2c22..ede0345a8d 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 @@ -108,7 +108,8 @@ public class SessionManager extends Container<ISession> implements ISessionManag /** * @since 2.0 */ - public void handleCommitNotification(long timeStamp, List<CDOIDAndVersion> dirtyIDs, List<CDORevisionDelta> deltas, Session excludedSession) + public void handleCommitNotification(long timeStamp, List<CDOIDAndVersion> dirtyIDs, List<CDORevisionDelta> deltas, + Session excludedSession) { for (Session session : getSessions()) { diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java index e4bbcf568d..8eec77fe69 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java @@ -201,7 +201,7 @@ public class Transaction extends View implements ITransaction, IStoreWriter.Comm { try { - repository.getNotificationManager().notifyCommit( getSession(), this); + repository.getNotificationManager().notifyCommit(getSession(), this); } finally { diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java index c0e84da4d6..6ae5a2b51d 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java @@ -44,7 +44,10 @@ public class LoadRevisionByTimeIndication extends LoadRevisionIndication { super.indicating(in); timeStamp = in.readLong(); - if (PROTOCOL.isEnabled()) PROTOCOL.format("Read timeStamp: {0}", timeStamp); + if (PROTOCOL.isEnabled()) + { + PROTOCOL.format("Read timeStamp: {0}", timeStamp); + } } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java index 6195828582..f155bd6d42 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java @@ -45,7 +45,10 @@ public class LoadRevisionByVersionIndication extends LoadRevisionIndication { super.indicating(in); version = in.readInt(); - if (PROTOCOL.isEnabled()) PROTOCOL.format("Read version: {0}", version); + if (PROTOCOL.isEnabled()) + { + PROTOCOL.format("Read version: {0}", version); + } } @Override 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 05566921c6..05ea59d38a 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MangoFactoryImpl.java,v 1.4 2008-06-12 17:22:17 estepper Exp $ + * $Id: MangoFactoryImpl.java,v 1.5 2008-08-11 05:11:36 estepper Exp $ */ package org.eclipse.emf.cdo.tests.mango.impl; @@ -71,11 +71,11 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory switch (eClass.getClassifierID()) { case MangoPackage.VALUE_LIST: - return (EObject)createValueList(); + return createValueList(); case MangoPackage.VALUE: - return (EObject)createValue(); + return createValue(); case MangoPackage.PARAMETER: - return (EObject)createParameter(); + return createParameter(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -157,8 +157,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() + "'"); + } 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 e974ef2a8e..099d3ded0f 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MangoPackageImpl.java,v 1.4 2008-06-12 17:22:17 estepper Exp $ + * $Id: MangoPackageImpl.java,v 1.5 2008-08-11 05:11:36 estepper Exp $ */ package org.eclipse.emf.cdo.tests.mango.impl; @@ -100,7 +100,10 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage */ public static MangoPackage init() { - if (isInited) return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI); + if (isInited) + { + return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI); + } // Obtain or create and register package MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE @@ -236,7 +239,10 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -270,7 +276,10 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage */ public void initializePackageContents() { - if (isInitialized) return; + if (isInitialized) + { + return; + } isInitialized = true; // Initialize package @@ -288,7 +297,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage initEClass(valueListEClass, ValueList.class, "ValueList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, ValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getValueList_Values(), this.getValue(), null, "values", null, 0, -1, ValueList.class, !IS_TRANSIENT, + initEReference(getValueList_Values(), getValue(), null, "values", null, 0, -1, ValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -299,7 +308,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, Parameter.class, + initEAttribute(getParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Initialize enums and add enum literals 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 4e308b2766..20e9d375ff 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MangoSwitch.java,v 1.4 2008-06-12 17:22:17 estepper Exp $ + * $Id: MangoSwitch.java,v 1.5 2008-08-11 05:11:36 estepper Exp $ */ package org.eclipse.emf.cdo.tests.mango.util; @@ -94,21 +94,30 @@ public class MangoSwitch<T> { ValueList valueList = (ValueList)theEObject; T result = caseValueList(valueList); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case MangoPackage.VALUE: { Value value = (Value)theEObject; T result = caseValue(value); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case MangoPackage.PARAMETER: { Parameter parameter = (Parameter)theEObject; T result = caseParameter(parameter); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } default: 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 421cd4edef..765e0ce20c 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 @@ -79,27 +79,27 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory switch (eClass.getClassifierID()) { case Model1Package.ADDRESS: - return (EObject)createAddress(); + return createAddress(); case Model1Package.COMPANY: - return (EObject)createCompany(); + return createCompany(); case Model1Package.SUPPLIER: - return (EObject)createSupplier(); + return createSupplier(); case Model1Package.CUSTOMER: - return (EObject)createCustomer(); + return createCustomer(); case Model1Package.ORDER: - return (EObject)createOrder(); + return createOrder(); case Model1Package.ORDER_DETAIL: - return (EObject)createOrderDetail(); + return createOrderDetail(); case Model1Package.PURCHASE_ORDER: - return (EObject)createPurchaseOrder(); + return createPurchaseOrder(); case Model1Package.SALES_ORDER: - return (EObject)createSalesOrder(); + return createSalesOrder(); case Model1Package.CATEGORY: - return (EObject)createCategory(); + return createCategory(); case Model1Package.PRODUCT: - return (EObject)createProduct(); + return createProduct(); case Model1Package.ORDER_ADDRESS: - return (EObject)createOrderAddress(); + return createOrderAddress(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -214,8 +214,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() + "'"); + } 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 f15ed03ee4..0bf2e4275c 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 @@ -163,7 +163,10 @@ 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 @@ -589,7 +592,10 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -660,7 +666,10 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package */ public void initializePackageContents() { - if (isInitialized) return; + if (isInitialized) + { + return; + } isInitialized = true; // Initialize package @@ -673,14 +682,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); @@ -692,45 +701,45 @@ 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_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, @@ -740,35 +749,35 @@ 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, + 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); initEClass(orderAddressEClass, OrderAddress.class, "OrderAddress", !IS_ABSTRACT, !IS_INTERFACE, 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 440e046010..bd3aba8bdd 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 @@ -102,85 +102,142 @@ 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; } case Model1Package.ORDER_ADDRESS: { 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); + 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; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java index c51ea12ce4..ec2c68d0ef 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Model2FactoryImpl.java,v 1.2 2008-04-07 08:28:21 estepper Exp $ + * $Id: Model2FactoryImpl.java,v 1.3 2008-08-11 05:11:49 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model2.impl; @@ -67,7 +67,7 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory switch (eClass.getClassifierID()) { case Model2Package.SPECIAL_PURCHASE_ORDER: - return (EObject)createSpecialPurchaseOrder(); + return createSpecialPurchaseOrder(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } 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 a915fbcfa9..68e4b6f954 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Model2PackageImpl.java,v 1.4 2008-06-03 06:41:28 estepper Exp $ + * $Id: Model2PackageImpl.java,v 1.5 2008-08-11 05:11:49 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model2.impl; @@ -76,7 +76,10 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package */ public static Model2Package init() { - if (isInited) return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI); + if (isInited) + { + return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI); + } // Obtain or create and register package Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE @@ -155,7 +158,10 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -179,7 +185,10 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package */ public void initializePackageContents() { - if (isInitialized) return; + if (isInitialized) + { + return; + } isInitialized = true; // Initialize package 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 5b6849f11e..2d0468dbb4 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: Model2Switch.java,v 1.3 2008-06-03 06:41:28 estepper Exp $ + * $Id: Model2Switch.java,v 1.4 2008-08-11 05:11:49 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model2.util; @@ -94,9 +94,18 @@ public class Model2Switch<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); + if (result == null) + { + result = casePurchaseOrder(specialPurchaseOrder); + } + if (result == null) + { + result = caseOrder(specialPurchaseOrder); + } + 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/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: diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4FactoryImpl.java index a3f7d9a20b..f9254d26e0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4FactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: model4FactoryImpl.java,v 1.2 2008-07-10 15:57:40 estepper Exp $ + * $Id: model4FactoryImpl.java,v 1.3 2008-08-11 05:11:45 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4.impl; @@ -96,65 +96,65 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory switch (eClass.getClassifierID()) { case model4Package.REF_SINGLE_CONTAINED: - return (EObject)createRefSingleContained(); + return createRefSingleContained(); case model4Package.SINGLE_CONTAINED_ELEMENT: - return (EObject)createSingleContainedElement(); + return createSingleContainedElement(); case model4Package.REF_SINGLE_NON_CONTAINED: - return (EObject)createRefSingleNonContained(); + return createRefSingleNonContained(); case model4Package.SINGLE_NON_CONTAINED_ELEMENT: - return (EObject)createSingleNonContainedElement(); + return createSingleNonContainedElement(); case model4Package.REF_MULTI_CONTAINED: - return (EObject)createRefMultiContained(); + return createRefMultiContained(); case model4Package.MULTI_CONTAINED_ELEMENT: - return (EObject)createMultiContainedElement(); + return createMultiContainedElement(); case model4Package.REF_MULTI_NON_CONTAINED: - return (EObject)createRefMultiNonContained(); + return createRefMultiNonContained(); case model4Package.MULTI_NON_CONTAINED_ELEMENT: - return (EObject)createMultiNonContainedElement(); + return createMultiNonContainedElement(); case model4Package.REF_SINGLE_CONTAINED_NPL: - return (EObject)createRefSingleContainedNPL(); + return createRefSingleContainedNPL(); case model4Package.REF_SINGLE_NON_CONTAINED_NPL: - return (EObject)createRefSingleNonContainedNPL(); + return createRefSingleNonContainedNPL(); case model4Package.REF_MULTI_CONTAINED_NPL: - return (EObject)createRefMultiContainedNPL(); + return createRefMultiContainedNPL(); case model4Package.REF_MULTI_NON_CONTAINED_NPL: - return (EObject)createRefMultiNonContainedNPL(); + return createRefMultiNonContainedNPL(); case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE: - return (EObject)createContainedElementNoOpposite(); + return createContainedElementNoOpposite(); case model4Package.GEN_REF_SINGLE_CONTAINED: - return (EObject)createGenRefSingleContained(); + return createGenRefSingleContained(); case model4Package.GEN_REF_SINGLE_NON_CONTAINED: - return (EObject)createGenRefSingleNonContained(); + return createGenRefSingleNonContained(); case model4Package.GEN_REF_MULTI_CONTAINED: - return (EObject)createGenRefMultiContained(); + return createGenRefMultiContained(); case model4Package.GEN_REF_MULTI_NON_CONTAINED: - return (EObject)createGenRefMultiNonContained(); + return createGenRefMultiNonContained(); case model4Package.IMPL_SINGLE_REF_CONTAINER: - return (EObject)createImplSingleRefContainer(); + return createImplSingleRefContainer(); case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT: - return (EObject)createImplSingleRefContainedElement(); + return createImplSingleRefContainedElement(); case model4Package.IMPL_SINGLE_REF_NON_CONTAINER: - return (EObject)createImplSingleRefNonContainer(); + return createImplSingleRefNonContainer(); case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT: - return (EObject)createImplSingleRefNonContainedElement(); + return createImplSingleRefNonContainedElement(); case model4Package.IMPL_MULTI_REF_NON_CONTAINER: - return (EObject)createImplMultiRefNonContainer(); + return createImplMultiRefNonContainer(); case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT: - return (EObject)createImplMultiRefNonContainedElement(); + return createImplMultiRefNonContainedElement(); case model4Package.IMPL_MULTI_REF_CONTAINER: - return (EObject)createImplMultiRefContainer(); + return createImplMultiRefContainer(); case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT: - return (EObject)createImplMultiRefContainedElement(); + return createImplMultiRefContainedElement(); case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL: - return (EObject)createImplSingleRefContainerNPL(); + return createImplSingleRefContainerNPL(); case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL: - return (EObject)createImplSingleRefNonContainerNPL(); + return createImplSingleRefNonContainerNPL(); case model4Package.IMPL_MULTI_REF_CONTAINER_NPL: - return (EObject)createImplMultiRefContainerNPL(); + return createImplMultiRefContainerNPL(); case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL: - return (EObject)createImplMultiRefNonContainerNPL(); + return createImplMultiRefNonContainerNPL(); case model4Package.IMPL_CONTAINED_ELEMENT_NPL: - return (EObject)createImplContainedElementNPL(); + return createImplContainedElementNPL(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } 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 921c872db3..396c891cdd 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: model4PackageImpl.java,v 1.2 2008-07-10 15:57:40 estepper Exp $ + * $Id: model4PackageImpl.java,v 1.3 2008-08-11 05:11:44 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4.impl; @@ -308,7 +308,10 @@ public class model4PackageImpl extends EPackageImpl implements model4Package */ public static model4Package init() { - if (isInited) return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI); + if (isInited) + { + return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI); + } // Obtain or create and register package model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE @@ -907,7 +910,10 @@ public class model4PackageImpl extends EPackageImpl implements model4Package */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -1012,7 +1018,10 @@ public class model4PackageImpl extends EPackageImpl implements model4Package */ public void initializePackageContents() { - if (isInitialized) return; + if (isInitialized) + { + return; + } isInitialized = true; // Initialize package @@ -1050,25 +1059,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); @@ -1077,32 +1084,30 @@ 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); @@ -1111,33 +1116,32 @@ public class model4PackageImpl extends EPackageImpl implements model4Package 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(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); + 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", 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 0b2024f9e0..8b3a6e39a1 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: model4Switch.java,v 1.2 2008-07-10 15:57:41 estepper Exp $ + * $Id: model4Switch.java,v 1.3 2008-08-11 05:11:44 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4.util; @@ -135,224 +135,356 @@ public class model4Switch<T> { RefSingleContained refSingleContained = (RefSingleContained)theEObject; T result = caseRefSingleContained(refSingleContained); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.SINGLE_CONTAINED_ELEMENT: { SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject; T result = caseSingleContainedElement(singleContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.REF_SINGLE_NON_CONTAINED: { RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject; T result = caseRefSingleNonContained(refSingleNonContained); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.SINGLE_NON_CONTAINED_ELEMENT: { SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject; T result = caseSingleNonContainedElement(singleNonContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_CONTAINED: { RefMultiContained refMultiContained = (RefMultiContained)theEObject; T result = caseRefMultiContained(refMultiContained); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.MULTI_CONTAINED_ELEMENT: { MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject; T result = caseMultiContainedElement(multiContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_NON_CONTAINED: { RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject; T result = caseRefMultiNonContained(refMultiNonContained); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.MULTI_NON_CONTAINED_ELEMENT: { MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject; T result = caseMultiNonContainedElement(multiNonContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.REF_SINGLE_CONTAINED_NPL: { RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject; T result = caseRefSingleContainedNPL(refSingleContainedNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.REF_SINGLE_NON_CONTAINED_NPL: { RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject; T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_CONTAINED_NPL: { RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject; T result = caseRefMultiContainedNPL(refMultiContainedNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_NON_CONTAINED_NPL: { RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject; T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE: { ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject; T result = caseContainedElementNoOpposite(containedElementNoOpposite); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_SINGLE_CONTAINED: { GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject; T result = caseGenRefSingleContained(genRefSingleContained); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_SINGLE_NON_CONTAINED: { GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject; T result = caseGenRefSingleNonContained(genRefSingleNonContained); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MULTI_CONTAINED: { GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject; T result = caseGenRefMultiContained(genRefMultiContained); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MULTI_NON_CONTAINED: { GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject; T result = caseGenRefMultiNonContained(genRefMultiNonContained); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER: { ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject; T result = caseImplSingleRefContainer(implSingleRefContainer); - if (result == null) result = caseISingleRefContainer(implSingleRefContainer); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseISingleRefContainer(implSingleRefContainer); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT: { ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject; T result = caseImplSingleRefContainedElement(implSingleRefContainedElement); - if (result == null) result = caseISingleRefContainedElement(implSingleRefContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseISingleRefContainedElement(implSingleRefContainedElement); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER: { ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject; T result = caseImplSingleRefNonContainer(implSingleRefNonContainer); - if (result == null) result = caseISingleRefNonContainer(implSingleRefNonContainer); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseISingleRefNonContainer(implSingleRefNonContainer); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT: { ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject; T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement); - if (result == null) result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER: { ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject; T result = caseImplMultiRefNonContainer(implMultiRefNonContainer); - if (result == null) result = caseIMultiRefNonContainer(implMultiRefNonContainer); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseIMultiRefNonContainer(implMultiRefNonContainer); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT: { ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject; T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement); - if (result == null) result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER: { ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject; T result = caseImplMultiRefContainer(implMultiRefContainer); - if (result == null) result = caseIMultiRefContainer(implMultiRefContainer); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseIMultiRefContainer(implMultiRefContainer); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT: { ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject; T result = caseImplMultiRefContainedElement(implMultiRefContainedElement); - if (result == null) result = caseIMultiRefContainedElement(implMultiRefContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseIMultiRefContainedElement(implMultiRefContainedElement); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL: { ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject; T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL); - if (result == null) result = caseISingleRefContainerNPL(implSingleRefContainerNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseISingleRefContainerNPL(implSingleRefContainerNPL); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL: { ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject; T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL); - if (result == null) result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER_NPL: { ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject; T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL); - if (result == null) result = caseIMultiRefContainerNPL(implMultiRefContainerNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseIMultiRefContainerNPL(implMultiRefContainerNPL); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL: { ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject; T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL); - if (result == null) result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL); + } + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_CONTAINED_ELEMENT_NPL: { 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); + if (result == null) + { + result = caseIContainedElementNoParentLink(implContainedElementNPL); + } + if (result == null) + { + result = caseINamedElement(implContainedElementNPL); + } + 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/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java index 73ca6f88ec..dffbaac84f 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: model4interfacesPackageImpl.java,v 1.2 2008-07-10 15:57:45 estepper Exp $ + * $Id: model4interfacesPackageImpl.java,v 1.3 2008-08-11 05:11:27 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces.impl; @@ -180,7 +180,9 @@ 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 @@ -496,7 +498,10 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -557,7 +562,10 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i */ public void initializePackageContents() { - if (isInitialized) return; + if (isInitialized) + { + return; + } isInitialized = true; // Initialize package @@ -574,57 +582,55 @@ 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, + 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, + 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, + 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, + 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); @@ -638,26 +644,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/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java index bd1ce82740..a2faf5bcaa 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: model4interfacesSwitch.java,v 1.2 2008-07-10 15:57:45 estepper Exp $ + * $Id: model4interfacesSwitch.java,v 1.3 2008-08-11 05:11:27 estepper Exp $ */ package org.eclipse.emf.cdo.tests.model4interfaces.util; @@ -105,98 +105,140 @@ public class model4interfacesSwitch<T> { ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject; T result = caseISingleRefContainer(iSingleRefContainer); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT: { ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject; T result = caseISingleRefContainedElement(iSingleRefContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER: { ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject; T result = caseISingleRefNonContainer(iSingleRefNonContainer); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT: { ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject; T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER: { IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject; T result = caseIMultiRefContainer(iMultiRefContainer); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT: { IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject; T result = caseIMultiRefContainedElement(iMultiRefContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER: { IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject; T result = caseIMultiRefNonContainer(iMultiRefNonContainer); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT: { IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject; T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.INAMED_ELEMENT: { INamedElement iNamedElement = (INamedElement)theEObject; T result = caseINamedElement(iNamedElement); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK: { IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject; T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL: { ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject; T result = caseISingleRefContainerNPL(iSingleRefContainerNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL: { ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject; T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL: { IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject; T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL: { IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject; T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } default: 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 4cdc199ffb..e565c9480d 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: BasePackageImpl.java,v 1.1 2008-07-02 14:09:49 estepper Exp $ + * $Id: BasePackageImpl.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package base.impl; @@ -74,7 +74,10 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage */ public static BasePackage init() { - if (isInited) return (BasePackage)EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI); + if (isInited) + { + return (BasePackage)EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI); + } // Obtain or create and register package BasePackageImpl theBasePackage = (BasePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof BasePackageImpl ? EPackage.Registry.INSTANCE @@ -140,7 +143,10 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -163,7 +169,10 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage */ public void initializePackageContents() { - if (isInitialized) return; + 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 258ed5cd67..f6a7ab6bd0 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: BaseSwitch.java,v 1.1 2008-07-02 14:09:48 estepper Exp $ + * $Id: BaseSwitch.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package base.util; @@ -92,7 +92,10 @@ public class BaseSwitch<T> { BaseClass baseClass = (BaseClass)theEObject; T result = caseBaseClass(baseClass); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java index dfb3c95f80..1b7c5c951e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DerivedFactoryImpl.java,v 1.1 2008-07-02 14:09:49 estepper Exp $ + * $Id: DerivedFactoryImpl.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package derived.impl; @@ -67,7 +67,7 @@ public class DerivedFactoryImpl extends EFactoryImpl implements DerivedFactory switch (eClass.getClassifierID()) { case DerivedPackage.DERIVED_CLASS: - return (EObject)createDerivedClass(); + return createDerivedClass(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } 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 ba311836b2..6f945c8396 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DerivedPackageImpl.java,v 1.1 2008-07-02 14:09:49 estepper Exp $ + * $Id: DerivedPackageImpl.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package derived.impl; @@ -74,7 +74,10 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage */ public static DerivedPackage init() { - if (isInited) return (DerivedPackage)EPackage.Registry.INSTANCE.getEPackage(DerivedPackage.eNS_URI); + if (isInited) + { + return (DerivedPackage)EPackage.Registry.INSTANCE.getEPackage(DerivedPackage.eNS_URI); + } // Obtain or create and register package DerivedPackageImpl theDerivedPackage = (DerivedPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DerivedPackageImpl ? EPackage.Registry.INSTANCE @@ -133,7 +136,10 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -155,7 +161,10 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage */ public void initializePackageContents() { - if (isInitialized) return; + 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 77fc6e3b87..7b69d02852 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DerivedSwitch.java,v 1.1 2008-07-02 14:09:49 estepper Exp $ + * $Id: DerivedSwitch.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package derived.util; @@ -93,8 +93,14 @@ public class DerivedSwitch<T> { DerivedClass derivedClass = (DerivedClass)theEObject; T result = caseDerivedClass(derivedClass); - if (result == null) result = caseBaseClass(derivedClass); - if (result == null) result = defaultCase(theEObject); + 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 286f8cc4fd..ed0897e503 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: InterfacePackageImpl.java,v 1.1 2008-07-02 14:09:49 estepper Exp $ + * $Id: InterfacePackageImpl.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package interface_.impl; @@ -74,7 +74,10 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka */ public static InterfacePackage init() { - if (isInited) return (InterfacePackage)EPackage.Registry.INSTANCE.getEPackage(InterfacePackage.eNS_URI); + if (isInited) + { + return (InterfacePackage)EPackage.Registry.INSTANCE.getEPackage(InterfacePackage.eNS_URI); + } // Obtain or create and register package InterfacePackageImpl theInterfacePackage = (InterfacePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof InterfacePackageImpl ? EPackage.Registry.INSTANCE @@ -140,7 +143,10 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -163,7 +169,10 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka */ public void initializePackageContents() { - if (isInitialized) return; + 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 9979ed8ef0..77f432189a 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: InterfaceSwitch.java,v 1.1 2008-07-02 14:09:48 estepper Exp $ + * $Id: InterfaceSwitch.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package interface_.util; @@ -92,7 +92,10 @@ public class InterfaceSwitch<T> { IInterface iInterface = (IInterface)theEObject; T result = caseIInterface(iInterface); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } default: 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 f93979e1c2..aa6f63e6b1 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ReferenceFactoryImpl.java,v 1.1 2008-07-02 14:09:49 estepper Exp $ + * $Id: ReferenceFactoryImpl.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package reference.impl; @@ -67,7 +67,7 @@ public class ReferenceFactoryImpl extends EFactoryImpl implements ReferenceFacto switch (eClass.getClassifierID()) { case ReferencePackage.REFERENCE: - return (EObject)createReference(); + return createReference(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } 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 8f5e50b692..6b0685c0e0 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ReferencePackageImpl.java,v 1.1 2008-07-02 14:09:49 estepper Exp $ + * $Id: ReferencePackageImpl.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package reference.impl; @@ -75,7 +75,10 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka */ public static ReferencePackage init() { - if (isInited) return (ReferencePackage)EPackage.Registry.INSTANCE.getEPackage(ReferencePackage.eNS_URI); + if (isInited) + { + return (ReferencePackage)EPackage.Registry.INSTANCE.getEPackage(ReferencePackage.eNS_URI); + } // Obtain or create and register package ReferencePackageImpl theReferencePackage = (ReferencePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ReferencePackageImpl ? EPackage.Registry.INSTANCE @@ -144,7 +147,10 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -167,7 +173,10 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka */ public void initializePackageContents() { - if (isInitialized) return; + 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 9419c20dea..4aaa2c6a90 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ReferenceSwitch.java,v 1.1 2008-07-02 14:09:48 estepper Exp $ + * $Id: ReferenceSwitch.java,v 1.2 2008-08-11 05:10:46 estepper Exp $ */ package reference.util; @@ -92,7 +92,10 @@ public class ReferenceSwitch<T> { Reference reference = (Reference)theEObject; T result = caseReference(reference); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } default: 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 cb50d18d75..9857563d2e 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 @@ -1708,7 +1708,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv */ 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() diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java index 3cabe65ed6..61e0878d1f 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java @@ -132,11 +132,13 @@ public class CDOLabelProvider extends AdapterFactoryLabelProvider implements ICo return decorateText(super.getColumnText(object, columnIndex), object); } + @Override public Color getBackground(Object object) { return null; } + @Override public Color getForeground(Object object) { try @@ -158,6 +160,7 @@ public class CDOLabelProvider extends AdapterFactoryLabelProvider implements ICo return null; } + @Override public Font getFont(Object object) { try diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java index 80ae1f6163..0071473f76 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java @@ -120,9 +120,11 @@ public interface CDOView extends CDOProtocolView, INotifier /** * Takes an object from a (possibly) different view and <em>contextifies</em> it for the usage with this view. * <ul> - * <li>If the given object is contained in this view it is returned unmodified. <li>If the given object can not be - * cast to {@link CDOObject} it is returned unmodified. <li>If the view of the given object is contained in a - * different session an <code>IllegalArgumentException</code> is thrown. <li>If <code>null</code> is passed <code>null + * <li>If the given object is contained in this view it is returned unmodified. + * <li>If the given object can not be cast to {@link CDOObject} it is returned unmodified. + * <li>If the view of the given object is contained in a different session an <code>IllegalArgumentException</code> is + * thrown. + * <li>If <code>null</code> is passed <code>null * </code> is returned. * </ul> * 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 026f3b217b..99b57b32b1 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 @@ -104,7 +104,10 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka */ public static EresourcePackage init() { - if (isInited) return (EresourcePackage)EPackage.Registry.INSTANCE.getEPackage(EresourcePackage.eNS_URI); + if (isInited) + { + return (EresourcePackage)EPackage.Registry.INSTANCE.getEPackage(EresourcePackage.eNS_URI); + } // Obtain or create and register package EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE @@ -293,7 +296,10 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka */ public void createPackageContents() { - if (isCreated) return; + if (isCreated) + { + return; + } isCreated = true; // Create classes and their features @@ -330,7 +336,10 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka */ public void initializePackageContents() { - if (isInitialized) return; + if (isInitialized) + { + return; + } isInitialized = true; // Initialize package @@ -350,10 +359,10 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka // Initialize classes and features; add operations and parameters initEClass(cdoResourceEClass, CDOResource.class, "CDOResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getCDOResource_ResourceSet(), this.getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class, + 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); - initEAttribute(getCDOResource_URI(), this.getURI(), "uRI", null, 0, 1, CDOResource.class, 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, + IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getCDOResource_Contents(), theEcorePackage.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); @@ -364,9 +373,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka 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); - initEAttribute(getCDOResource_Errors(), this.getDiagnostic(), "errors", null, 0, -1, CDOResource.class, - IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getCDOResource_Warnings(), this.getDiagnostic(), "warnings", null, 0, -1, CDOResource.class, + 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); + 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); initEAttribute(getCDOResource_TimeStamp(), theEcorePackage.getELong(), "timeStamp", null, 0, 1, CDOResource.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/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java index bd97da807d..75c3246f12 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java @@ -96,7 +96,10 @@ public class EresourceSwitch<T> { CDOResource cdoResource = (CDOResource)theEObject; T result = caseCDOResource(cdoResource); - if (result == null) result = defaultCase(theEObject); + if (result == null) + { + result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java index 4d41c44a04..b7856ffab3 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java @@ -493,7 +493,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent changeState(object, CDOState.DIRTY); } } - + /** * @author Simon McDuff */ @@ -506,6 +506,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent transaction.registerFeatureDelta(object, (CDOFeatureDelta)featureDelta); } } + /** * @author Simon McDuff */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitNotificationIndication.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitNotificationIndication.java index bd22365586..6c23c3e335 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitNotificationIndication.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitNotificationIndication.java @@ -80,13 +80,13 @@ public class CommitNotificationIndication extends Indication { PROTOCOL.format("Reading {0} Deltas", size); } - + List<CDORevisionDelta> deltas = new ArrayList<CDORevisionDelta>(); for (int i = 0; i < size; i++) { deltas.add(new CDORevisionDeltaImpl(in, getSession().getPackageManager())); } - + session.handleCommitNotification(timeStamp, dirtyOIDs, deltas, null); } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java index 23f0c30630..ae48c60265 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/SyncRevisionRequest.java @@ -52,7 +52,7 @@ public class SyncRevisionRequest extends CDOClientRequest<Set<CDOIDAndVersion>> int referenceChunk) { super(channel); - this.collectionRevisions = cdoRevisions; + collectionRevisions = cdoRevisions; this.referenceChunk = referenceChunk; this.cdoSession = cdoSession; } diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java index 210d0f8848..4a24c4bdd3 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java @@ -137,7 +137,10 @@ public class BuddyAdmin extends CollaborationContainer implements IBuddyAdmin, I buddy.setSession(session); LifecycleUtil.activate(session); - if (TRACER.isEnabled()) TRACER.trace("Opened session: " + userID); + if (TRACER.isEnabled()) + { + TRACER.trace("Opened session: " + userID); + } sessions.put(userID, session); return session; } diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBStatement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBStatement.java index b1c092425b..b582af2bd9 100644 --- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBStatement.java +++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/dml/DBStatement.java @@ -68,7 +68,7 @@ public class DBStatement implements IDBStatement Object tail = sequence.get(tailPos); if (tail instanceof String) { - sequence.set(tailPos, ((String)tail) + literal); + sequence.set(tailPos, (String)tail + literal); } else { diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryQueueImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryQueueImpl.java index d1a71e1e9d..30088fc620 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryQueueImpl.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryQueueImpl.java @@ -20,7 +20,7 @@ public class TemporaryQueueImpl extends QueueImpl implements TemporaryQueue public TemporaryQueueImpl() { - super("TempQueue" + (++counter)); + super("TempQueue" + ++counter); } public void delete() diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryTopicImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryTopicImpl.java index 2b1c09ea17..a6a0745fcf 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryTopicImpl.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TemporaryTopicImpl.java @@ -20,7 +20,7 @@ public class TemporaryTopicImpl extends TopicImpl implements TemporaryTopic public TemporaryTopicImpl() { - super("TempTopic" + (++counter)); + super("TempTopic" + ++counter); } public void delete() diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java index b95289af92..aaf5099e5a 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java @@ -37,6 +37,7 @@ public class JVMClientConnector extends JVMConnector { } + @Override public ConnectorLocation getLocation() { return ConnectorLocation.CLIENT; 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 3e86e9e488..f1440a9838 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 @@ -23,6 +23,7 @@ public class JVMServerConnector extends JVMConnector setPeer(clientPeer); } + @Override public ConnectorLocation getLocation() { return ConnectorLocation.SERVER; 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 1ce1d13acd..f30da12980 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 @@ -119,9 +119,13 @@ public class RegExContentProposalProvider implements IContentProposalProvider esc: for (int i = position - 1; i >= 0; i--) { if (fExpression.charAt(i) == '\\') + { isEscape = !isEscape; + } else + { break esc; + } } fIsEscape = isEscape; @@ -147,7 +151,10 @@ public class RegExContentProposalProvider implements IContentProposalProvider addBsProposal("\\e", RegExMessages.displayString_bs_e, RegExMessages.additionalInfo_bs_e); //$NON-NLS-1$ addBsProposal("\\c", RegExMessages.displayString_bs_c, RegExMessages.additionalInfo_bs_c); //$NON-NLS-1$ - if (!fIsEscape) addBracketProposal(".", 1, RegExMessages.displayString_dot, RegExMessages.additionalInfo_dot); //$NON-NLS-1$ + if (!fIsEscape) + { + addBracketProposal(".", 1, RegExMessages.displayString_dot, RegExMessages.additionalInfo_dot); //$NON-NLS-1$ + } addBsProposal("\\d", RegExMessages.displayString_bs_d, RegExMessages.additionalInfo_bs_d); //$NON-NLS-1$ addBsProposal("\\D", RegExMessages.displayString_bs_D, RegExMessages.additionalInfo_bs_D); //$NON-NLS-1$ addBsProposal("\\s", RegExMessages.displayString_bs_s, RegExMessages.additionalInfo_bs_s); //$NON-NLS-1$ @@ -421,7 +428,10 @@ public class RegExContentProposalProvider implements IContentProposalProvider */ public IContentProposal[] getProposals(String contents, int position) { - if (fIsFind) return new ProposalComputer(contents, position).computeFindProposals(); + if (fIsFind) + { + return new ProposalComputer(contents, position).computeFindProposals(); + } return new ProposalComputer(contents, position).computeReplaceProposals(); } } 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 ac210bbf9a..9601e27546 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 @@ -108,15 +108,15 @@ public class LegacyBundle extends AbstractBundle // CommonPlugin.class // // For a plugin.xml with runtime="runtime/common.jar": - //jar:file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common/runtime/common.jar!/org/eclipse/common + // jar:file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common/runtime/common.jar!/org/eclipse/common // /CommonPlugin.class // // For a plugin.xml with runtime="." where the plugin is jarred: - //jar:file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common.jar!/org/eclipse/common/CommonPlugin. + // jar:file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common.jar!/org/eclipse/common/CommonPlugin. // class // // For a plugin.xml with runtime="." where the plugin is not jarred. - //file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common/org/eclipse/emf/common/CommonPlugin.class + // file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common/org/eclipse/emf/common/CommonPlugin.class // // Running in PDE with bin on classpath: // file:/D:/sandbox/unpackage1-3.1M7/eclipse/plugins/org.eclipse.emf.common/bin/org/eclipse/emf/common/CommonPlugin. 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 aceac38ae9..75e9a29978 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 @@ -100,6 +100,9 @@ public abstract class Cache<E> extends Worker implements ICache protected void unreachableElement(E element) { - if (TRACER.isEnabled()) TRACER.trace("Unreachable: " + element); + if (TRACER.isEnabled()) + { + TRACER.trace("Unreachable: " + element); + } } } diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheMonitor.java index c3fb1fc19b..1632c9b753 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheMonitor.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheMonitor.java @@ -106,7 +106,10 @@ public class CacheMonitor extends Worker implements ICacheMonitor public ICacheRegistration registerCache(ICache cache) { - if (TRACER.isEnabled()) TRACER.trace("Registering cache " + cache); + if (TRACER.isEnabled()) + { + TRACER.trace("Registering cache " + cache); + } ICacheRegistration registration = new CacheRegistration(this, cache); ICacheRegistration oldRegistration; synchronized (registrations) @@ -133,7 +136,10 @@ public class CacheMonitor extends Worker implements ICacheMonitor if (registration != null) { registration.dispose(); - if (TRACER.isEnabled()) TRACER.trace("Deregistered cache " + cache); + if (TRACER.isEnabled()) + { + TRACER.trace("Deregistered cache " + cache); + } } } 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 bb94cbd75f..3687f6b1e2 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 @@ -92,7 +92,7 @@ public class CacheRegistration implements ICacheRegistration { checkDisposal(); float decayFactor = getReconstructionCostDecayFactor(); - this.reconstructionCost = (long)(decayFactor * this.reconstructionCost + (1 - decayFactor) * reconstructionTime); + reconstructionCost = (long)(decayFactor * reconstructionCost + (1 - decayFactor) * reconstructionTime); } protected float getReconstructionCostDecayFactor() diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java index 09f6405bd8..8e4cc5c85a 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MultiMap.java @@ -289,6 +289,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean add(Entry<K, V> o) { throw new UnsupportedOperationException(); @@ -297,6 +298,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean addAll(Collection<? extends Entry<K, V>> c) { throw new UnsupportedOperationException(); @@ -305,6 +307,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public void clear() { throw new UnsupportedOperationException(); @@ -313,6 +316,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean remove(Object o) { throw new UnsupportedOperationException(); @@ -321,6 +325,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean removeAll(Collection<?> c) { throw new UnsupportedOperationException(); @@ -329,6 +334,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean retainAll(Collection<?> c) { throw new UnsupportedOperationException(); @@ -337,6 +343,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override @SuppressWarnings("unchecked") public boolean contains(Object o) { @@ -366,6 +373,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public boolean isEmpty() { return MultiMap.this.isEmpty(); @@ -374,11 +382,13 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public int size() { return MultiMap.this.size(); } + @Override public Iterator<Entry<K, V>> iterator() { return new Iterator<Entry<K, V>>() @@ -472,6 +482,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean add(K o) { throw new UnsupportedOperationException(); @@ -480,6 +491,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean addAll(Collection<? extends K> c) { throw new UnsupportedOperationException(); @@ -488,6 +500,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public void clear() { throw new UnsupportedOperationException(); @@ -496,6 +509,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean remove(Object o) { throw new UnsupportedOperationException(); @@ -504,6 +518,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean removeAll(Collection<?> c) { throw new UnsupportedOperationException(); @@ -512,6 +527,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean retainAll(Collection<?> c) { throw new UnsupportedOperationException(); @@ -520,6 +536,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public boolean contains(Object o) { return MultiMap.this.containsKey(o); @@ -528,6 +545,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public boolean isEmpty() { return MultiMap.this.isEmpty(); @@ -536,6 +554,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public int size() { return MultiMap.this.size(); @@ -544,6 +563,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public Iterator<K> iterator() { return new Iterator<K>() @@ -637,6 +657,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean add(V o) { throw new UnsupportedOperationException(); @@ -645,6 +666,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean addAll(Collection<? extends V> c) { throw new UnsupportedOperationException(); @@ -653,6 +675,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public void clear() { throw new UnsupportedOperationException(); @@ -661,6 +684,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean remove(Object o) { throw new UnsupportedOperationException(); @@ -669,6 +693,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean removeAll(Collection<?> c) { throw new UnsupportedOperationException(); @@ -677,6 +702,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category WRITE */ + @Override public boolean retainAll(Collection<?> c) { throw new UnsupportedOperationException(); @@ -685,6 +711,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public boolean contains(Object o) { return MultiMap.this.containsValue(o); @@ -693,6 +720,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public boolean isEmpty() { return MultiMap.this.isEmpty(); @@ -701,6 +729,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public int size() { return MultiMap.this.size(); @@ -709,6 +738,7 @@ public abstract class MultiMap<K, V> implements Map<K, V> /** * @category READ */ + @Override public Iterator<V> iterator() { return new Iterator<V>() 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 ba32d81740..af81b7d995 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 @@ -24,6 +24,7 @@ public class Event extends EventObject implements IEvent super(notifier); } + @Override public INotifier getSource() { return (INotifier)source; 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 2451a14801..3b817929a3 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 @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.util.io; - /** * @author Eike Stepper * @since 2.0 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 699bda1990..7e0d87410d 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 @@ -92,19 +92,33 @@ public final class NIOUtil throw new IllegalArgumentException("Source file '" + src.getAbsolutePath() + "' not found!"); } - if (dst.exists()) if (dst.isDirectory()) // Directory? -> use source file + if (dst.exists()) + { + if (dst.isDirectory()) + { // name dst = new File(dst, src.getName()); + } else if (dst.isFile()) { if (!overwrite) + { throw new IllegalArgumentException("Destination file '" + dst.getAbsolutePath() + "' already exists!"); + } } else + { throw new IllegalArgumentException("Invalid destination object '" + dst.getAbsolutePath() + "'!"); + } + } File dstParent = dst.getParentFile(); if (!dstParent.exists()) - if (!dstParent.mkdirs()) throw new IOException("Failed to create directory " + dstParent.getAbsolutePath()); + { + if (!dstParent.mkdirs()) + { + throw new IOException("Failed to create directory " + dstParent.getAbsolutePath()); + } + } long fileSize = src.length(); if (fileSize > 20971520l) { // for larger files (20Mb) use streams @@ -115,10 +129,16 @@ public final class NIOUtil int doneCnt = -1, bufSize = 32768; byte buf[] = new byte[bufSize]; while ((doneCnt = in.read(buf, 0, bufSize)) >= 0) + { if (doneCnt == 0) + { Thread.yield(); + } else + { out.write(buf, 0, doneCnt); + } + } out.flush(); } finally diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java index d700869874..75813a90ae 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java @@ -244,8 +244,14 @@ public final class ZIPUtil { String path1 = getPath(f1, baseLength); String path2 = getPath(f2, baseLength); - if (path1.length() == 0) return ORDER_KEEP; - if (path2.length() == 0) return ORDER_SWAP; + if (path1.length() == 0) + { + return ORDER_KEEP; + } + if (path2.length() == 0) + { + return ORDER_SWAP; + } if (f1.isDirectory()) { diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java index 6531823aa6..06741dd2d8 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java @@ -100,7 +100,7 @@ public class RemoteTraceServer protected ServerSocket bind() throws IOException { - InetAddress addr = InetAddress.getByName(this.address); + InetAddress addr = InetAddress.getByName(address); return new ServerSocket(port, 5, addr); } @@ -374,13 +374,16 @@ public class RemoteTraceServer } StackTraceElement[] stackTrace = event.getStackTrace(); - if (stackTrace != null) for (StackTraceElement element : stackTrace) + if (stackTrace != null) { - stream.print(element.getClassName()); - stream.print("." + element.getMethodName()); - stream.print("(" + element.getFileName()); - stream.print(":" + element.getLineNumber()); - stream.println(")"); + for (StackTraceElement element : stackTrace) + { + stream.print(element.getClassName()); + stream.print("." + element.getMethodName()); + stream.print("(" + element.getFileName()); + stream.print(":" + element.getLineNumber()); + stream.println(")"); + } } stream.println(); diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/UnmodifiableRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/UnmodifiableRegistry.java index 86bc12aab1..a28c1c86c2 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/UnmodifiableRegistry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/UnmodifiableRegistry.java @@ -120,11 +120,13 @@ public class UnmodifiableRegistry<K, V> implements IRegistry<K, V> return delegate.values(); } + @Override public boolean equals(Object o) { return delegate.equals(o); } + @Override public int hashCode() { return delegate.hashCode(); 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 6eeee76010..30298d2151 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 @@ -37,11 +37,26 @@ public abstract class Negotiator<STATE extends Enum<?>, EVENT extends Enum<?>> e { super(stateEnum, eventEnum); - if (initialState == null) throw new IllegalStateException("initialState == null"); - if (successState == null) throw new IllegalStateException("successState == null"); - if (failureState == null) throw new IllegalStateException("failureState == null"); - if (startEvent == null) throw new IllegalStateException("startEvent == null"); - if (bufferEvent == null) throw new IllegalStateException("bufferEvent == null"); + if (initialState == null) + { + throw new IllegalStateException("initialState == null"); + } + if (successState == null) + { + throw new IllegalStateException("successState == null"); + } + if (failureState == null) + { + throw new IllegalStateException("failureState == null"); + } + if (startEvent == null) + { + throw new IllegalStateException("startEvent == null"); + } + if (bufferEvent == null) + { + throw new IllegalStateException("bufferEvent == null"); + } this.initialState = initialState; this.successState = successState; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java index ff166549ac..c90cb7ce0f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/ChannelInputStream.java @@ -41,6 +41,7 @@ public class ChannelInputStream extends BufferInputStream return channel; } + @Override public long getMillisBeforeTimeout() { return millisBeforeTimeout; @@ -51,6 +52,7 @@ public class ChannelInputStream extends BufferInputStream this.millisBeforeTimeout = millisBeforeTimeout; } + @Override public long getMillisInterruptCheck() { return millisInterruptCheck; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java index 74a7fcbc52..d79d645148 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java @@ -177,11 +177,11 @@ public abstract class Signal implements Runnable void setBufferInputStream(BufferInputStream inputStream) { - this.bufferInputStream = inputStream; + bufferInputStream = inputStream; } void setBufferOutputStream(BufferOutputStream outputStream) { - this.bufferOutputStream = outputStream; + bufferOutputStream = outputStream; } } |