summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-03-08 04:41:57 (EST)
committerEike Stepper2008-03-08 04:41:57 (EST)
commit894207384e3d614162e1cc05285a7ef334cb6524 (patch)
treeed10ea837330ce31d53867e7ca0b69febd19c25c
parentf564307ad6a51dd738b35ab7f98b423ce01d45bb (diff)
downloadcdo-894207384e3d614162e1cc05285a7ef334cb6524.zip
cdo-894207384e3d614162e1cc05285a7ef334cb6524.tar.gz
cdo-894207384e3d614162e1cc05285a7ef334cb6524.tar.bz2
[217117] Develop a HibernateStore
https://bugs.eclipse.org/bugs/show_bug.cgi?id=217117
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs60
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOIDHibernate.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java83
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreReader.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/id/CDOIDHibernateFactoryImpl.java38
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/id/CDOIDHibernateImpl.java332
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LongIDStore.java35
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java91
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/.classpath4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java43
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java49
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java352
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java39
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java137
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java97
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java204
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java161
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java260
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java69
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java105
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java35
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java31
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java24
53 files changed, 1411 insertions, 1219 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.classpath b/plugins/org.eclipse.emf.cdo.server.hibernate/.classpath
index dd30818..b6498f9 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.classpath
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs
index 4d8b40b..7b4d6a3 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Mar 01 09:16:16 CET 2008
+#Tue Mar 04 08:37:22 CET 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -10,8 +10,66 @@ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
index 9a786d4..461da4c 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/META-INF/MANIFEST.MF
@@ -11,11 +11,10 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
org.eclipse.emf.cdo.server;bundle-version="[0.8.0,0.9.0)";visibility:=reexport,
- org.eclipse.emf.cdo.server.hibernate.libraries;bundle-version="[0.8.0,0.9.0)"
+ org.eclipse.emf.cdo.server.hibernate.id;bundle-version="[0.8.0,0.9.0)";visibility:=reexport
Export-Package: org.eclipse.emf.cdo.server.hibernate,
org.eclipse.emf.cdo.server.internal.hibernate,
org.eclipse.emf.cdo.server.internal.hibernate.bundle,
- org.eclipse.emf.cdo.server.internal.hibernate.id,
org.eclipse.emf.cdo.server.internal.hibernate.info,
org.eclipse.emf.cdo.server.internal.hibernate.tuplizer
Eclipse-BuddyPolicy: dependent
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml b/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml
index fa29a77..fa269f2 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml
@@ -17,7 +17,6 @@
<plugin>
-
<extension
point="org.eclipse.emf.cdo.server.storeFactories">
<storeFactory
@@ -26,5 +25,4 @@
</storeFactory>
</extension>
-
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOIDHibernate.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOIDHibernate.java
deleted file mode 100644
index fd9cea4..0000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/hibernate/CDOIDHibernate.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany, and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- * Martin Taal - additional api
- **************************************************************************/
-package org.eclipse.emf.cdo.server.hibernate;
-
-import org.eclipse.emf.cdo.protocol.id.CDOIDObject;
-
-import java.io.Serializable;
-
-/**
- * @author Eike Stepper
- * @author Martin Taal
- */
-public interface CDOIDHibernate extends CDOIDObject
-{
-
- public Serializable getId();
-
- public void setId(Serializable id);
-
- public String getEntityName();
-
- public void setEntityName(String entityName);
-
- public void setContent(byte[] content);
-
- public byte[] getContent();
-
-}
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 9040e49..9268739 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
@@ -11,15 +11,18 @@
**************************************************************************/
package org.eclipse.emf.cdo.server.internal.hibernate;
+import org.eclipse.emf.cdo.internal.protocol.id.CDOIDLibraryDescriptorImpl;
import org.eclipse.emf.cdo.internal.server.Store;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryProvider;
import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory;
import org.eclipse.emf.cdo.protocol.model.CDOPackage;
import org.eclipse.emf.cdo.server.ISession;
import org.eclipse.emf.cdo.server.IView;
import org.eclipse.emf.cdo.server.hibernate.IHibernateMappingProvider;
import org.eclipse.emf.cdo.server.hibernate.IHibernateStore;
+import org.eclipse.emf.cdo.server.hibernate.internal.id.CDOIDHibernateFactoryImpl;
import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-import org.eclipse.emf.cdo.server.internal.hibernate.id.CDOIDHibernateFactoryImpl;
import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.WrappedException;
@@ -29,6 +32,8 @@ import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
import org.hibernate.tool.hbm2ddl.SchemaUpdate;
+import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -45,6 +50,8 @@ public class HibernateStore extends Store implements IHibernateStore
private static final CDOIDObjectFactory CDOID_OBJECT_FACTORY = new CDOIDHibernateFactoryImpl();
+ private static final IDLibraryHandler CDOID_LIBRARY_HANDLER = new IDLibraryHandler();
+
/**
* Used to give different extensions of Hibernate a context when initializing
*/
@@ -64,7 +71,7 @@ public class HibernateStore extends Store implements IHibernateStore
this.mappingProvider = mappingProvider;
packageHandler = new HibernatePackageHandler(this);
- if (mappingProvider != null)
+ if (TRACER.isEnabled() && mappingProvider != null)
{
TRACER.trace("With mappingProvider " + mappingProvider.getClass().getName());
}
@@ -119,6 +126,16 @@ public class HibernateStore extends Store implements IHibernateStore
return CDOID_OBJECT_FACTORY;
}
+ public CDOIDLibraryDescriptor getCDOIDLibraryDescriptor()
+ {
+ return CDOID_LIBRARY_HANDLER;
+ }
+
+ public CDOIDLibraryProvider getCDOIDLibraryProvider()
+ {
+ return CDOID_LIBRARY_HANDLER;
+ }
+
@Override
public HibernateStoreReader getReader(ISession session)
{
@@ -229,7 +246,10 @@ public class HibernateStore extends Store implements IHibernateStore
protected void initConfiguration()
{
- TRACER.trace("Initializing Configuration");
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("Initializing Configuration");
+ }
InputStream in = null;
@@ -244,10 +264,18 @@ public class HibernateStore extends Store implements IHibernateStore
if (cdoPackages.size() > 0)
{
- TRACER.trace("Mapping ecore to hibernate for CDOPackages:");
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("Mapping ecore to hibernate for CDOPackages:");
+ }
+
for (CDOPackage cdoPackage : cdoPackages)
{
- TRACER.trace("adding ecore for CDOPackage " + cdoPackage.getPackageURI());
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("adding ecore for CDOPackage " + cdoPackage.getPackageURI());
+ }
+
ecoreStrs.add(cdoPackage.getEcore());
}
// DISABLED to prevent teneo dependency
@@ -261,10 +289,17 @@ public class HibernateStore extends Store implements IHibernateStore
else
{
mapping = null;
- TRACER.trace("No CDOPackages found, ecore not mapped to hibernate");
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("No CDOPackages found, ecore not mapped to hibernate");
+ }
+ }
+
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("Adding resource.hbm.xml to configuration");
}
- TRACER.trace("Adding resource.hbm.xml to configuration");
in = OM.BUNDLE.getInputStream("mappings/resource.hbm.xml");
hibernateConfiguration.addInputStream(in);
if (mapping != null)
@@ -287,7 +322,11 @@ public class HibernateStore extends Store implements IHibernateStore
protected void initSchema()
{
- TRACER.trace("Updating db schema for HibernateStore");
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("Updating db schema for HibernateStore");
+ }
+
new SchemaUpdate(hibernateConfiguration).execute(true, true);
}
@@ -295,4 +334,32 @@ public class HibernateStore extends Store implements IHibernateStore
{
return currentHibernateStore.get();
}
+
+ /**
+ * @author Eike Stepper
+ */
+ private static final class IDLibraryHandler extends CDOIDLibraryDescriptorImpl implements CDOIDLibraryProvider
+ {
+ public IDLibraryHandler()
+ {
+ super(CDOIDHibernateFactoryImpl.class.getName(), null);
+ }
+
+ public InputStream getContents(String libraryName) throws IOException
+ {
+ File library = getFile(libraryName);
+ return IOUtil.openInputStream(library);
+ }
+
+ public int getSize(String libraryName)
+ {
+ File library = getFile(libraryName);
+ return (int)library.length();
+ }
+
+ private File getFile(String libraryName)
+ {
+ return null;
+ }
+ }
}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreReader.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreReader.java
index e8cc824..8858f53 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreReader.java
@@ -20,8 +20,8 @@ import org.eclipse.emf.cdo.protocol.model.resource.CDOResourceClass;
import org.eclipse.emf.cdo.protocol.revision.CDORevision;
import org.eclipse.emf.cdo.server.ISession;
import org.eclipse.emf.cdo.server.IView;
-import org.eclipse.emf.cdo.server.hibernate.CDOIDHibernate;
import org.eclipse.emf.cdo.server.hibernate.IHibernateStoreReader;
+import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
index 1c3b362..08de25c 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateUtil.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.protocol.id.CDOIDTemp;
import org.eclipse.emf.cdo.protocol.revision.CDORevision;
import org.eclipse.emf.cdo.server.IStore;
import org.eclipse.emf.cdo.server.IStoreWriter.CommitContext;
-import org.eclipse.emf.cdo.server.hibernate.CDOIDHibernate;
+import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
import org.hibernate.Session;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/id/CDOIDHibernateFactoryImpl.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/id/CDOIDHibernateFactoryImpl.java
deleted file mode 100644
index 4979004..0000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/id/CDOIDHibernateFactoryImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.id;
-
-import org.eclipse.emf.cdo.protocol.id.CDOIDObject;
-import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory;
-
-import org.eclipse.net4j.util.io.ExtendedDataInput;
-
-/**
- * @author Eike Stepper
- */
-public class CDOIDHibernateFactoryImpl implements CDOIDObjectFactory
-{
- private static final Class<?>[] CLASSES = CDOIDHibernateImpl.getClasses();
-
- public CDOIDHibernateFactoryImpl()
- {
- }
-
- public Class<?>[] getCDOIDObjectClasses()
- {
- return CLASSES;
- }
-
- public CDOIDObject createCDOIDObject(ExtendedDataInput in)
- {
- return new CDOIDHibernateImpl();
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/id/CDOIDHibernateImpl.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/id/CDOIDHibernateImpl.java
deleted file mode 100644
index 47cff7a..0000000
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/id/CDOIDHibernateImpl.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany, and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- * Martin Taal - added hibernate specifics
- **************************************************************************/
-package org.eclipse.emf.cdo.server.internal.hibernate.id;
-
-import org.eclipse.emf.cdo.internal.protocol.id.AbstractCDOID;
-import org.eclipse.emf.cdo.protocol.id.CDOIDObject;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-import org.eclipse.emf.cdo.server.hibernate.CDOIDHibernate;
-import org.eclipse.emf.cdo.server.internal.hibernate.bundle.OM;
-
-import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.ObjectUtil;
-import org.eclipse.net4j.util.WrappedException;
-import org.eclipse.net4j.util.io.ExtendedDataInput;
-import org.eclipse.net4j.util.io.ExtendedDataOutput;
-import org.eclipse.net4j.util.io.IOUtil;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.text.MessageFormat;
-
-/**
- * @author Eike Stepper
- * @author Martin Taal
- */
-public class CDOIDHibernateImpl extends AbstractCDOID implements CDOIDHibernate
-{
- private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, CDOIDHibernateImpl.class);
-
- private static final Class<?>[] CLASSES = { CDOIDHibernateImpl.class, Legacy.class, SerializableContent.class };
-
- private static final long serialVersionUID = 1L;
-
- private Serializable id;
-
- private String entityName;
-
- public CDOIDHibernateImpl()
- {
- }
-
- /**
- * @return the id
- */
- public Serializable getId()
- {
- return id;
- }
-
- /**
- * @param id
- * the id to set
- */
- public void setId(Serializable id)
- {
- this.id = id;
- }
-
- /**
- * @return the entityName
- */
- public String getEntityName()
- {
- return entityName;
- }
-
- /**
- * @param entityName
- * the entityName to set
- */
- public void setEntityName(String entityName)
- {
- this.entityName = entityName;
- }
-
- public Type getType()
- {
- return Type.OBJECT;
- }
-
- public CDOClassRef getClassRef()
- {
- return null;
- }
-
- public CDOIDObject asLegacy(CDOClassRef classRef)
- {
- return new Legacy(classRef);
- }
-
- public void read(ExtendedDataInput in) throws IOException
- {
- id = (Serializable)in.readObject();
- if (TRACER.isEnabled())
- {
- TRACER.format("Read id={0}", id);
- }
-
- entityName = in.readString();
- if (TRACER.isEnabled())
- {
- TRACER.format("Read entityName={0}", entityName);
- }
-
- // final byte[] content = in.readByteArray();
- // if (TRACER.isEnabled())
- // {
- // TRACER.format("Read content={0}", HexUtil.bytesToHex(content));
- // }
- //
- // setContent(content);
- }
-
- public void write(ExtendedDataOutput out) throws IOException
- {
- if (TRACER.isEnabled())
- {
- TRACER.format("Writing id={0}", id);
- }
-
- out.writeObject(id);
- if (TRACER.isEnabled())
- {
- TRACER.format("Writing entityName={0}", entityName);
- }
-
- out.writeString(entityName);
-
- // byte[] content = getContent();
- // if (TRACER.isEnabled())
- // {
- // TRACER.format("Writing content={0}", HexUtil.bytesToHex(content));
- // }
- //
- // out.writeByteArray(content);
- }
-
- public byte[] getContent()
- {
- ObjectOutputStream oos = null;
-
- try
- {
- final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- oos = new ObjectOutputStream(bos);
- SerializableContent content = null;
- content = new SerializableContent();
- content.setId(getId());
- content.setEntityName(getEntityName());
- oos.writeObject(content);
- return bos.toByteArray();
- }
- catch (Exception ex)
- {
- throw WrappedException.wrap(ex);
- }
- finally
- {
- IOUtil.close(oos);
- }
- }
-
- public void setContent(byte[] content)
- {
- ObjectInputStream ois = null;
-
- try
- {
- ois = new ObjectInputStream(new ByteArrayInputStream(content));
- final SerializableContent contentObject = (SerializableContent)ois.readObject();
- setId(contentObject.getId());
- setEntityName(contentObject.getEntityName());
- }
- catch (Exception ex)
- {
- throw WrappedException.wrap(ex);
- }
- finally
- {
- IOUtil.close(ois);
- }
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
-
- if (obj instanceof CDOIDHibernate)
- {
- return ObjectUtil.equals(id, ((CDOIDHibernate)obj).getId())
- && ObjectUtil.equals(entityName, ((CDOIDHibernate)obj).getEntityName());
- }
-
- return false;
- }
-
- @Override
- public int hashCode()
- {
- // TODO What about entityName?
- return id.hashCode();
- }
-
- @Override
- public String toString()
- {
- return MessageFormat.format("HBM-{0}-{1}", entityName, id);
- }
-
- public static Class<?>[] getClasses()
- {
- return CLASSES;
- }
-
- /**
- * Used for serialization
- *
- * @author Martin Taal
- */
- private static class SerializableContent implements Serializable
- {
- private static final long serialVersionUID = 1L;
-
- private Serializable id;
-
- private String entityName;
-
- /**
- * @return the id
- */
- public Serializable getId()
- {
- return id;
- }
-
- /**
- * @param id
- * the id to set
- */
- public void setId(Serializable id)
- {
- this.id = id;
- }
-
- /**
- * @return the entityName
- */
- public String getEntityName()
- {
- return entityName;
- }
-
- /**
- * @param entityName
- * the entityName to set
- */
- public void setEntityName(String entityName)
- {
- this.entityName = entityName;
- }
- }
-
- /**
- * @author Eike Stepper
- */
- public static final class Legacy extends CDOIDHibernateImpl
- {
- private static final long serialVersionUID = 1L;
-
- private CDOClassRef classRef;
-
- public Legacy()
- {
- }
-
- public Legacy(CDOClassRef classRef)
- {
- if (classRef == null)
- {
- throw new IllegalArgumentException("classRef == null");
- }
-
- this.classRef = classRef;
- }
-
- @Override
- public Type getType()
- {
- return Type.LEGACY_OBJECT;
- }
-
- @Override
- public CDOClassRef getClassRef()
- {
- return classRef;
- }
-
- public void setClassRef(CDOClassRef classRef)
- {
- this.classRef = classRef;
- }
-
- @Override
- public Legacy asLegacy(CDOClassRef classRef)
- {
- return this;
- }
-
- @Override
- public String toString()
- {
- return super.toString() + "(" + classRef + ")";
- }
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java
index 483af53..37af54f 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertyGetter.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.server.hibernate.CDOIDHibernate;
+import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
import org.hibernate.HibernateException;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java
index 67cb4a5..a754b61 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDPropertySetter.java
@@ -14,9 +14,9 @@ import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
import org.eclipse.emf.cdo.protocol.id.CDOID;
import org.eclipse.emf.cdo.protocol.id.CDOIDTemp;
import org.eclipse.emf.cdo.server.IStoreWriter.CommitContext;
-import org.eclipse.emf.cdo.server.hibernate.CDOIDHibernate;
+import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
+import org.eclipse.emf.cdo.server.hibernate.internal.id.CDOIDHibernateImpl;
import org.eclipse.emf.cdo.server.internal.hibernate.HibernateThreadContext;
-import org.eclipse.emf.cdo.server.internal.hibernate.id.CDOIDHibernateImpl;
import org.hibernate.HibernateException;
import org.hibernate.engine.SessionFactoryImplementor;
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
index 5d79667..75e6ef8 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDOIDUserType.java
@@ -13,9 +13,9 @@ package org.eclipse.emf.cdo.server.internal.hibernate.tuplizer;
import org.eclipse.emf.cdo.protocol.id.CDOID;
import org.eclipse.emf.cdo.protocol.id.CDOIDTemp;
import org.eclipse.emf.cdo.protocol.revision.CDORevision;
-import org.eclipse.emf.cdo.server.hibernate.CDOIDHibernate;
+import org.eclipse.emf.cdo.server.hibernate.id.CDOIDHibernate;
+import org.eclipse.emf.cdo.server.hibernate.internal.id.CDOIDHibernateImpl;
import org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil;
-import org.eclipse.emf.cdo.server.internal.hibernate.id.CDOIDHibernateImpl;
import org.hibernate.Hibernate;
import org.hibernate.usertype.UserType;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LongIDStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LongIDStore.java
index 6fbe661..0caf209 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LongIDStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/LongIDStore.java
@@ -10,8 +10,10 @@
**************************************************************************/
package org.eclipse.emf.cdo.internal.server;
-import org.eclipse.emf.cdo.internal.protocol.id.CDOIDObjectFactoryImpl;
+import org.eclipse.emf.cdo.internal.protocol.id.CDOIDLongFactoryImpl;
import org.eclipse.emf.cdo.protocol.id.CDOID;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryProvider;
import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory;
import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
@@ -22,7 +24,7 @@ public abstract class LongIDStore extends Store
{
protected static final long CRASHED = -1L;
- private static final CDOIDObjectFactory CDOID_OBJECT_FACTORY = new CDOIDObjectFactoryImpl();
+ private static final CDOIDLongFactoryImpl CDOID_OBJECT_FACTORY = new CDOIDLongFactoryImpl();
private transient long lastObjectID;
@@ -55,4 +57,33 @@ public abstract class LongIDStore extends Store
{
return CDOID_OBJECT_FACTORY;
}
+
+ public CDOIDLibraryDescriptor getCDOIDLibraryDescriptor()
+ {
+ return CDOID_OBJECT_FACTORY.getLibraryHandler();
+ }
+
+ public CDOIDLibraryProvider getCDOIDLibraryProvider()
+ {
+ return CDOID_OBJECT_FACTORY.getLibraryHandler();
+ }
+
+ public boolean hasAuditingSupport()
+ {
+ return false;
+ }
+
+ public boolean hasBranchingSupport()
+ {
+ return false;
+ }
+
+ public boolean hasWriteDeltaSupport()
+ {
+ return false;
+ }
+
+ public void repairAfterCrash()
+ {
+ }
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java
new file mode 100644
index 0000000..480c3ba
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java
@@ -0,0 +1,91 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.internal.server.protocol;
+
+import org.eclipse.emf.cdo.internal.server.bundle.OM;
+import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryProvider;
+
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.IOUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author Eike Stepper
+ */
+public class LoadLibrariesIndication extends CDOServerIndication
+{
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, LoadLibrariesIndication.class);
+
+ private String[] libraryNames;
+
+ public LoadLibrariesIndication()
+ {
+ }
+
+ @Override
+ protected short getSignalID()
+ {
+ return CDOProtocolConstants.SIGNAL_LOAD_LIBRARIES;
+ }
+
+ @Override
+ protected void indicating(ExtendedDataInputStream in) throws IOException
+ {
+ int size = in.readInt();
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Reading {0} library names", size);
+ }
+
+ libraryNames = new String[size];
+ for (int i = 0; i < size; i++)
+ {
+ libraryNames[i] = in.readString();
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Read library name: {0}", libraryNames[i]);
+ }
+ }
+ }
+
+ @Override
+ protected void responding(ExtendedDataOutputStream out) throws IOException
+ {
+ byte[] buffer = new byte[IOUtil.DEFAULT_BUFFER_SIZE];
+ CDOIDLibraryProvider libraryProvider = getStore().getCDOIDLibraryProvider();
+ for (String libraryName : libraryNames)
+ {
+ int size = libraryProvider.getSize(libraryName);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing library {0}: {1} bytes", libraryName, size);
+ }
+
+ out.writeInt(size);
+ InputStream in = null;
+
+ try
+ {
+ in = libraryProvider.getContents(libraryName);
+ IOUtil.copy(in, out, size, buffer);
+ }
+ finally
+ {
+ IOUtil.close(in);
+ }
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
index 4cb625d..3e13c52 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
@@ -10,14 +10,12 @@
**************************************************************************/
package org.eclipse.emf.cdo.internal.server.protocol;
-import org.eclipse.emf.cdo.internal.protocol.id.CDOIDObjectFactoryImpl;
import org.eclipse.emf.cdo.internal.server.PackageManager;
import org.eclipse.emf.cdo.internal.server.Repository;
import org.eclipse.emf.cdo.internal.server.Session;
import org.eclipse.emf.cdo.internal.server.SessionManager;
import org.eclipse.emf.cdo.internal.server.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
-import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory;
import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
import org.eclipse.emf.cdo.protocol.model.CDOPackage;
import org.eclipse.emf.cdo.server.IRepository;
@@ -84,8 +82,8 @@ public class OpenSessionIndication extends IndicationWithResponse
writeSessionID(out, session);
writeRepositoryUUID(out, repository);
+ repository.getStore().getCDOIDLibraryDescriptor().write(out);
writePackageURIs(out, repository.getPackageManager());
- writeCDOIDObjectFactory(out, repository.getStore().getCDOIDObjectFactory());
}
catch (RepositoryNotFoundException ex)
{
@@ -163,37 +161,4 @@ public class OpenSessionIndication extends IndicationWithResponse
out.writeString(null);
}
-
- private void writeCDOIDObjectFactory(ExtendedDataOutputStream out, CDOIDObjectFactory factory) throws IOException
- {
- if (factory.getClass() == CDOIDObjectFactoryImpl.class)
- {
- out.writeInt(0);
- }
- else
- {
- Class<?>[] classes = factory.getCDOIDObjectClasses();
- if (classes == null)
- {
- classes = new Class<?>[0];
- }
-
- out.writeInt(1 + classes.length);
- serializeClass(out, factory.getClass());
- for (Class<?> c : classes)
- {
- serializeClass(out, c);
- }
- }
- }
-
- private void serializeClass(ExtendedDataOutputStream out, Class<?> c) throws IOException
- {
- if (PROTOCOL.isEnabled())
- {
- PROTOCOL.format("Serializing class " + c.getName());
- }
-
- out.writeObject(c);
- }
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
index 3dae83d..9e3e091 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java
@@ -10,6 +10,8 @@
**************************************************************************/
package org.eclipse.emf.cdo.server;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryProvider;
import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory;
import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta;
@@ -24,6 +26,10 @@ public interface IStore extends IRepositoryElement
public CDOIDObjectFactory getCDOIDObjectFactory();
+ public CDOIDLibraryDescriptor getCDOIDLibraryDescriptor();
+
+ public CDOIDLibraryProvider getCDOIDLibraryProvider();
+
/**
* Returns if this store supports the writing of modified newRevisions in terms of deltas.
* <p>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.classpath b/plugins/org.eclipse.emf.cdo.tests.hibernate/.classpath
index 508427d..e4b5ecf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.classpath
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.5-bin.jar" sourcepath="org.eclipse.emf.cdo.tests.hibernatesrc.zip"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs
index 216a4f1..b43dac7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Mon Mar 03 09:36:31 CET 2008
+#Tue Mar 04 08:39:56 CET 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
index 59cedab..bedbefe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Bundle-ClassPath: .,
lib/mysql-connector-java-5.1.5-bin.jar
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
org.eclipse.net4j.tcp;bundle-version="[0.8.0,0.9.0)",
- org.eclipse.emf.cdo.server.hibernate.libraries;bundle-version="0.8.0",
org.eclipse.emf.cdo.server.hibernate;bundle-version="[0.8.0,0.9.0)"
Export-Package: com.mysql.jdbc,
com.mysql.jdbc.exceptions,
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
index b091285..0fbc257 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mango; singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
index 72710b1..e70ef30 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
@@ -10,16 +10,15 @@ import org.eclipse.emf.cdo.CDOObject;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Address</b></em>'. <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress()
* @model
* @extends CDOObject
@@ -28,13 +27,13 @@ import org.eclipse.emf.cdo.CDOObject;
public interface Address extends CDOObject
{
/**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_Name()
@@ -55,13 +54,13 @@ public interface Address extends CDOObject
void setName(String value);
/**
- * Returns the value of the '<em><b>Street</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Street</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Street</em>' attribute.
* @see #setStreet(String)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_Street()
@@ -73,20 +72,22 @@ public interface Address extends CDOObject
/**
* Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Street</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>Street</em>' attribute.
* @see #getStreet()
* @generated
*/
void setStreet(String value);
/**
- * Returns the value of the '<em><b>City</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>City</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>City</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>City</em>' attribute.
* @see #setCity(String)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_City()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
index 7713929..2e80c87 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
@@ -12,16 +12,15 @@ import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory()
* @model
* @extends CDOObject
@@ -30,13 +29,13 @@ import org.eclipse.emf.common.util.EList;
public interface Category extends CDOObject
{
/**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Name()
@@ -57,14 +56,14 @@ public interface Category extends CDOObject
void setName(String value);
/**
- * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Category}.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Categories</b></em>' containment reference list. The list contents are of
+ * type {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more
* of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Categories</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Categories()
* @model containment="true"
@@ -73,14 +72,14 @@ public interface Category extends CDOObject
EList<Category> getCategories();
/**
- * Returns the value of the '<em><b>Products</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Product}.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Products</b></em>' containment reference list. The list contents are of type
+ * {@link org.eclipse.emf.cdo.tests.model1.Product}. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Products</em>' containment reference list isn't clear, there really should be more
* of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Products</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Products()
* @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
index 4b48bf8..eb4c433 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
@@ -10,18 +10,17 @@ import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Company</b></em>'. <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany()
* @model
* @generated
@@ -29,14 +28,14 @@ import org.eclipse.emf.common.util.EList;
public interface Company extends Address
{
/**
- * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Category}.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Categories</b></em>' containment reference list. The list contents are of
+ * type {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more
* of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Categories</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Categories()
* @model containment="true"
@@ -45,14 +44,14 @@ public interface Company extends Address
EList<Category> getCategories();
/**
- * Returns the value of the '<em><b>Suppliers</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Supplier}.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Suppliers</b></em>' containment reference list. The list contents are of type
+ * {@link org.eclipse.emf.cdo.tests.model1.Supplier}. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Suppliers</em>' containment reference list isn't clear, there really should be more
* of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Suppliers</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Suppliers()
* @model containment="true"
@@ -61,14 +60,14 @@ public interface Company extends Address
EList<Supplier> getSuppliers();
/**
- * Returns the value of the '<em><b>Purchase Orders</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Purchase Orders</b></em>' containment reference list. The list contents are
+ * of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Purchase Orders</em>' containment reference list isn't clear, there really should be
* more of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Purchase Orders</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_PurchaseOrders()
* @model containment="true"
@@ -77,14 +76,14 @@ public interface Company extends Address
EList<PurchaseOrder> getPurchaseOrders();
/**
- * Returns the value of the '<em><b>Customers</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Customer}.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Customers</b></em>' containment reference list. The list contents are of type
+ * {@link org.eclipse.emf.cdo.tests.model1.Customer}. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Customers</em>' containment reference list isn't clear, there really should be more
* of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Customers</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Customers()
* @model containment="true"
@@ -93,14 +92,14 @@ public interface Company extends Address
EList<Customer> getCustomers();
/**
- * Returns the value of the '<em><b>Sales Orders</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Sales Orders</b></em>' containment reference list. The list contents are of
+ * type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Sales Orders</em>' containment reference list isn't clear, there really should be
* more of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Sales Orders</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_SalesOrders()
* @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
index 3d7ffe2..c306e00 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
@@ -10,14 +10,13 @@ import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Customer</b></em>'. <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer()
* @model
* @generated
@@ -25,15 +24,15 @@ import org.eclipse.emf.common.util.EList;
public interface Customer extends Address
{
/**
- * Returns the value of the '<em><b>Sales Orders</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'.
+ * Returns the value of the '<em><b>Sales Orders</b></em>' reference list. The list contents are of type
+ * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Sales Orders</em>' reference list isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Sales Orders</em>' reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer_SalesOrders()
* @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java
index aced551..686ca83 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java
@@ -11,101 +11,102 @@ import org.eclipse.emf.ecore.EFactory;
/**
* <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
* the model. <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package
* @generated
*/
public interface Model1Factory extends EFactory
{
/**
- * The singleton instance of the factory.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1FactoryImpl.init();
/**
- * Returns a new object of class '<em>Address</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Address</em>'.
* @generated
*/
Address createAddress();
/**
- * Returns a new object of class '<em>Supplier</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Supplier</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Supplier</em>'.
* @generated
*/
Supplier createSupplier();
/**
- * Returns a new object of class '<em>Purchase Order</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Purchase Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Purchase Order</em>'.
* @generated
*/
PurchaseOrder createPurchaseOrder();
/**
- * Returns a new object of class '<em>Order Detail</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Order Detail</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Order Detail</em>'.
* @generated
*/
OrderDetail createOrderDetail();
/**
- * Returns a new object of class '<em>Product</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Product</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Product</em>'.
* @generated
*/
Product createProduct();
/**
- * Returns a new object of class '<em>Category</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Category</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Category</em>'.
* @generated
*/
Category createCategory();
/**
- * Returns a new object of class '<em>Company</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Company</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Company</em>'.
* @generated
*/
Company createCompany();
/**
- * Returns a new object of class '<em>Customer</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Customer</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Customer</em>'.
* @generated
*/
Customer createCustomer();
/**
- * Returns a new object of class '<em>Order</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Order</em>'.
* @generated
*/
Order createOrder();
/**
- * Returns a new object of class '<em>Sales Order</em>'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns a new object of class '<em>Sales Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return a new object of class '<em>Sales Order</em>'.
* @generated
*/
SalesOrder createSalesOrder();
/**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the package supported by this factory.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
index 7ab5018..4683ac0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Factory
* @model kind="package"
* @generated
@@ -28,29 +29,29 @@ import org.eclipse.emf.ecore.EReference;
public interface Model1Package extends EPackage
{
/**
- * The package name.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
String eNAME = "model1";
/**
- * The package namespace URI.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model1/1.0.0";
/**
- * The package namespace name.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
String eNS_PREFIX = "model1";
/**
- * The singleton instance of the package.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl.init();
@@ -58,6 +59,7 @@ public interface Model1Package extends EPackage
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.AddressImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getAddress()
* @generated
@@ -65,24 +67,24 @@ public interface Model1Package extends EPackage
int ADDRESS = 0;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int ADDRESS__NAME = 0;
/**
- * The feature id for the '<em><b>Street</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int ADDRESS__STREET = 1;
/**
- * The feature id for the '<em><b>City</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -100,6 +102,7 @@ public interface Model1Package extends EPackage
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier()
* @generated
@@ -107,8 +110,9 @@ public interface Model1Package extends EPackage
int SUPPLIER = 2;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder()
* @generated
@@ -116,8 +120,9 @@ public interface Model1Package extends EPackage
int PURCHASE_ORDER = 6;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail()
* @generated
@@ -127,6 +132,7 @@ public interface Model1Package extends EPackage
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl <em>Product</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.ProductImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct()
* @generated
@@ -146,6 +152,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Name</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Address#getName()
* @see #getAddress()
@@ -156,6 +163,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Street</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Address#getStreet()
* @see #getAddress()
@@ -166,6 +174,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>City</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Address#getCity()
* @see #getAddress()
@@ -176,6 +185,7 @@ public interface Model1Package extends EPackage
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory()
* @generated
@@ -185,6 +195,7 @@ public interface Model1Package extends EPackage
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCompany()
* @generated
@@ -192,69 +203,69 @@ public interface Model1Package extends EPackage
int COMPANY = 1;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int COMPANY__NAME = ADDRESS__NAME;
/**
- * The feature id for the '<em><b>Street</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int COMPANY__STREET = ADDRESS__STREET;
/**
- * The feature id for the '<em><b>City</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int COMPANY__CITY = ADDRESS__CITY;
/**
- * The feature id for the '<em><b>Categories</b></em>' containment reference list.
- * <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
int COMPANY__CATEGORIES = ADDRESS_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Suppliers</b></em>' containment reference list.
- * <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Suppliers</b></em>' containment reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
int COMPANY__SUPPLIERS = ADDRESS_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Customers</b></em>' containment reference list.
- * <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Customers</b></em>' containment reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
int COMPANY__CUSTOMERS = ADDRESS_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int COMPANY__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list.
- * <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -270,33 +281,33 @@ public interface Model1Package extends EPackage
int COMPANY_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int SUPPLIER__NAME = ADDRESS__NAME;
/**
- * The feature id for the '<em><b>Street</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int SUPPLIER__STREET = ADDRESS__STREET;
/**
- * The feature id for the '<em><b>City</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int SUPPLIER__CITY = ADDRESS__CITY;
/**
- * The feature id for the '<em><b>Purchase Orders</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -314,6 +325,7 @@ public interface Model1Package extends EPackage
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer()
* @generated
@@ -321,33 +333,33 @@ public interface Model1Package extends EPackage
int CUSTOMER = 3;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int CUSTOMER__NAME = ADDRESS__NAME;
/**
- * The feature id for the '<em><b>Street</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int CUSTOMER__STREET = ADDRESS__STREET;
/**
- * The feature id for the '<em><b>City</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int CUSTOMER__CITY = ADDRESS__CITY;
/**
- * The feature id for the '<em><b>Sales Orders</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Sales Orders</b></em>' reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -373,17 +385,17 @@ public interface Model1Package extends EPackage
int ORDER = 4;
/**
- * The feature id for the '<em><b>Order Details</b></em>' containment reference list.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int ORDER__ORDER_DETAILS = 0;
/**
- * The number of structural features of the '<em>Order</em>' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The number of structural features of the '<em>Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -399,67 +411,68 @@ public interface Model1Package extends EPackage
int ORDER_DETAIL__ORDER = 0;
/**
- * The feature id for the '<em><b>Product</b></em>' reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int ORDER_DETAIL__PRODUCT = 1;
/**
- * The feature id for the '<em><b>Price</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int ORDER_DETAIL__PRICE = 2;
/**
- * The number of structural features of the '<em>Order Detail</em>' class.
- * <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>Order Detail</em>' class. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
int ORDER_DETAIL_FEATURE_COUNT = 3;
/**
- * The feature id for the '<em><b>Order Details</b></em>' containment reference list.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int PURCHASE_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS;
/**
- * The feature id for the '<em><b>Date</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int PURCHASE_ORDER__DATE = ORDER_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Supplier</b></em>' reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int PURCHASE_ORDER__SUPPLIER = ORDER_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Purchase Order</em>' class.
- * <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>Purchase Order</em>' class. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
int PURCHASE_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder()
* @generated
@@ -467,60 +480,60 @@ public interface Model1Package extends EPackage
int SALES_ORDER = 7;
/**
- * The feature id for the '<em><b>Order Details</b></em>' containment reference list.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int SALES_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS;
/**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int SALES_ORDER__ID = ORDER_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Customer</b></em>' reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Customer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int SALES_ORDER__CUSTOMER = ORDER_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Sales Order</em>' class.
- * <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>Sales Order</em>' class. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int CATEGORY__NAME = 0;
/**
- * The feature id for the '<em><b>Categories</b></em>' containment reference list.
- * <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
int CATEGORY__CATEGORIES = 1;
/**
- * The feature id for the '<em><b>Products</b></em>' containment reference list.
- * <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Products</b></em>' containment reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -536,26 +549,25 @@ public interface Model1Package extends EPackage
int CATEGORY_FEATURE_COUNT = 3;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int PRODUCT__NAME = 0;
/**
- * The feature id for the '<em><b>Order Details</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Order Details</b></em>' reference list. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
* @ordered
*/
int PRODUCT__ORDER_DETAILS = 1;
/**
- * The feature id for the '<em><b>Vat</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The feature id for the '<em><b>Vat</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -571,9 +583,9 @@ public interface Model1Package extends EPackage
int PRODUCT_FEATURE_COUNT = 3;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.VAT
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getVAT()
* @generated
@@ -593,6 +605,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the reference list '<em>Purchase Orders</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders()
* @see #getSupplier()
@@ -603,6 +616,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder <em>Purchase Order</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Purchase Order</em>'.
* @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder
* @generated
@@ -612,6 +626,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Date</em>'.
* @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate()
* @see #getPurchaseOrder()
@@ -622,6 +637,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the reference '<em>Supplier</em>'.
* @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier()
* @see #getPurchaseOrder()
@@ -632,6 +648,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail <em>Order Detail</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Order Detail</em>'.
* @see org.eclipse.emf.cdo.tests.model1.OrderDetail
* @generated
@@ -641,6 +658,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the container reference '<em>Order</em>'.
* @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder()
* @see #getOrderDetail()
@@ -651,6 +669,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the reference '<em>Product</em>'.
* @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct()
* @see #getOrderDetail()
@@ -661,6 +680,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Price</em>'.
* @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice()
* @see #getOrderDetail()
@@ -681,6 +701,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product#getName <em>Name</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Name</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Product#getName()
* @see #getProduct()
@@ -691,6 +712,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the reference list '<em>Order Details</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails()
* @see #getProduct()
@@ -700,8 +722,8 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product#getVat <em>Vat</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Vat</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Product#getVat()
* @see #getProduct()
@@ -710,9 +732,9 @@ public interface Model1Package extends EPackage
EAttribute getProduct_Vat();
/**
- * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}'. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @return the meta object for enum '<em>VAT</em>'.
* @see org.eclipse.emf.cdo.tests.model1.VAT
* @generated
@@ -732,6 +754,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Name</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Category#getName()
* @see #getCategory()
@@ -742,6 +765,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the containment reference list '<em>Categories</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Category#getCategories()
* @see #getCategory()
@@ -752,6 +776,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the containment reference list '<em>Products</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Category#getProducts()
* @see #getCategory()
@@ -772,6 +797,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the containment reference list '<em>Categories</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Company#getCategories()
* @see #getCompany()
@@ -782,6 +808,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the containment reference list '<em>Suppliers</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Company#getSuppliers()
* @see #getCompany()
@@ -792,6 +819,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the containment reference list '<em>Purchase Orders</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders()
* @see #getCompany()
@@ -802,6 +830,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the containment reference list '<em>Customers</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Company#getCustomers()
* @see #getCompany()
@@ -812,6 +841,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the containment reference list '<em>Sales Orders</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders()
* @see #getCompany()
@@ -832,6 +862,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the reference list '<em>Sales Orders</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders()
* @see #getCustomer()
@@ -852,6 +883,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the containment reference list '<em>Order Details</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails()
* @see #getOrder()
@@ -862,6 +894,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder <em>Sales Order</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Sales Order</em>'.
* @see org.eclipse.emf.cdo.tests.model1.SalesOrder
* @generated
@@ -871,6 +904,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the attribute '<em>Id</em>'.
* @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getId()
* @see #getSalesOrder()
@@ -881,6 +915,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for the reference '<em>Customer</em>'.
* @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer()
* @see #getSalesOrder()
@@ -889,8 +924,8 @@ public interface Model1Package extends EPackage
EReference getSalesOrder_Customer();
/**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the factory that creates the instances of the model.
* @generated
*/
@@ -905,13 +940,15 @@ public interface Model1Package extends EPackage
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ *
* @generated
*/
interface Literals
{
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.AddressImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getAddress()
* @generated
@@ -919,32 +956,33 @@ public interface Model1Package extends EPackage
EClass ADDRESS = eINSTANCE.getAddress();
/**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EAttribute ADDRESS__NAME = eINSTANCE.getAddress_Name();
/**
- * The meta object literal for the '<em><b>Street</b></em>' attribute feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Street</b></em>' attribute feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street();
/**
- * The meta object literal for the '<em><b>City</b></em>' attribute feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>City</b></em>' attribute feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EAttribute ADDRESS__CITY = eINSTANCE.getAddress_City();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier()
* @generated
@@ -960,8 +998,9 @@ public interface Model1Package extends EPackage
EReference SUPPLIER__PURCHASE_ORDERS = eINSTANCE.getSupplier_PurchaseOrders();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder()
* @generated
@@ -969,24 +1008,25 @@ public interface Model1Package extends EPackage
EClass PURCHASE_ORDER = eINSTANCE.getPurchaseOrder();
/**
- * The meta object literal for the '<em><b>Date</b></em>' attribute feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Date</b></em>' attribute feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EAttribute PURCHASE_ORDER__DATE = eINSTANCE.getPurchaseOrder_Date();
/**
- * The meta object literal for the '<em><b>Supplier</b></em>' reference feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Supplier</b></em>' reference feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EReference PURCHASE_ORDER__SUPPLIER = eINSTANCE.getPurchaseOrder_Supplier();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail()
* @generated
@@ -994,32 +1034,33 @@ public interface Model1Package extends EPackage
EClass ORDER_DETAIL = eINSTANCE.getOrderDetail();
/**
- * The meta object literal for the '<em><b>Order</b></em>' container reference feature.
- * <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Order</b></em>' container reference feature. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order();
/**
- * The meta object literal for the '<em><b>Product</b></em>' reference feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EReference ORDER_DETAIL__PRODUCT = eINSTANCE.getOrderDetail_Product();
/**
- * The meta object literal for the '<em><b>Price</b></em>' attribute feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EAttribute ORDER_DETAIL__PRICE = eINSTANCE.getOrderDetail_Price();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl <em>Product</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl <em>Product</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.ProductImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct()
* @generated
@@ -1027,33 +1068,33 @@ public interface Model1Package extends EPackage
EClass PRODUCT = eINSTANCE.getProduct();
/**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EAttribute PRODUCT__NAME = eINSTANCE.getProduct_Name();
/**
- * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature.
- * <!-- begin-user-doc
+ * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature. <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
EReference PRODUCT__ORDER_DETAILS = eINSTANCE.getProduct_OrderDetails();
/**
- * The meta object literal for the '<em><b>Vat</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The meta object literal for the '<em><b>Vat</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
EAttribute PRODUCT__VAT = eINSTANCE.getProduct_Vat();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.VAT
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getVAT()
* @generated
@@ -1061,8 +1102,9 @@ public interface Model1Package extends EPackage
EEnum VAT = eINSTANCE.getVAT();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory()
* @generated
@@ -1070,9 +1112,9 @@ public interface Model1Package extends EPackage
EClass CATEGORY = eINSTANCE.getCategory();
/**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name();
@@ -1094,8 +1136,9 @@ public interface Model1Package extends EPackage
EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCompany()
* @generated
@@ -1143,8 +1186,9 @@ public interface Model1Package extends EPackage
EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer()
* @generated
@@ -1152,9 +1196,9 @@ public interface Model1Package extends EPackage
EClass CUSTOMER = eINSTANCE.getCustomer();
/**
- * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature.
- * <!-- begin-user-doc
+ * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature. <!-- begin-user-doc
* --> <!-- end-user-doc -->
+ *
* @generated
*/
EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders();
@@ -1162,6 +1206,7 @@ public interface Model1Package extends EPackage
/**
* The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.OrderImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrder()
* @generated
@@ -1177,8 +1222,9 @@ public interface Model1Package extends EPackage
EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl
* @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder()
* @generated
@@ -1186,17 +1232,17 @@ public interface Model1Package extends EPackage
EClass SALES_ORDER = eINSTANCE.getSalesOrder();
/**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Id</b></em>' attribute feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id();
/**
- * The meta object literal for the '<em><b>Customer</b></em>' reference feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Customer</b></em>' reference feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EReference SALES_ORDER__CUSTOMER = eINSTANCE.getSalesOrder_Customer();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
index 94b5143..eb83edc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
@@ -12,14 +12,13 @@ import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder()
* @model
* @extends CDOObject
@@ -28,15 +27,15 @@ import org.eclipse.emf.common.util.EList;
public interface Order extends CDOObject
{
/**
- * Returns the value of the '<em><b>Order Details</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'.
+ * Returns the value of the '<em><b>Order Details</b></em>' containment reference list. The list contents are of
+ * type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Order Details</em>' containment reference list isn't clear, there really should be
* more of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Order Details</em>' containment reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder_OrderDetails()
* @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
index 9f37f22..726d9b3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
@@ -28,14 +28,14 @@ import org.eclipse.emf.cdo.CDOObject;
public interface OrderDetail extends CDOObject
{
/**
- * Returns the value of the '<em><b>Order</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'.
+ * Returns the value of the '<em><b>Order</b></em>' container reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Order</em>' container reference isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Order</em>' container reference.
* @see #setOrder(Order)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Order()
@@ -46,23 +46,25 @@ public interface OrderDetail extends CDOObject
Order getOrder();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}' container reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Order</em>' container reference.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}' container
+ * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Order</em>' container reference.
* @see #getOrder()
* @generated
*/
void setOrder(Order value);
/**
- * Returns the value of the '<em><b>Product</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}'.
+ * Returns the value of the '<em><b>Product</b></em>' reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Product</em>' reference isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Product</em>' reference.
* @see #setProduct(Product)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Product()
@@ -73,22 +75,24 @@ public interface OrderDetail extends CDOObject
Product getProduct();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}' reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Product</em>' reference.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'
+ * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Product</em>' reference.
* @see #getProduct()
* @generated
*/
void setProduct(Product value);
/**
- * Returns the value of the '<em><b>Price</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Price</em>' attribute.
* @see #setPrice(float)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Price()
@@ -100,7 +104,9 @@ public interface OrderDetail extends CDOObject
/**
* Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Price</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>Price</em>' attribute.
* @see #getPrice()
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java
index 6fd2aba..a0df4a8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java
@@ -12,16 +12,15 @@ import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Product</b></em>'. <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getVat <em>Vat</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getVat <em>Vat</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct()
* @model
* @extends CDOObject
@@ -30,13 +29,13 @@ import org.eclipse.emf.common.util.EList;
public interface Product extends CDOObject
{
/**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct_Name()
@@ -57,15 +56,15 @@ public interface Product extends CDOObject
void setName(String value);
/**
- * Returns the value of the '<em><b>Order Details</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'.
+ * Returns the value of the '<em><b>Order Details</b></em>' reference list. The list contents are of type
+ * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Order Details</em>' reference list isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Order Details</em>' reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct_OrderDetails()
* @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct
@@ -75,15 +74,14 @@ public interface Product extends CDOObject
EList<OrderDetail> getOrderDetails();
/**
- * Returns the value of the '<em><b>Vat</b></em>' attribute.
- * The default value is <code>"vat15"</code>.
- * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.model1.VAT}.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Vat</b></em>' attribute. The default value is <code>"vat15"</code>. The
+ * literals are from the enumeration {@link org.eclipse.emf.cdo.tests.model1.VAT}. <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Vat</em>' attribute isn't clear,
- * there really should be more of a description here...
+ * If the meaning of the '<em>Vat</em>' attribute isn't clear, there really should be more of a description
+ * here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Vat</em>' attribute.
* @see org.eclipse.emf.cdo.tests.model1.VAT
* @see #setVat(VAT)
@@ -94,10 +92,11 @@ public interface Product extends CDOObject
VAT getVat();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product#getVat <em>Vat</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Vat</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product#getVat <em>Vat</em>}' attribute. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Vat</em>' attribute.
* @see org.eclipse.emf.cdo.tests.model1.VAT
* @see #getVat()
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
index 73d0523..7997455 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
@@ -26,13 +26,13 @@ import java.util.Date;
public interface PurchaseOrder extends Order
{
/**
- * Returns the value of the '<em><b>Date</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Date</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Date</em>' attribute.
* @see #setDate(Date)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Date()
@@ -44,21 +44,23 @@ public interface PurchaseOrder extends Order
/**
* Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Date</em>' attribute.
+ *
+ * @param value
+ * the new value of the '<em>Date</em>' attribute.
* @see #getDate()
* @generated
*/
void setDate(Date value);
/**
- * Returns the value of the '<em><b>Supplier</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'.
+ * Returns the value of the '<em><b>Supplier</b></em>' reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Supplier</em>' reference isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Supplier</em>' reference.
* @see #setSupplier(Supplier)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Supplier()
@@ -69,9 +71,11 @@ public interface PurchaseOrder extends Order
Supplier getSupplier();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}' reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Supplier</em>' reference.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'
+ * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Supplier</em>' reference.
* @see #getSupplier()
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
index 7975cc0..7ecf63a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
@@ -24,12 +24,12 @@ package org.eclipse.emf.cdo.tests.model1;
public interface SalesOrder extends Order
{
/**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Id</em>' attribute.
* @see #setId(int)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Id()
@@ -50,14 +50,14 @@ public interface SalesOrder extends Order
void setId(int value);
/**
- * Returns the value of the '<em><b>Customer</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'.
+ * Returns the value of the '<em><b>Customer</b></em>' reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Customer</em>' reference isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Customer</em>' reference.
* @see #setCustomer(Customer)
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Customer()
@@ -68,9 +68,11 @@ public interface SalesOrder extends Order
Customer getCustomer();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}' reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Customer</em>' reference.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'
+ * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Customer</em>' reference.
* @see #getCustomer()
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
index 93a2989..21fda2e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
@@ -10,14 +10,13 @@ import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Supplier</b></em>'. <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier()
* @model
* @generated
@@ -25,15 +24,15 @@ import org.eclipse.emf.common.util.EList;
public interface Supplier extends Address
{
/**
- * Returns the value of the '<em><b>Purchase Orders</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'.
+ * Returns the value of the '<em><b>Purchase Orders</b></em>' reference list. The list contents are of type
+ * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Purchase Orders</em>' reference list isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Purchase Orders</em>' reference list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier_PurchaseOrders()
* @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
index c54788e..1bd33f9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
@@ -2,21 +2,20 @@
* <copyright>
* </copyright>
*
- * $Id: VAT.java,v 1.1 2008-03-03 15:01:42 estepper Exp $
+ * $Id: VAT.java,v 1.2 2008-03-08 09:41:45 estepper Exp $
*/
package org.eclipse.emf.cdo.tests.model1;
+import org.eclipse.emf.common.util.Enumerator;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.eclipse.emf.common.util.Enumerator;
-
/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>VAT</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>VAT</b></em>', and utility
+ * methods for working with them. <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getVAT()
* @model
* @generated
@@ -24,9 +23,8 @@ import org.eclipse.emf.common.util.Enumerator;
public enum VAT implements Enumerator
{
/**
- * The '<em><b>Vat0</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The '<em><b>Vat0</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #VAT0_VALUE
* @generated
* @ordered
@@ -34,9 +32,8 @@ public enum VAT implements Enumerator
VAT0(0, "vat0", "vat0"),
/**
- * The '<em><b>Vat7</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The '<em><b>Vat7</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #VAT7_VALUE
* @generated
* @ordered
@@ -44,9 +41,8 @@ public enum VAT implements Enumerator
VAT7(7, "vat7", "vat7"),
/**
- * The '<em><b>Vat15</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The '<em><b>Vat15</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #VAT15_VALUE
* @generated
* @ordered
@@ -54,13 +50,13 @@ public enum VAT implements Enumerator
VAT15(15, "vat15", "vat15");
/**
- * The '<em><b>Vat0</b></em>' literal value.
- * <!-- begin-user-doc -->
+ * The '<em><b>Vat0</b></em>' literal value. <!-- begin-user-doc -->
* <p>
- * If the meaning of '<em><b>Vat0</b></em>' literal object isn't clear,
- * there really should be more of a description here...
+ * If the meaning of '<em><b>Vat0</b></em>' literal object isn't clear, there really should be more of a
+ * description here...
* </p>
* <!-- end-user-doc -->
+ *
* @see #VAT0
* @model name="vat0"
* @generated
@@ -69,13 +65,13 @@ public enum VAT implements Enumerator
public static final int VAT0_VALUE = 0;
/**
- * The '<em><b>Vat7</b></em>' literal value.
- * <!-- begin-user-doc -->
+ * The '<em><b>Vat7</b></em>' literal value. <!-- begin-user-doc -->
* <p>
- * If the meaning of '<em><b>Vat7</b></em>' literal object isn't clear,
- * there really should be more of a description here...
+ * If the meaning of '<em><b>Vat7</b></em>' literal object isn't clear, there really should be more of a
+ * description here...
* </p>
* <!-- end-user-doc -->
+ *
* @see #VAT7
* @model name="vat7"
* @generated
@@ -84,13 +80,13 @@ public enum VAT implements Enumerator
public static final int VAT7_VALUE = 7;
/**
- * The '<em><b>Vat15</b></em>' literal value.
- * <!-- begin-user-doc -->
+ * The '<em><b>Vat15</b></em>' literal value. <!-- begin-user-doc -->
* <p>
- * If the meaning of '<em><b>Vat15</b></em>' literal object isn't clear,
- * there really should be more of a description here...
+ * If the meaning of '<em><b>Vat15</b></em>' literal object isn't clear, there really should be more of a
+ * description here...
* </p>
* <!-- end-user-doc -->
+ *
* @see #VAT15
* @model name="vat15"
* @generated
@@ -99,31 +95,24 @@ public enum VAT implements Enumerator
public static final int VAT15_VALUE = 15;
/**
- * An array of all the '<em><b>VAT</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * An array of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
- private static final VAT[] VALUES_ARRAY =
- new VAT[]
- {
- VAT0,
- VAT7,
- VAT15,
- };
+ private static final VAT[] VALUES_ARRAY = new VAT[] { VAT0, VAT7, VAT15, };
/**
- * A public read-only list of all the '<em><b>VAT</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * A public read-only list of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
public static final List<VAT> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
/**
- * Returns the '<em><b>VAT</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Returns the '<em><b>VAT</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
public static VAT get(String literal)
@@ -140,9 +129,9 @@ public enum VAT implements Enumerator
}
/**
- * Returns the '<em><b>VAT</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Returns the '<em><b>VAT</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
*/
public static VAT getByName(String name)
@@ -159,47 +148,49 @@ public enum VAT implements Enumerator
}
/**
- * Returns the '<em><b>VAT</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Returns the '<em><b>VAT</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
public static VAT get(int value)
{
switch (value)
{
- case VAT0_VALUE: return VAT0;
- case VAT7_VALUE: return VAT7;
- case VAT15_VALUE: return VAT15;
+ case VAT0_VALUE:
+ return VAT0;
+ case VAT7_VALUE:
+ return VAT7;
+ case VAT15_VALUE:
+ return VAT15;
}
return null;
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private final int value;
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private final String name;
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private final String literal;
/**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private VAT(int value, String name, String literal)
@@ -210,8 +201,8 @@ public enum VAT implements Enumerator
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public int getValue()
@@ -220,8 +211,8 @@ public enum VAT implements Enumerator
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getName()
@@ -230,8 +221,8 @@ public enum VAT implements Enumerator
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getLiteral()
@@ -240,9 +231,9 @@ public enum VAT implements Enumerator
}
/**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
@Override
@@ -250,5 +241,5 @@ public enum VAT implements Enumerator
{
return literal;
}
-
-} //VAT
+
+} // VAT
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
index 19ca551..be3af2e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
@@ -18,18 +18,19 @@ import org.eclipse.emf.ecore.EClass;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getStreet <em>Street</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getCity <em>City</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getStreet <em>Street</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getCity <em>City</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class AddressImpl extends CDOObjectImpl implements Address
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected AddressImpl()
@@ -39,6 +40,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -49,6 +51,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -59,6 +62,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getName()
@@ -68,6 +72,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setName(String newName)
@@ -77,6 +82,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getStreet()
@@ -86,6 +92,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setStreet(String newStreet)
@@ -95,6 +102,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getCity()
@@ -104,6 +112,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setCity(String newCity)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
index a73f01b..54eee3f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
@@ -20,18 +20,19 @@ import org.eclipse.emf.ecore.EClass;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class CategoryImpl extends CDOObjectImpl implements Category
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected CategoryImpl()
@@ -41,6 +42,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -51,6 +53,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -61,6 +64,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getName()
@@ -70,6 +74,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setName(String newName)
@@ -79,6 +84,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -89,6 +95,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
index 08affa9..f860781 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
@@ -22,20 +22,21 @@ import org.eclipse.emf.ecore.EClass;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class CompanyImpl extends AddressImpl implements Company
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected CompanyImpl()
@@ -45,6 +46,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -55,6 +57,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -65,6 +68,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -75,6 +79,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -85,6 +90,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -95,6 +101,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
index 9547460..2f3ae75 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
@@ -18,16 +18,17 @@ import org.eclipse.emf.ecore.EClass;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class CustomerImpl extends AddressImpl implements Customer
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected CustomerImpl()
@@ -37,6 +38,7 @@ public class CustomerImpl extends AddressImpl implements Customer
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -47,6 +49,7 @@ public class CustomerImpl extends AddressImpl implements Customer
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
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 655dbd4..b499935 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
@@ -6,7 +6,6 @@
*/
package org.eclipse.emf.cdo.tests.model1.impl;
-import org.eclipse.emf.cdo.tests.model1.*;
import org.eclipse.emf.cdo.tests.model1.Address;
import org.eclipse.emf.cdo.tests.model1.Category;
import org.eclipse.emf.cdo.tests.model1.Company;
@@ -19,6 +18,7 @@ import org.eclipse.emf.cdo.tests.model1.Product;
import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
import org.eclipse.emf.cdo.tests.model1.SalesOrder;
import org.eclipse.emf.cdo.tests.model1.Supplier;
+import org.eclipse.emf.cdo.tests.model1.VAT;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
@@ -29,20 +29,22 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ *
* @generated
*/
public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
{
/**
- * Creates the default factory implementation.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public static Model1Factory init()
{
try
{
- Model1Factory theModel1Factory = (Model1Factory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/tests/model1/1.0.0");
+ Model1Factory theModel1Factory = (Model1Factory)EPackage.Registry.INSTANCE
+ .getEFactory("http://www.eclipse.org/emf/CDO/tests/model1/1.0.0");
if (theModel1Factory != null)
{
return theModel1Factory;
@@ -56,8 +58,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
}
/**
- * Creates an instance of the factory.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Model1FactoryImpl()
@@ -67,6 +69,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -74,24 +77,34 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
{
switch (eClass.getClassifierID())
{
- case Model1Package.ADDRESS: return (EObject)createAddress();
- case Model1Package.COMPANY: return (EObject)createCompany();
- case Model1Package.SUPPLIER: return (EObject)createSupplier();
- case Model1Package.CUSTOMER: return (EObject)createCustomer();
- case Model1Package.ORDER: return (EObject)createOrder();
- case Model1Package.ORDER_DETAIL: return (EObject)createOrderDetail();
- case Model1Package.PURCHASE_ORDER: return (EObject)createPurchaseOrder();
- case Model1Package.SALES_ORDER: return (EObject)createSalesOrder();
- case Model1Package.CATEGORY: return (EObject)createCategory();
- case Model1Package.PRODUCT: return (EObject)createProduct();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+ case Model1Package.ADDRESS:
+ return (EObject)createAddress();
+ case Model1Package.COMPANY:
+ return (EObject)createCompany();
+ case Model1Package.SUPPLIER:
+ return (EObject)createSupplier();
+ case Model1Package.CUSTOMER:
+ return (EObject)createCustomer();
+ case Model1Package.ORDER:
+ return (EObject)createOrder();
+ case Model1Package.ORDER_DETAIL:
+ return (EObject)createOrderDetail();
+ case Model1Package.PURCHASE_ORDER:
+ return (EObject)createPurchaseOrder();
+ case Model1Package.SALES_ORDER:
+ return (EObject)createSalesOrder();
+ case Model1Package.CATEGORY:
+ return (EObject)createCategory();
+ case Model1Package.PRODUCT:
+ return (EObject)createProduct();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -99,16 +112,16 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
{
switch (eDataType.getClassifierID())
{
- case Model1Package.VAT:
- return createVATFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ case Model1Package.VAT:
+ return createVATFromString(eDataType, initialValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -116,15 +129,16 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
{
switch (eDataType.getClassifierID())
{
- case Model1Package.VAT:
- return convertVATToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+ case Model1Package.VAT:
+ return convertVATToString(eDataType, instanceValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Address createAddress()
@@ -135,6 +149,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Supplier createSupplier()
@@ -145,6 +160,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public PurchaseOrder createPurchaseOrder()
@@ -155,6 +171,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public OrderDetail createOrderDetail()
@@ -165,6 +182,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Product createProduct()
@@ -174,20 +192,22 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public VAT createVATFromString(EDataType eDataType, String initialValue)
{
VAT result = VAT.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+ if (result == null)
+ throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
+ + eDataType.getName() + "'");
return result;
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String convertVATToString(EDataType eDataType, Object instanceValue)
@@ -197,6 +217,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Category createCategory()
@@ -207,6 +228,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Company createCompany()
@@ -217,6 +239,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Customer createCustomer()
@@ -227,6 +250,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Order createOrder()
@@ -237,6 +261,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public SalesOrder createSalesOrder()
@@ -247,6 +272,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Model1Package getModel1Package()
@@ -256,6 +282,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @deprecated
* @generated
*/
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 bcfe86b..170f738 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
@@ -28,73 +28,84 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ *
* @generated
*/
public class Model1PackageImpl extends EPackageImpl implements Model1Package
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass addressEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass supplierEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass purchaseOrderEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass orderDetailEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass productEClass = null;
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EEnum vatEEnum = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass categoryEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass companyEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass customerEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass orderEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass salesOrderEClass = null;
@@ -119,27 +130,24 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
- * <!-- begin-user-doc -->
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
+ * method drives initialization for interdependent packages directly, in parallel with this package, itself.
+ * <p>
+ * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
+ * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
+ * packages are created before any are initialized, since one package's meta-model objects may refer to those of
+ * another.
+ * <p>
+ * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -150,7 +158,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
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.getEPackage(eNS_URI) : new Model1PackageImpl());
+ Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE
+ .getEPackage(eNS_URI)
+ : new Model1PackageImpl());
isInited = true;
@@ -168,6 +178,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getAddress()
@@ -177,6 +188,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getAddress_Name()
@@ -186,6 +198,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getAddress_Street()
@@ -195,6 +208,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getAddress_City()
@@ -204,6 +218,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getSupplier()
@@ -213,6 +228,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getSupplier_PurchaseOrders()
@@ -222,6 +238,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getPurchaseOrder()
@@ -231,6 +248,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getPurchaseOrder_Date()
@@ -240,6 +258,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getPurchaseOrder_Supplier()
@@ -249,6 +268,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getOrderDetail()
@@ -258,6 +278,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getOrderDetail_Order()
@@ -267,6 +288,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getOrderDetail_Product()
@@ -276,6 +298,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getOrderDetail_Price()
@@ -285,6 +308,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getProduct()
@@ -294,6 +318,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getProduct_Name()
@@ -303,6 +328,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getProduct_OrderDetails()
@@ -311,8 +337,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getProduct_Vat()
@@ -321,8 +347,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EEnum getVAT()
@@ -332,6 +358,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getCategory()
@@ -341,6 +368,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCategory_Name()
@@ -350,6 +378,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCategory_Categories()
@@ -359,6 +388,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCategory_Products()
@@ -368,6 +398,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getCompany()
@@ -377,6 +408,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_Categories()
@@ -386,6 +418,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_Suppliers()
@@ -395,6 +428,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_PurchaseOrders()
@@ -404,6 +438,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_Customers()
@@ -413,6 +448,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_SalesOrders()
@@ -422,6 +458,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getCustomer()
@@ -431,6 +468,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCustomer_SalesOrders()
@@ -440,6 +478,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getOrder()
@@ -449,6 +488,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getOrder_OrderDetails()
@@ -458,6 +498,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getSalesOrder()
@@ -467,6 +508,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getSalesOrder_Id()
@@ -476,6 +518,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getSalesOrder_Customer()
@@ -485,6 +528,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Model1Factory getModel1Factory()
@@ -494,14 +538,15 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private boolean isCreated = false;
/**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
+ * first. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void createPackageContents()
@@ -560,14 +605,15 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private boolean isInitialized = false;
/**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
+ * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void initializePackageContents()
@@ -593,48 +639,90 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
// Initialize classes and features; add operations and parameters
initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getAddress_Name(), ecorePackage.getEString(), "name", null, 0, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getAddress_Street(), ecorePackage.getEString(), "street", null, 0, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getAddress_City(), ecorePackage.getEString(), "city", null, 0, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getAddress_Name(), ecorePackage.getEString(), "name", null, 0, 1, Address.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getAddress_Street(), ecorePackage.getEString(), "street", null, 0, 1, Address.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getAddress_City(), ecorePackage.getEString(), "city", null, 0, 1, Address.class, !IS_TRANSIENT,
+ !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, !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, !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, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompany_Categories(), this.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,
+ !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,
+ !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(), 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);
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(), 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);
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);
-
- 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, 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, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE, 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, !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, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ 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);
+
+ 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,
+ 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,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE,
+ 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,
+ !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,
+ !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, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ 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,
+ !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, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ 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,
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Initialize enums and add enum literals
initEEnum(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.class, "VAT");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
index 3b1781d..3605a70 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
@@ -33,6 +33,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected OrderDetailImpl()
@@ -42,6 +43,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -52,6 +54,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -62,6 +65,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Order getOrder()
@@ -71,6 +75,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setOrder(Order newOrder)
@@ -80,6 +85,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Product getProduct()
@@ -89,6 +95,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setProduct(Product newProduct)
@@ -98,6 +105,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public float getPrice()
@@ -107,6 +115,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setPrice(float newPrice)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java
index c47b7a3..39cd402 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java
@@ -20,16 +20,17 @@ import org.eclipse.emf.ecore.EClass;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class OrderImpl extends CDOObjectImpl implements Order
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected OrderImpl()
@@ -39,6 +40,7 @@ public class OrderImpl extends CDOObjectImpl implements Order
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -49,6 +51,7 @@ public class OrderImpl extends CDOObjectImpl implements Order
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -59,6 +62,7 @@ public class OrderImpl extends CDOObjectImpl implements Order
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java
index f100bbf..8c7a666 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java
@@ -9,8 +9,8 @@ package org.eclipse.emf.cdo.tests.model1.impl;
import org.eclipse.emf.cdo.tests.model1.Model1Package;
import org.eclipse.emf.cdo.tests.model1.OrderDetail;
import org.eclipse.emf.cdo.tests.model1.Product;
-
import org.eclipse.emf.cdo.tests.model1.VAT;
+
import org.eclipse.emf.internal.cdo.CDOObjectImpl;
import org.eclipse.emf.common.util.EList;
@@ -21,18 +21,19 @@ import org.eclipse.emf.ecore.EClass;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl#getOrderDetails <em>Order Details</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl#getVat <em>Vat</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl#getOrderDetails <em>Order Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl#getVat <em>Vat</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class ProductImpl extends CDOObjectImpl implements Product
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected ProductImpl()
@@ -42,6 +43,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -52,6 +54,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -62,6 +65,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getName()
@@ -71,6 +75,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setName(String newName)
@@ -80,6 +85,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -89,8 +95,8 @@ public class ProductImpl extends CDOObjectImpl implements Product
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public VAT getVat()
@@ -99,8 +105,8 @@ public class ProductImpl extends CDOObjectImpl implements Product
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setVat(VAT newVat)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
index 16adde2..e21a8bb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
@@ -20,17 +20,18 @@ import java.util.Date;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getDate <em>Date</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getSupplier <em>Supplier</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getDate <em>Date</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getSupplier <em>Supplier</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected PurchaseOrderImpl()
@@ -40,6 +41,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -50,6 +52,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Date getDate()
@@ -59,6 +62,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setDate(Date newDate)
@@ -68,6 +72,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Supplier getSupplier()
@@ -77,6 +82,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setSupplier(Supplier newSupplier)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
index 4460935..f5ca649 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
@@ -29,6 +29,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected SalesOrderImpl()
@@ -38,6 +39,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -48,6 +50,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public int getId()
@@ -57,6 +60,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setId(int newId)
@@ -66,6 +70,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Customer getCustomer()
@@ -75,6 +80,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setCustomer(Customer newCustomer)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
index d989ed0..25208d4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
@@ -18,16 +18,17 @@ import org.eclipse.emf.ecore.EClass;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class SupplierImpl extends AddressImpl implements Supplier
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected SupplierImpl()
@@ -37,6 +38,7 @@ public class SupplierImpl extends AddressImpl implements Supplier
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -47,6 +49,7 @@ public class SupplierImpl extends AddressImpl implements Supplier
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
index 8a8dc9c..007220c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
@@ -6,7 +6,6 @@
*/
package org.eclipse.emf.cdo.tests.model1.util;
-import org.eclipse.emf.cdo.tests.model1.*;
import org.eclipse.emf.cdo.tests.model1.Address;
import org.eclipse.emf.cdo.tests.model1.Category;
import org.eclipse.emf.cdo.tests.model1.Company;
@@ -27,21 +26,22 @@ import org.eclipse.emf.ecore.EObject;
/**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
* method for each class of the model. <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package
* @generated
*/
public class Model1AdapterFactory extends AdapterFactoryImpl
{
/**
- * The cached model package.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected static Model1Package modelPackage;
/**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Model1AdapterFactory()
@@ -53,10 +53,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
}
/**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc --> This implementation
+ * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
* returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
* end-user-doc -->
+ *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -75,73 +75,84 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
}
/**
- * The switch that delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected Model1Switch<Adapter> modelSwitch = new Model1Switch<Adapter>()
+ {
+ @Override
+ public Adapter caseAddress(Address object)
+ {
+ return createAddressAdapter();
+ }
+
+ @Override
+ public Adapter caseCompany(Company object)
+ {
+ return createCompanyAdapter();
+ }
+
+ @Override
+ public Adapter caseSupplier(Supplier object)
+ {
+ return createSupplierAdapter();
+ }
+
+ @Override
+ public Adapter caseCustomer(Customer object)
+ {
+ return createCustomerAdapter();
+ }
+
+ @Override
+ public Adapter caseOrder(Order object)
+ {
+ return createOrderAdapter();
+ }
+
+ @Override
+ public Adapter caseOrderDetail(OrderDetail object)
{
- @Override
- public Adapter caseAddress(Address object)
- {
- return createAddressAdapter();
- }
- @Override
- public Adapter caseCompany(Company object)
- {
- return createCompanyAdapter();
- }
- @Override
- public Adapter caseSupplier(Supplier object)
- {
- return createSupplierAdapter();
- }
- @Override
- public Adapter caseCustomer(Customer object)
- {
- return createCustomerAdapter();
- }
- @Override
- public Adapter caseOrder(Order object)
- {
- return createOrderAdapter();
- }
- @Override
- public Adapter caseOrderDetail(OrderDetail object)
- {
- return createOrderDetailAdapter();
- }
- @Override
- public Adapter casePurchaseOrder(PurchaseOrder object)
- {
- return createPurchaseOrderAdapter();
- }
- @Override
- public Adapter caseSalesOrder(SalesOrder object)
- {
- return createSalesOrderAdapter();
- }
- @Override
- public Adapter caseCategory(Category object)
- {
- return createCategoryAdapter();
- }
- @Override
- public Adapter caseProduct(Product object)
- {
- return createProductAdapter();
- }
- @Override
- public Adapter defaultCase(EObject object)
- {
- return createEObjectAdapter();
- }
- };
+ return createOrderDetailAdapter();
+ }
+
+ @Override
+ public Adapter casePurchaseOrder(PurchaseOrder object)
+ {
+ return createPurchaseOrderAdapter();
+ }
+
+ @Override
+ public Adapter caseSalesOrder(SalesOrder object)
+ {
+ return createSalesOrderAdapter();
+ }
+
+ @Override
+ public Adapter caseCategory(Category object)
+ {
+ return createCategoryAdapter();
+ }
+
+ @Override
+ public Adapter caseProduct(Product object)
+ {
+ return createProductAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object)
+ {
+ return createEObjectAdapter();
+ }
+ };
/**
- * Creates an adapter for the <code>target</code>.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param target the object to adapt.
+ * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param target
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@@ -155,6 +166,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Address <em>Address</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.Address
* @generated
@@ -168,6 +180,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.Supplier
* @generated
@@ -181,6 +194,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder <em>Purchase Order</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder
* @generated
@@ -194,6 +208,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail <em>Order Detail</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.OrderDetail
* @generated
@@ -207,6 +222,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Product <em>Product</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.Product
* @generated
@@ -220,6 +236,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.Category
* @generated
@@ -233,6 +250,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.Company
* @generated
@@ -246,6 +264,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.Customer
* @generated
@@ -259,6 +278,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.Order
* @generated
@@ -272,6 +292,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder <em>Sales Order</em>}'.
* <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
* ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+ *
* @return the new adapter.
* @see org.eclipse.emf.cdo.tests.model1.SalesOrder
* @generated
@@ -282,9 +303,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc --> This default implementation returns null. <!--
+ * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
* end-user-doc -->
+ *
* @return the new adapter.
* @generated
*/
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 87e7cb6..633e291 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
@@ -22,28 +22,28 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import java.util.List;
-import org.eclipse.emf.cdo.tests.model1.*;
/**
* <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
* {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
* starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
* returned, which is the result of the switch. <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package
* @generated
*/
public class Model1Switch<T>
{
/**
- * The cached model package
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected static Model1Package modelPackage;
/**
- * Creates an instance of the switch.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Model1Switch()
@@ -55,8 +55,9 @@ public class Model1Switch<T>
}
/**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+ * result. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -66,8 +67,9 @@ public class Model1Switch<T>
}
/**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+ * result. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -80,16 +82,14 @@ public class Model1Switch<T>
else
{
List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
}
}
/**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+ * result. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -97,90 +97,92 @@ public class Model1Switch<T>
{
switch (classifierID)
{
- case Model1Package.ADDRESS:
- {
- Address address = (Address)theEObject;
- T result = caseAddress(address);
- 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);
- 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);
- 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);
- return result;
- }
- case Model1Package.ORDER:
- {
- Order order = (Order)theEObject;
- T result = caseOrder(order);
- 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);
- 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);
- 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);
- return result;
- }
- case Model1Package.CATEGORY:
- {
- Category category = (Category)theEObject;
- T result = caseCategory(category);
- 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);
- return result;
- }
- default: return defaultCase(theEObject);
+ case Model1Package.ADDRESS:
+ {
+ Address address = (Address)theEObject;
+ T result = caseAddress(address);
+ 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);
+ 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);
+ 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);
+ return result;
+ }
+ case Model1Package.ORDER:
+ {
+ Order order = (Order)theEObject;
+ T result = caseOrder(order);
+ 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);
+ 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);
+ 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);
+ return result;
+ }
+ case Model1Package.CATEGORY:
+ {
+ Category category = (Category)theEObject;
+ T result = caseCategory(category);
+ 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);
+ return result;
+ }
+ default:
+ return defaultCase(theEObject);
}
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Address</em>'.
- * <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>Address</em>'. <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Address</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -191,10 +193,11 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Supplier</em>'.
- * <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>Supplier</em>'. <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Supplier</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -205,10 +208,11 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Purchase Order</em>'.
- * <!-- begin-user-doc
+ * Returns the result of interpreting the object as an instance of '<em>Purchase Order</em>'. <!-- begin-user-doc
* --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Purchase Order</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -219,10 +223,11 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Order Detail</em>'.
- * <!-- begin-user-doc
+ * Returns the result of interpreting the object as an instance of '<em>Order Detail</em>'. <!-- begin-user-doc
* --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Order Detail</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -233,10 +238,11 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Product</em>'.
- * <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>Product</em>'. <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Product</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -247,10 +253,11 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Category</em>'.
- * <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>Category</em>'. <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Category</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -261,10 +268,11 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Company</em>'.
- * <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>Company</em>'. <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Company</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -275,10 +283,11 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Customer</em>'.
- * <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>Customer</em>'. <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Customer</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -289,10 +298,11 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Order</em>'.
- * <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>Order</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Order</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -303,10 +313,11 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Sales Order</em>'.
- * <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>Sales Order</em>'. <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Sales Order</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -317,11 +328,12 @@ public class Model1Switch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch, but this is the last case
* anyway. <!-- end-user-doc -->
- * @param object the target of the switch.
+ *
+ * @param object
+ * the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
index a5f78e9..8d7ce0e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.CDOView;
import org.eclipse.emf.cdo.internal.protocol.id.CDOIDTempMetaImpl;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.protocol.id.CDOID;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor;
import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange;
import org.eclipse.emf.cdo.protocol.id.CDOIDObject;
import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory;
@@ -30,6 +31,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol;
+import org.eclipse.emf.internal.cdo.protocol.LoadLibrariesRequest;
import org.eclipse.emf.internal.cdo.protocol.OpenSessionRequest;
import org.eclipse.emf.internal.cdo.protocol.OpenSessionResult;
import org.eclipse.emf.internal.cdo.protocol.QueryObjectTypesRequest;
@@ -51,6 +53,7 @@ import org.eclipse.net4j.util.event.EventUtil;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
import org.eclipse.net4j.util.io.ExtendedDataInput;
+import org.eclipse.net4j.util.io.IOUtil;
import org.eclipse.net4j.util.lifecycle.ILifecycle;
import org.eclipse.emf.common.util.URI;
@@ -62,11 +65,14 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.text.MessageFormat;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -149,11 +155,6 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
return sessionID;
}
- public Class<?>[] getCDOIDObjectClasses()
- {
- return cdoidObjectFactory.getCDOIDObjectClasses();
- }
-
public CDOIDObject createCDOIDObject(ExtendedDataInput in)
{
return cdoidObjectFactory.createCDOIDObject(in);
@@ -620,7 +621,7 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
sessionID = result.getSessionID();
repositoryUUID = result.getRepositoryUUID();
- cdoidObjectFactory = createCDOIDFactory(result.getCDOIDObjectFactoryClass(), result.getCDOIDObjectClasses());
+ handleLibraryDescriptor(result.getLibraryDescriptor());
packageManager.addPackageProxies(result.getPackageInfos());
packageManager.activate();
revisionManager.activate();
@@ -651,20 +652,58 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
super.doDeactivate();
}
- private CDOIDObjectFactory createCDOIDFactory(Class<?> objectFactoryClass, List<Class<?>> objectClasses)
+ private void handleLibraryDescriptor(CDOIDLibraryDescriptor libraryDescriptor) throws Exception
{
- // ClassLoader classLoader = new CDOIDObjectFactoryClassLoader();
+ String factoryName = libraryDescriptor.getFactoryName();
+ ClassLoader classLoader = OM.class.getClassLoader();
- // return new CDOIDObjectFactoryImpl();
-
- try
+ Set<String> neededLibraries = createSet(libraryDescriptor.getLibraryNames());
+ if (!neededLibraries.isEmpty())
{
- return (CDOIDObjectFactory)objectFactoryClass.newInstance();
+ File cacheFolder = getCacheFolder();
+ IOUtil.mkdirs(cacheFolder);
+ Set<String> existingLibraries = createSet(cacheFolder.list());
+ Set<String> missingLibraries = new HashSet<String>(neededLibraries);
+ missingLibraries.removeAll(existingLibraries);
+ if (!missingLibraries.isEmpty())
+ {
+ new LoadLibrariesRequest(channel, missingLibraries, cacheFolder).send();
+ }
+
+ int i = 0;
+ URL[] urls = new URL[neededLibraries.size()];
+ for (String neededLibrary : neededLibraries)
+ {
+ File lib = new File(cacheFolder, neededLibrary);
+ urls[i++] = new URL("file://" + lib.getAbsolutePath());
+ }
+
+ classLoader = new URLClassLoader(urls, classLoader);
}
- catch (Exception ex)
+
+ Class<?> factoryClass = classLoader.loadClass(factoryName);
+ cdoidObjectFactory = (CDOIDObjectFactory)factoryClass.newInstance();
+ }
+
+ private File getCacheFolder()
+ {
+ String stateLocation = OM.BUNDLE.getStateLocation();
+ File repos = new File(stateLocation, "repos");
+ return new File(repos, repositoryUUID);
+ }
+
+ private Set<String> createSet(String[] fileNames)
+ {
+ Set<String> set = new HashSet<String>();
+ for (String fileName : fileNames)
{
- throw WrappedException.wrap(ex);
+ if (fileName.endsWith(".jar"))
+ {
+ set.add(fileName);
+ }
}
+
+ return set;
}
private void sendViewsNotification(CDOViewImpl view)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java
new file mode 100644
index 0000000..320d3fc
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadLibrariesRequest.java
@@ -0,0 +1,105 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.internal.cdo.protocol;
+
+import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
+
+import org.eclipse.emf.internal.cdo.bundle.OM;
+
+import org.eclipse.net4j.channel.IChannel;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.signal.RequestWithConfirmation;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.IOUtil;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Collection;
+
+/**
+ * @author Eike Stepper
+ */
+public class LoadLibrariesRequest extends RequestWithConfirmation<Integer>
+{
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, LoadLibrariesRequest.class);
+
+ private Collection<String> libraryNames;
+
+ private File cacheFolder;
+
+ public LoadLibrariesRequest(IChannel channel, Collection<String> libraryNames, File cacheFolder)
+ {
+ super(channel);
+ this.libraryNames = libraryNames;
+ this.cacheFolder = cacheFolder;
+ }
+
+ @Override
+ protected short getSignalID()
+ {
+ return CDOProtocolConstants.SIGNAL_LOAD_LIBRARIES;
+ }
+
+ @Override
+ protected void requesting(ExtendedDataOutputStream out) throws IOException
+ {
+ int size = libraryNames.size();
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing {0} library names", size);
+ }
+
+ out.writeInt(size);
+ for (String libraryName : libraryNames)
+ {
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing library name: {0}", libraryName);
+ }
+
+ out.writeString(libraryName);
+ }
+ }
+
+ @Override
+ protected Integer confirming(ExtendedDataInputStream in) throws IOException
+ {
+ byte[] buffer = new byte[IOUtil.DEFAULT_BUFFER_SIZE];
+ int count = 0;
+ for (String libraryName : libraryNames)
+ {
+ int size = in.readInt();
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Reading library {0}: {1} bytes", libraryName, size);
+ }
+
+ File file = new File(cacheFolder, libraryName);
+ FileOutputStream out = null;
+
+ try
+ {
+ out = new FileOutputStream(file);
+ IOUtil.copy(in, out, size, buffer);
+ }
+ finally
+ {
+ IOUtil.close(out);
+ }
+
+ ++count;
+ }
+
+ return count;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java
index 4da1d3b..d8d3def 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.emf.internal.cdo.protocol;
-import org.eclipse.emf.cdo.internal.protocol.id.CDOIDObjectFactoryImpl;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor;
import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange;
import org.eclipse.emf.cdo.protocol.id.CDOIDUtil;
import org.eclipse.emf.cdo.util.ServerException;
@@ -94,7 +94,13 @@ public class OpenSessionRequest extends RequestWithConfirmation<OpenSessionResul
PROTOCOL.format("Read repositoryUUID: {0}", repositoryUUID);
}
- OpenSessionResult result = new OpenSessionResult(sessionID, repositoryUUID);
+ CDOIDLibraryDescriptor libraryDescriptor = CDOIDUtil.readLibraryDescriptor(in);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Read libraryDescriptor: {0}", libraryDescriptor);
+ }
+
+ OpenSessionResult result = new OpenSessionResult(sessionID, repositoryUUID, libraryDescriptor);
for (;;)
{
@@ -114,31 +120,6 @@ public class OpenSessionRequest extends RequestWithConfirmation<OpenSessionResul
result.addPackageInfo(packageURI, dynamic, metaIDRange);
}
- int classes = in.readInt();
- if (classes == 0)
- {
- result.setCDOIDObjectFactoryClass(CDOIDObjectFactoryImpl.class);
- }
- else
- {
- result.setCDOIDObjectFactoryClass(deserializeClass(in));
- for (int i = 1; i < classes; i++)
- {
- result.addCDOIDObjectClass(deserializeClass(in));
- }
- }
-
return result;
}
-
- private Class<?> deserializeClass(ExtendedDataInputStream in) throws IOException
- {
- Class<?> clazz = (Class<?>)in.readObject(OM.class.getClassLoader());
- if (PROTOCOL.isEnabled())
- {
- PROTOCOL.format("Deserialized class " + clazz.getName());
- }
-
- return clazz;
- }
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java
index b541b2f..a736181 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java
@@ -10,6 +10,7 @@
**************************************************************************/
package org.eclipse.emf.internal.cdo.protocol;
+import org.eclipse.emf.cdo.protocol.id.CDOIDLibraryDescriptor;
import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange;
import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo;
@@ -27,14 +28,13 @@ public final class OpenSessionResult
private List<CDOPackageInfo> packageInfos = new ArrayList<CDOPackageInfo>();
- private Class<?> cdoidFactoryClass;
+ private CDOIDLibraryDescriptor libraryDescriptor;
- private List<Class<?>> cdoidObjectClasses = new ArrayList<Class<?>>();
-
- public OpenSessionResult(int sessionID, String repositoryUUID)
+ public OpenSessionResult(int sessionID, String repositoryUUID, CDOIDLibraryDescriptor libraryDescriptor)
{
this.sessionID = sessionID;
this.repositoryUUID = repositoryUUID;
+ this.libraryDescriptor = libraryDescriptor;
}
public int getSessionID()
@@ -47,33 +47,18 @@ public final class OpenSessionResult
return repositoryUUID;
}
- public List<CDOPackageInfo> getPackageInfos()
+ public CDOIDLibraryDescriptor getLibraryDescriptor()
{
- return packageInfos;
+ return libraryDescriptor;
}
- public Class<?> getCDOIDObjectFactoryClass()
- {
- return cdoidFactoryClass;
- }
-
- public List<Class<?>> getCDOIDObjectClasses()
+ public List<CDOPackageInfo> getPackageInfos()
{
- return cdoidObjectClasses;
+ return packageInfos;
}
void addPackageInfo(String packageURI, boolean dynamic, CDOIDMetaRange metaIDRange)
{
packageInfos.add(new CDOPackageInfo(packageURI, dynamic, metaIDRange));
}
-
- void setCDOIDObjectFactoryClass(Class<?> c)
- {
- cdoidFactoryClass = c;
- }
-
- void addCDOIDObjectClass(Class<?> c)
- {
- cdoidObjectClasses.add(c);
- }
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
index 78511df..29f6bc5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
@@ -268,11 +268,33 @@ public final class IOUtil
}
}
+ public static int copy(InputStream input, OutputStream output, int size, byte buffer[]) throws IORuntimeException
+ {
+ try
+ {
+ int written = 0;
+ int bufferSize = buffer.length;
+ int n = Math.min(size, bufferSize);
+ while ((n = input.read(buffer, 0, n)) != -1)
+ {
+ output.write(buffer, 0, n);
+ written += n;
+ size -= n;
+ }
+
+ return written;
+ }
+ catch (IOException ex)
+ {
+ throw new IORuntimeException(ex);
+ }
+ }
+
public static void copy(InputStream input, OutputStream output, byte buffer[]) throws IORuntimeException
{
try
{
- int n = 0;
+ int n;
while ((n = input.read(buffer)) != -1)
{
output.write(buffer, 0, n);