summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-15 01:29:08 (EDT)
committerEike Stepper2007-07-15 01:29:08 (EDT)
commitb7c05607719837ff08a91d8ea4f8b052bb9722f8 (patch)
tree645136d329b783ba182a66307a236bb00e8448e3
parentde95b6053435686194d369dd7706137afa3cbe31 (diff)
downloadcdo-b7c05607719837ff08a91d8ea4f8b052bb9722f8.zip
cdo-b7c05607719837ff08a91d8ea4f8b052bb9722f8.tar.gz
cdo-b7c05607719837ff08a91d8ea4f8b052bb9722f8.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/.options1
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/RegisterResourceOperation.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java66
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java55
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java39
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java448
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java23
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java23
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java49
-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.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java68
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java226
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java23
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java169
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java265
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/.options1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java (renamed from plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/CDO.java)10
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java8
-rw-r--r--plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java8
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java10
-rw-r--r--plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/Activator.java56
-rw-r--r--plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java53
-rw-r--r--plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java8
-rw-r--r--plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java8
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java12
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java6
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java6
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java10
-rw-r--r--plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java (renamed from plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java)10
-rw-r--r--plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java (renamed from plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java)10
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java8
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java1
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java10
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java1
81 files changed, 1190 insertions, 964 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java
index ac31a72..70a975a 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java
@@ -10,7 +10,6 @@
**************************************************************************/
package org.eclipse.emf.cdo.server.db;
-
/**
* @author Eike Stepper
*/
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
index f11e2c9..0d9655a 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.emf.cdo.server.db"; //$NON-NLS-1$
@@ -29,14 +29,10 @@ public final class OM
public static final OMLogger LOG = BUNDLE.logger();
- private OM()
- {
- }
-
/**
* @author Eike Stepper
*/
- public static final class Activator extends OSGiActivator
+ static final class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.emf.cdo.server/.options b/plugins/org.eclipse.emf.cdo.server/.options
index 3503d0a..0d5c584 100644
--- a/plugins/org.eclipse.emf.cdo.server/.options
+++ b/plugins/org.eclipse.emf.cdo.server/.options
@@ -1,4 +1,5 @@
org.eclipse.emf.cdo.server/debug = true
+org.eclipse.emf.cdo.server/debug.protocol = true
org.eclipse.emf.cdo.server/debug.repository = true
org.eclipse.emf.cdo.server/debug.session = true
org.eclipse.emf.cdo.server/debug.revision = true
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
index 72fd3ad..6508322 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
@@ -21,7 +21,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.emf.cdo.server"; //$NON-NLS-1$
@@ -29,6 +29,8 @@ public final class OM
public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
+ public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$
+
public static final OMTracer DEBUG_REPOSITORY = DEBUG.tracer("repository"); //$NON-NLS-1$
public static final OMTracer DEBUG_SESSION = DEBUG.tracer("session"); //$NON-NLS-1$
@@ -39,28 +41,20 @@ public final class OM
public static final OMLogger LOG = BUNDLE.logger();
- private OM()
- {
- }
-
- public static void start() throws Exception
+ static void start() throws Exception
{
RepositoryManager.INSTANCE.activate();
}
- public static void stop() throws Exception
+ static void stop() throws Exception
{
- Exception exception = RepositoryManager.INSTANCE.deactivate();
- if (exception != null)
- {
- LOG.warn(exception);
- }
+ RepositoryManager.INSTANCE.deactivate();
}
/**
* @author Eike Stepper
*/
- public static final class Activator extends OSGiActivator
+ static final class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
index 38d4d25..115bf1c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.cdo.internal.server.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl;
import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.internal.server.RevisionManager;
@@ -33,11 +33,9 @@ import java.util.Map.Entry;
@SuppressWarnings("unused")
public class CommitTransactionIndication extends CDOServerIndication
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL,
- CommitTransactionIndication.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, CommitTransactionIndication.class);
- private static final ContextTracer TRACER = new ContextTracer(CDOProtocol.DEBUG_REVISION,
- CommitTransactionIndication.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_REVISION, CommitTransactionIndication.class);
private CDORevisionImpl[] newResources;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java
index 3ad1dbc..baade02 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.cdo.internal.server.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
@@ -27,7 +27,7 @@ import java.io.IOException;
*/
public class InvalidationRequest extends Request
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, InvalidationRequest.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, InvalidationRequest.class);
private long timeStamp;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
index aaf8cb7..2f8b594 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.cdo.internal.server.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.internal.server.RevisionManager;
import org.eclipse.emf.cdo.protocol.CDOID;
@@ -28,8 +28,7 @@ import java.io.IOException;
*/
public class LoadObjectIndication extends CDOServerIndication
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL,
- LoadObjectIndication.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, LoadObjectIndication.class);
private CDOID id;
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 f03c4b6..f4195fb 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,7 +10,7 @@
**************************************************************************/
package org.eclipse.emf.cdo.internal.server.protocol;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.internal.server.Repository;
import org.eclipse.emf.cdo.internal.server.RepositoryManager;
import org.eclipse.emf.cdo.internal.server.Session;
@@ -33,8 +33,7 @@ import java.io.IOException;
*/
public class OpenSessionIndication extends IndicationWithResponse
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL,
- OpenSessionIndication.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, OpenSessionIndication.class);
private String repositoryName;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
index f7ef6ef..85911d2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
@@ -11,7 +11,6 @@
package org.eclipse.emf.cdo.internal.server.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
import org.eclipse.emf.cdo.internal.server.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
@@ -27,8 +26,7 @@ import java.io.IOException;
*/
public class ResourceIDIndication extends CDOServerIndication
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL,
- ResourceIDIndication.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, ResourceIDIndication.class);
private CDOID id;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
index 034c470..e9bf726 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.cdo.internal.server.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
@@ -26,8 +26,7 @@ import java.io.IOException;
*/
public class ResourcePathIndication extends CDOServerIndication
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL,
- ResourcePathIndication.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, ResourcePathIndication.class);
private String path;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/RegisterResourceOperation.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/RegisterResourceOperation.java
index 16f1087..01be1f7 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/RegisterResourceOperation.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/RegisterResourceOperation.java
@@ -29,7 +29,7 @@ public abstract class RegisterResourceOperation<T extends ITransaction> implemen
this.pathToIDMap = pathToIDMap;
}
-public Object prepare(T transaction) throws Exception
+ public Object prepare(T transaction) throws Exception
{
update(transaction, id, path);
idToPathMap.put(id, path);
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 570dfa6..3d58e8d 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
@@ -9,19 +9,17 @@ package org.eclipse.emf.cdo.tests.model1;
import org.eclipse.emf.cdo.CDOObject;
/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Address</b></em>'.
+ * <!-- 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
@@ -30,13 +28,14 @@ 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...
+ * 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()
@@ -46,23 +45,25 @@ public interface Address extends CDOObject
String getName();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
*/
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...
+ * 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()
@@ -72,23 +73,25 @@ public interface Address extends CDOObject
String getStreet();
/**
- * 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.
+ * 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.
* @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...
+ * 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()
@@ -98,10 +101,11 @@ public interface Address extends CDOObject
String getCity();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>City</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>City</em>' attribute.
* @see #getCity()
* @generated
*/
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 c7ec2d4..b00bd7f 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
@@ -13,16 +13,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
@@ -48,24 +47,28 @@ public interface Category extends CDOObject
String getName();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
*/
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.
+ *
+ * @return the value of the '<em>Categories</em>' containment reference
+ * list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Categories()
* @model containment="true"
* @generated
@@ -73,15 +76,17 @@ 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.
+ *
+ * @return the value of the '<em>Products</em>' containment reference
+ * list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Products()
* @model containment="true"
* @generated
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 7196781..1dba717 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
@@ -6,25 +6,22 @@
*/
package org.eclipse.emf.cdo.tests.model1;
-import org.eclipse.emf.cdo.CDOObject;
-
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
@@ -32,15 +29,17 @@ 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.
+ *
+ * @return the value of the '<em>Categories</em>' containment reference
+ * list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Categories()
* @model containment="true"
* @generated
@@ -48,15 +47,17 @@ 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.
+ *
+ * @return the value of the '<em>Suppliers</em>' containment reference
+ * list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Suppliers()
* @model containment="true"
* @generated
@@ -84,15 +85,17 @@ 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.
+ *
+ * @return the value of the '<em>Customers</em>' containment reference
+ * list.
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Customers()
* @model containment="true"
* @generated
@@ -100,16 +103,18 @@ 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.
+ *
+ * @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"
* @generated
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 e875ed2..9ba6388 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
@@ -6,21 +6,18 @@
*/
package org.eclipse.emf.cdo.tests.model1;
-import org.eclipse.emf.cdo.CDOObject;
-
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
@@ -28,15 +25,17 @@ 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 b47910c..adba9f8 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,32 +11,33 @@ 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 --> <!--
+ * 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
+ * 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
*/
@@ -61,45 +62,45 @@ public interface Model1Factory extends EFactory
OrderDetail createOrderDetail();
/**
- * Returns a new object of class '<em>Product</em>'.
- * <!-- begin-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
+ * 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
+ * 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
+ * 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 -->
+ * 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
*/
@@ -115,9 +116,9 @@ public interface Model1Factory extends EFactory
SalesOrder createSalesOrder();
/**
- * Returns the package supported by this factory.
- * <!-- begin-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 7676fb7..d40ce42 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,38 +29,38 @@ 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 --> <!--
+ * The singleton instance of the package. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl.init();
/**
- * 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 -->
+ * 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
@@ -67,44 +68,45 @@ 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
*/
int ADDRESS__CITY = 2;
/**
- * The number of structural features of the '<em>Address</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The number of structural features of the '<em>Address</em>' class. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int ADDRESS_FEATURE_COUNT = 3;
/**
- * 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 -->
+ * 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
@@ -112,8 +114,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
@@ -121,8 +124,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
@@ -130,8 +134,9 @@ public interface Model1Package extends EPackage
int ORDER_DETAIL = 5;
/**
- * 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 -->
+ * 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
@@ -140,8 +145,8 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Address <em>Address</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Address</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Address
* @generated
@@ -150,8 +155,8 @@ 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 -->
+ * <!-- 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()
@@ -161,8 +166,8 @@ 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 -->
+ * <!-- 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()
@@ -172,8 +177,8 @@ 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 -->
+ * <!-- 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()
@@ -182,8 +187,9 @@ public interface Model1Package extends EPackage
EAttribute getAddress_City();
/**
- * 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 -->
+ * 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
@@ -191,8 +197,9 @@ public interface Model1Package extends EPackage
int CATEGORY = 8;
/**
- * 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 -->
+ * 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
@@ -200,67 +207,72 @@ 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 --> <!-- end-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 --> <!-- end-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 --> <!-- end-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 --> <!-- end-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 --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Sales Orders</b></em>' containment
+ * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -285,27 +297,27 @@ public interface Model1Package extends EPackage
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 -->
- * <!-- end-user-doc -->
+ * The feature id for the '<em><b>Purchase Orders</b></em>' reference
+ * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -314,14 +326,16 @@ public interface Model1Package extends EPackage
/**
* The number of structural features of the '<em>Supplier</em>' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int SUPPLIER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 1;
/**
- * 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 -->
+ * 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
@@ -338,18 +352,18 @@ public interface Model1Package extends EPackage
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
*/
@@ -358,6 +372,7 @@ public interface Model1Package extends EPackage
/**
* The feature id for the '<em><b>Sales Orders</b></em>' reference list.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -366,15 +381,16 @@ public interface Model1Package extends EPackage
/**
* The number of structural features of the '<em>Customer</em>' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
int CUSTOMER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The meta object id 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
@@ -382,18 +398,18 @@ 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 -->
- * <!-- end-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
*/
@@ -401,8 +417,8 @@ public interface Model1Package extends EPackage
/**
* The feature id for the '<em><b>Order</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -429,15 +445,16 @@ public interface Model1Package extends EPackage
/**
* 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 -->
- * <!-- end-user-doc -->
+ * The feature id for the '<em><b>Order Details</b></em>' containment
+ * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -462,16 +479,18 @@ public interface Model1Package extends EPackage
int PURCHASE_ORDER__SUPPLIER = ORDER_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Purchase Order</em>' class.
- * <!-- begin-user-doc --> <!-- end-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
@@ -479,9 +498,9 @@ 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 -->
- * <!-- end-user-doc -->
+ * The feature id for the '<em><b>Order Details</b></em>' containment
+ * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -508,6 +527,7 @@ public interface Model1Package extends EPackage
/**
* The number of structural features of the '<em>Sales Order</em>' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -523,16 +543,18 @@ public interface Model1Package extends EPackage
int CATEGORY__NAME = 0;
/**
- * The feature id for the '<em><b>Categories</b></em>' containment reference list.
- * <!-- begin-user-doc --> <!-- end-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 --> <!-- end-user-doc -->
+ * The feature id for the '<em><b>Products</b></em>' containment
+ * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -541,6 +563,7 @@ public interface Model1Package extends EPackage
/**
* The number of structural features of the '<em>Category</em>' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -558,6 +581,7 @@ public interface Model1Package extends EPackage
/**
* The feature id for the '<em><b>Order Details</b></em>' reference list.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
* @ordered
*/
@@ -575,6 +599,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Supplier</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Supplier
* @generated
@@ -583,8 +608,8 @@ 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 -->
+ * <!-- 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()
@@ -595,6 +620,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
@@ -604,6 +630,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()
@@ -614,6 +641,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()
@@ -624,6 +652,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
@@ -632,8 +661,8 @@ 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 -->
+ * <!-- 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()
@@ -644,6 +673,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()
@@ -654,6 +684,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()
@@ -664,6 +695,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Product <em>Product</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Product</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Product
* @generated
@@ -673,6 +705,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()
@@ -683,6 +716,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()
@@ -693,6 +727,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Category</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Category
* @generated
@@ -702,6 +737,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()
@@ -712,6 +748,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()
@@ -722,6 +759,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()
@@ -732,6 +770,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Company</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Company
* @generated
@@ -741,6 +780,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()
@@ -751,6 +791,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()
@@ -761,6 +802,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()
@@ -771,6 +813,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()
@@ -781,6 +824,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()
@@ -791,6 +835,7 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Customer</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Customer
* @generated
@@ -800,6 +845,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()
@@ -809,8 +855,8 @@ public interface Model1Package extends EPackage
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the meta object for class '<em>Order</em>'.
* @see org.eclipse.emf.cdo.tests.model1.Order
* @generated
@@ -819,8 +865,8 @@ 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 -->
+ * <!-- 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()
@@ -831,6 +877,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
@@ -840,6 +887,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()
@@ -850,6 +898,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()
@@ -876,14 +925,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
@@ -891,32 +941,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 -->
- * <!-- end-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 -->
- * <!-- end-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 -->
- * <!-- end-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
@@ -924,16 +975,17 @@ public interface Model1Package extends EPackage
EClass SUPPLIER = eINSTANCE.getSupplier();
/**
- * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The meta object literal for the '<em><b>Purchase Orders</b></em>'
+ * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
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
@@ -941,22 +993,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 --> <!-- end-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 --> <!-- end-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
@@ -964,30 +1019,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 -->
- * <!-- end-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 --> <!-- end-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 --> <!-- end-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
@@ -995,22 +1053,25 @@ 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 --> <!-- end-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 --> <!-- end-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 '{@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
@@ -1018,31 +1079,35 @@ 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 --> <!-- end-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();
/**
- * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Categories</b></em>'
+ * containment reference list feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EReference CATEGORY__CATEGORIES = eINSTANCE.getCategory_Categories();
/**
- * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Products</b></em>'
+ * containment reference list feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
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
@@ -1050,48 +1115,54 @@ public interface Model1Package extends EPackage
EClass COMPANY = eINSTANCE.getCompany();
/**
- * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Categories</b></em>'
+ * containment reference list feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EReference COMPANY__CATEGORIES = eINSTANCE.getCompany_Categories();
/**
- * The meta object literal for the '<em><b>Suppliers</b></em>' containment reference list feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Suppliers</b></em>'
+ * containment reference list feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EReference COMPANY__SUPPLIERS = eINSTANCE.getCompany_Suppliers();
/**
- * The meta object literal for the '<em><b>Purchase Orders</b></em>' containment reference list feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Purchase Orders</b></em>'
+ * containment reference list feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EReference COMPANY__PURCHASE_ORDERS = eINSTANCE.getCompany_PurchaseOrders();
/**
- * The meta object literal for the '<em><b>Customers</b></em>' containment reference list feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Customers</b></em>'
+ * containment reference list feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
EReference COMPANY__CUSTOMERS = eINSTANCE.getCompany_Customers();
/**
- * The meta object literal for the '<em><b>Sales Orders</b></em>' containment reference list feature.
- * <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Sales Orders</b></em>'
+ * containment reference list feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
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
@@ -1099,16 +1170,17 @@ 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 --> <!-- end-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();
/**
- * 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 -->
+ * 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
@@ -1116,16 +1188,18 @@ public interface Model1Package extends EPackage
EClass ORDER = eINSTANCE.getOrder();
/**
- * The meta object literal for the '<em><b>Order Details</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The meta object literal for the '<em><b>Order Details</b></em>'
+ * containment reference list feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
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
@@ -1133,15 +1207,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 --> <!-- end-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 --> <!-- end-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 3383697..ad08904 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
@@ -11,17 +11,15 @@ import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.common.util.EList;
/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Order</b></em>'.
+ * <!-- 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
@@ -30,16 +28,19 @@ 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...
+ * 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.
+ *
+ * @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
* @model opposite="order" containment="true"
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 de08237..3c30f5f 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
@@ -11,16 +11,15 @@ import org.eclipse.emf.cdo.CDOObject;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Order Detail</b></em>'.
* <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail()
* @model
* @extends CDOObject
@@ -37,6 +36,7 @@ public interface OrderDetail extends CDOObject
* 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()
@@ -47,24 +47,26 @@ 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()
@@ -75,9 +77,11 @@ 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
*/
@@ -101,9 +105,11 @@ public interface OrderDetail extends CDOObject
float getPrice();
/**
- * 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.
+ * 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.
* @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 7e5ebbe..ce5d30c 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
@@ -13,15 +13,14 @@ 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#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct()
* @model
* @extends CDOObject
@@ -47,24 +46,28 @@ public interface Product extends CDOObject
String getName();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product#getName <em>Name</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
*/
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
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 93dbecf..053c4ca 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
@@ -6,22 +6,19 @@
*/
package org.eclipse.emf.cdo.tests.model1;
-import org.eclipse.emf.cdo.CDOObject;
-
import java.util.Date;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Purchase Order</b></em>'.
* <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder()
* @model
* @generated
@@ -46,9 +43,11 @@ public interface PurchaseOrder extends Order
Date getDate();
/**
- * 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.
+ * 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.
* @see #getDate()
* @generated
*/
@@ -72,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 c1f9d2d..c5d7951 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
@@ -6,20 +6,17 @@
*/
package org.eclipse.emf.cdo.tests.model1;
-import org.eclipse.emf.cdo.CDOObject;
-
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Sales Order</b></em>'.
* <!-- end-user-doc -->
- *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder()
* @model
* @generated
@@ -44,23 +41,26 @@ public interface SalesOrder extends Order
int getId();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Id</em>' attribute.
* @see #getId()
* @generated
*/
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()
@@ -71,9 +71,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 655154b..a625443 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
@@ -7,19 +7,17 @@
package org.eclipse.emf.cdo.tests.model1;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.cdo.CDOObject;
/**
* <!-- 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
@@ -27,15 +25,17 @@ import org.eclipse.emf.cdo.CDOObject;
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...
+ * 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/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
index 5f0709c..85b4422 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
@@ -14,25 +14,24 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.internal.cdo.CDOObjectImpl;
/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Address</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Address</b></em>'.
* <!-- end-user-doc -->
* <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 -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected AddressImpl()
@@ -41,8 +40,8 @@ public class AddressImpl extends CDOObjectImpl implements Address
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -52,8 +51,8 @@ public class AddressImpl extends CDOObjectImpl implements Address
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -63,8 +62,8 @@ public class AddressImpl extends CDOObjectImpl implements Address
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getName()
@@ -73,8 +72,8 @@ public class AddressImpl extends CDOObjectImpl implements Address
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setName(String newName)
@@ -83,8 +82,8 @@ public class AddressImpl extends CDOObjectImpl implements Address
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getStreet()
@@ -93,8 +92,8 @@ public class AddressImpl extends CDOObjectImpl implements Address
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setStreet(String newStreet)
@@ -103,8 +102,8 @@ public class AddressImpl extends CDOObjectImpl implements Address
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getCity()
@@ -113,8 +112,8 @@ public class AddressImpl extends CDOObjectImpl implements Address
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setCity(String newCity)
@@ -122,4 +121,4 @@ public class AddressImpl extends CDOObjectImpl implements Address
eSet(Model1Package.Literals.ADDRESS__CITY, newCity);
}
-} //AddressImpl
+} // AddressImpl
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 e5fb16b..4209e58 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.internal.cdo.CDOObjectImpl;
* <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 01e8981..62f44a9 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
@@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.tests.model1.Supplier;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Company</b></em>'.
@@ -24,20 +23,21 @@ import org.eclipse.emf.internal.cdo.CDOObjectImpl;
* <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()
@@ -47,6 +47,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -57,6 +58,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -67,6 +69,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -77,6 +80,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -87,6 +91,7 @@ public class CompanyImpl extends AddressImpl implements Company
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -97,6 +102,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 a141c07..5ca0f15 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
@@ -12,7 +12,6 @@ import org.eclipse.emf.cdo.tests.model1.SalesOrder;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Customer</b></em>'.
@@ -20,16 +19,17 @@ import org.eclipse.emf.internal.cdo.CDOObjectImpl;
* <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()
@@ -39,6 +39,7 @@ public class CustomerImpl extends AddressImpl implements Customer
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -49,6 +50,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 11b89eb..144cfe8 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,12 +6,13 @@
*/
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;
import org.eclipse.emf.cdo.tests.model1.Customer;
import org.eclipse.emf.cdo.tests.model1.Model1Factory;
import org.eclipse.emf.cdo.tests.model1.Model1Package;
+import org.eclipse.emf.cdo.tests.model1.Order;
import org.eclipse.emf.cdo.tests.model1.OrderDetail;
import org.eclipse.emf.cdo.tests.model1.Product;
import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
@@ -27,21 +28,23 @@ 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 --> <!--
+ * 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;
@@ -55,9 +58,9 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
}
/**
- * Creates an instance of the factory.
- * <!-- begin-user-doc --> <!--
+ * Creates an instance of the factory. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
public Model1FactoryImpl()
@@ -67,6 +70,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -74,24 +78,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
*/
public Address createAddress()
@@ -102,6 +116,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Supplier createSupplier()
@@ -112,6 +127,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public PurchaseOrder createPurchaseOrder()
@@ -122,6 +138,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public OrderDetail createOrderDetail()
@@ -132,6 +149,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Product createProduct()
@@ -142,6 +160,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Category createCategory()
@@ -152,6 +171,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Company createCompany()
@@ -162,6 +182,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Customer createCustomer()
@@ -171,8 +192,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Order createOrder()
@@ -183,6 +204,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public SalesOrder createSalesOrder()
@@ -193,6 +215,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Model1Package getModel1Package()
@@ -202,6 +225,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 640e40b..ead0e6a 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,68 +28,77 @@ 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 -->
+ * <!-- 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 -->
+ *
* @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 -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass orderEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private EClass salesOrderEClass = null;
@@ -116,26 +125,27 @@ 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 --> <!-- end-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()
@@ -143,10 +153,13 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
*/
public static Model1Package init()
{
- if (isInited) return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI);
+ if (isInited)
+ return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI);
// Obtain or create and register package
- Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE.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;
@@ -163,8 +176,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getAddress()
@@ -173,8 +186,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getAddress_Name()
@@ -183,8 +196,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getAddress_Street()
@@ -193,8 +206,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getAddress_City()
@@ -204,6 +217,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getSupplier()
@@ -212,8 +226,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getSupplier_PurchaseOrders()
@@ -223,6 +237,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getPurchaseOrder()
@@ -232,6 +247,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getPurchaseOrder_Date()
@@ -241,6 +257,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getPurchaseOrder_Supplier()
@@ -250,6 +267,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getOrderDetail()
@@ -258,8 +276,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getOrderDetail_Order()
@@ -269,6 +287,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getOrderDetail_Product()
@@ -278,6 +297,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getOrderDetail_Price()
@@ -287,6 +307,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getProduct()
@@ -296,6 +317,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getProduct_Name()
@@ -305,6 +327,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getProduct_OrderDetails()
@@ -314,6 +337,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getCategory()
@@ -323,6 +347,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCategory_Name()
@@ -332,6 +357,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCategory_Categories()
@@ -341,6 +367,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCategory_Products()
@@ -350,6 +377,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getCompany()
@@ -359,6 +387,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_Categories()
@@ -368,6 +397,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_Suppliers()
@@ -377,6 +407,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_PurchaseOrders()
@@ -386,6 +417,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_Customers()
@@ -395,6 +427,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCompany_SalesOrders()
@@ -404,6 +437,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getCustomer()
@@ -413,6 +447,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCustomer_SalesOrders()
@@ -421,8 +456,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getOrder()
@@ -431,8 +466,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getOrder_OrderDetails()
@@ -442,6 +477,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getSalesOrder()
@@ -451,6 +487,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getSalesOrder_Id()
@@ -460,6 +497,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getSalesOrder_Customer()
@@ -469,6 +507,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Model1Factory getModel1Factory()
@@ -478,20 +517,22 @@ 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 -->
+ * 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()
{
- if (isCreated) return;
+ if (isCreated)
+ return;
isCreated = true;
// Create classes and their features
@@ -541,6 +582,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
private boolean isInitialized = false;
@@ -554,7 +596,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
*/
public void initializePackageContents()
{
- if (isInitialized) return;
+ if (isInitialized)
+ return;
isInitialized = true;
// Initialize package
@@ -575,47 +618,88 @@ 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_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);
// Create resource
createResource(eNS_URI);
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 0e4a609..292e50c 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
@@ -20,18 +20,19 @@ import org.eclipse.emf.internal.cdo.CDOObjectImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected OrderDetailImpl()
@@ -41,6 +42,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -51,6 +53,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -60,8 +63,8 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Order getOrder()
@@ -70,8 +73,8 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setOrder(Order newOrder)
@@ -81,6 +84,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Product getProduct()
@@ -90,6 +94,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setProduct(Product newProduct)
@@ -99,6 +104,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public float getPrice()
@@ -108,6 +114,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 94b143a..dab9fe6 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
@@ -17,23 +17,22 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.internal.cdo.CDOObjectImpl;
/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Order</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order</b></em>'.
* <!-- end-user-doc -->
* <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 -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected OrderImpl()
@@ -42,8 +41,8 @@ public class OrderImpl extends CDOObjectImpl implements Order
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -53,8 +52,8 @@ public class OrderImpl extends CDOObjectImpl implements Order
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -64,8 +63,8 @@ public class OrderImpl extends CDOObjectImpl implements Order
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -74,4 +73,4 @@ public class OrderImpl extends CDOObjectImpl implements Order
return (EList<OrderDetail>)eGet(Model1Package.Literals.ORDER__ORDER_DETAILS, true);
}
-} //OrderImpl
+} // OrderImpl
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 95ee44d..0e97041 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
@@ -20,17 +20,18 @@ import org.eclipse.emf.internal.cdo.CDOObjectImpl;
* <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#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl#getOrderDetails <em>Order Details</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class ProductImpl extends CDOObjectImpl implements Product
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected ProductImpl()
@@ -40,6 +41,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -50,6 +52,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -60,6 +63,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public String getName()
@@ -69,6 +73,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setName(String newName)
@@ -78,6 +83,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
/**
* <!-- 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/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
index f6f8a3c..f09ea21 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
@@ -11,7 +11,6 @@ import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
import org.eclipse.emf.cdo.tests.model1.Supplier;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
import java.util.Date;
@@ -21,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()
@@ -41,6 +41,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -51,6 +52,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Date getDate()
@@ -60,6 +62,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setDate(Date newDate)
@@ -69,6 +72,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Supplier getSupplier()
@@ -78,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 7f88c4a..830a3ee 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
@@ -11,7 +11,6 @@ import org.eclipse.emf.cdo.tests.model1.Model1Package;
import org.eclipse.emf.cdo.tests.model1.SalesOrder;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Sales Order</b></em>'.
@@ -19,17 +18,18 @@ import org.eclipse.emf.internal.cdo.CDOObjectImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class SalesOrderImpl extends OrderImpl implements SalesOrder
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected SalesOrderImpl()
@@ -39,6 +39,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -49,6 +50,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public int getId()
@@ -58,6 +60,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setId(int newId)
@@ -67,6 +70,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Customer getCustomer()
@@ -76,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 4e0a69a..365da76 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
@@ -12,7 +12,6 @@ import org.eclipse.emf.cdo.tests.model1.Supplier;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Supplier</b></em>'.
@@ -20,16 +19,17 @@ import org.eclipse.emf.internal.cdo.CDOObjectImpl;
* <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()
@@ -39,6 +39,7 @@ public class SupplierImpl extends AddressImpl implements Supplier
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -48,8 +49,8 @@ public class SupplierImpl extends AddressImpl implements Supplier
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- 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 e59e5a9..b409e10 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,11 +6,12 @@
*/
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;
import org.eclipse.emf.cdo.tests.model1.Customer;
import org.eclipse.emf.cdo.tests.model1.Model1Package;
+import org.eclipse.emf.cdo.tests.model1.Order;
import org.eclipse.emf.cdo.tests.model1.OrderDetail;
import org.eclipse.emf.cdo.tests.model1.Product;
import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
@@ -26,22 +27,23 @@ 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 --> <!--
+ * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
public Model1AdapterFactory()
@@ -82,69 +84,80 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* @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)
+ {
+ return createOrderDetailAdapter();
+ }
+
+ @Override
+ public Adapter casePurchaseOrder(PurchaseOrder object)
+ {
+ return createPurchaseOrderAdapter();
+ }
+
+ @Override
+ public Adapter caseSalesOrder(SalesOrder object)
+ {
+ return createSalesOrderAdapter();
+ }
+
+ @Override
+ public Adapter caseCategory(Category 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 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 -->
+ * Creates an adapter for the <code>target</code>. <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param target the object to adapt.
+ *
+ * @param target
+ * the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@@ -156,10 +169,10 @@ 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 -->
+ * <!-- 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
@@ -174,6 +187,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* <!-- 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
@@ -188,6 +202,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* <!-- 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
@@ -202,6 +217,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* <!-- 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
@@ -216,6 +232,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* <!-- 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
@@ -230,6 +247,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* <!-- 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
@@ -244,6 +262,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* <!-- 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
@@ -258,6 +277,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* <!-- 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
@@ -269,10 +289,10 @@ 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 -->
+ * <!-- 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
@@ -287,6 +307,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* <!-- 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
@@ -297,9 +318,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc --> This
+ * 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 90ca4e2..0ba62a9 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
@@ -6,10 +6,12 @@
*/
package org.eclipse.emf.cdo.tests.model1.util;
+import org.eclipse.emf.cdo.tests.model1.Address;
import org.eclipse.emf.cdo.tests.model1.Category;
import org.eclipse.emf.cdo.tests.model1.Company;
import org.eclipse.emf.cdo.tests.model1.Customer;
import org.eclipse.emf.cdo.tests.model1.Model1Package;
+import org.eclipse.emf.cdo.tests.model1.Order;
import org.eclipse.emf.cdo.tests.model1.OrderDetail;
import org.eclipse.emf.cdo.tests.model1.Product;
import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
@@ -20,7 +22,6 @@ 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
@@ -29,22 +30,23 @@ import org.eclipse.emf.cdo.tests.model1.*;
* 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 --> <!--
+ * Creates an instance of the switch. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @generated
*/
public Model1Switch()
@@ -56,10 +58,12 @@ 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 --> <!--
+ * 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.
+ *
+ * @return the first non-null result returned by a <code>caseXXX</code>
+ * call.
* @generated
*/
public T doSwitch(EObject theEObject)
@@ -68,10 +72,12 @@ 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 --> <!--
+ * 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.
+ *
+ * @return the first non-null result returned by a <code>caseXXX</code>
+ * call.
* @generated
*/
protected T doSwitch(EClass theEClass, EObject theEObject)
@@ -83,110 +89,125 @@ 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 --> <!--
+ * 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.
+ *
+ * @return the first non-null result returned by a <code>caseXXX</code>
+ * call.
* @generated
*/
protected T doSwitch(int classifierID, EObject theEObject)
{
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 -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
+ * <!-- 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.
* @return the result of interpreting the object as an instance of '<em>Address</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -200,7 +221,9 @@ public class Model1Switch<T>
* 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
@@ -214,7 +237,9 @@ public class Model1Switch<T>
* 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
@@ -228,7 +253,9 @@ public class Model1Switch<T>
* 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
@@ -242,7 +269,9 @@ public class Model1Switch<T>
* 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
@@ -256,7 +285,9 @@ public class Model1Switch<T>
* 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
@@ -270,7 +301,9 @@ public class Model1Switch<T>
* 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
@@ -284,7 +317,9 @@ public class Model1Switch<T>
* 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
@@ -296,11 +331,11 @@ public class Model1Switch<T>
/**
* 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.
+ * <!-- 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.
* @return the result of interpreting the object as an instance of '<em>Order</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -314,7 +349,9 @@ public class Model1Switch<T>
* 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
@@ -329,7 +366,9 @@ public class Model1Switch<T>
* <!-- 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.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java
index 8e0644b..203cf97 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java
@@ -6,18 +6,21 @@
*/
package org.eclipse.emf.cdo.tests.model1.validation;
-
/**
- * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Address}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.cdo.tests.model1.Address}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's
+ * code generator can be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
*/
public interface AddressValidator
{
boolean validate();
boolean validateName(String value);
+
boolean validateStreet(String value);
+
boolean validateCity(String value);
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java
index cd2f035..222e9c9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java
@@ -11,10 +11,12 @@ import org.eclipse.emf.cdo.tests.model1.OrderDetail;
import org.eclipse.emf.common.util.EList;
/**
- * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Order}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.cdo.tests.model1.Order}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's
+ * code generator can be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
*/
public interface OrderValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index 3c22ad1..3d200dc 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -22,7 +22,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.emf.cdo.ui"; //$NON-NLS-1$
@@ -32,11 +32,7 @@ public final class OM
public static final OMLogger LOG = BUNDLE.logger();
- private OM()
- {
- }
-
- public static void start() throws Exception
+ static void start() throws Exception
{
IRepositoryManager.INSTANCE.addRepository("repo1", new NOOPStore());
// Properties properties = BUNDLE.getConfigProperties();
@@ -58,14 +54,10 @@ public final class OM
// }
}
- public static void stop() throws Exception
- {
- }
-
/**
* @author Eike Stepper
*/
- public static class Activator extends OSGiActivator
+ static class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java
index 8b3afff..14ea7f9 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
-
import org.eclipse.jface.viewers.TreeViewer;
import java.util.HashSet;
diff --git a/plugins/org.eclipse.emf.cdo/.options b/plugins/org.eclipse.emf.cdo/.options
index 728617c..cc70f6d 100644
--- a/plugins/org.eclipse.emf.cdo/.options
+++ b/plugins/org.eclipse.emf.cdo/.options
@@ -1,5 +1,6 @@
org.eclipse.emf.cdo/debug = true
org.eclipse.emf.cdo/debug.util = true
+org.eclipse.emf.cdo/debug.model = true
org.eclipse.emf.cdo/debug.repository = true
org.eclipse.emf.cdo/debug.session = true
org.eclipse.emf.cdo/debug.adapter = true
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index fa73a18..22a78c5 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.internal.cdo.CDOObjectImpl;
import org.eclipse.emf.internal.cdo.CDOViewImpl;
-import org.eclipse.emf.internal.cdo.bundle.CDO;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import java.io.IOException;
import java.io.InputStream;
@@ -66,7 +66,7 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
/**
* @ADDED
*/
- private static final ContextTracer TRACER = new ContextTracer(CDO.DEBUG_OBJECT, CDOResourceImpl.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OBJECT, CDOResourceImpl.class);
/**
* @ADDED
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index 4555172..de4291d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.EStoreEObjectImpl;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.Resource.Internal;
-import org.eclipse.emf.internal.cdo.bundle.CDO;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.emf.internal.cdo.util.EMFUtil;
/**
@@ -37,7 +37,7 @@ import org.eclipse.emf.internal.cdo.util.EMFUtil;
*/
public class CDOObjectImpl extends EStoreEObjectImpl implements CDOObject
{
- private static final ContextTracer TRACER = new ContextTracer(CDO.DEBUG_OBJECT, CDOObjectImpl.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OBJECT, CDOObjectImpl.class);
private CDOID id;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java
index 3353edb..4136fe0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.net4j.internal.util.factory.Factory;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.internal.cdo.bundle.CDO;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.Path;
*/
public class CDOSessionFactory extends Factory<CDOSession>
{
- public static final String SESSION_GROUP = CDO.BUNDLE_ID + ".sessions";
+ public static final String SESSION_GROUP = OM.BUNDLE_ID + ".sessions";
public CDOSessionFactory()
{
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 3b6a487..132b7ae 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
@@ -35,7 +35,7 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.internal.cdo.bundle.CDO;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol;
import org.eclipse.emf.internal.cdo.protocol.OpenSessionRequest;
import org.eclipse.emf.internal.cdo.protocol.OpenSessionResult;
@@ -53,7 +53,7 @@ import java.util.Set;
public class CDOSessionImpl extends Lifecycle implements CDOSession
{
@SuppressWarnings("unused")
- private static final ContextTracer TRACER = new ContextTracer(CDO.DEBUG_SESSION, CDOSessionImpl.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SESSION, CDOSessionImpl.class);
private int sessionID;
@@ -252,7 +252,7 @@ public class CDOSessionImpl extends Lifecycle implements CDOSession
}
catch (RuntimeException ex)
{
- CDO.LOG.error(ex);
+ OM.LOG.error(ex);
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index c0b2780..f6fe3cb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -12,7 +12,7 @@ import org.eclipse.emf.cdo.util.ServerException;
import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.internal.cdo.bundle.CDO;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult;
import org.eclipse.emf.internal.cdo.protocol.ResourceIDRequest;
@@ -26,7 +26,7 @@ public final class CDOStateMachine
// @Singleton
public static final CDOStateMachine INSTANCE = new CDOStateMachine();
- private static final ContextTracer TRACER = new ContextTracer(CDO.DEBUG_OBJECT, CDOStateMachine.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OBJECT, CDOStateMachine.class);
private static Transition IGNORE;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
index 1ed7cab..8822eeb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.InternalEObject.EStore;
-import org.eclipse.emf.internal.cdo.bundle.CDO;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.emf.internal.cdo.util.EMFUtil;
/**
@@ -36,7 +36,7 @@ public final class CDOStore implements EStore
// @Singleton
public static final CDOStore INSTANCE = new CDOStore();
- private static final ContextTracer TRACER = new ContextTracer(CDO.DEBUG_OBJECT, CDOStore.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OBJECT, CDOStore.class);
private CDOStore()
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
index 87bd7e6..483fe64 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java
@@ -22,7 +22,7 @@ import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.internal.cdo.bundle.CDO;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.emf.internal.cdo.protocol.CommitTransactionRequest;
import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult;
import org.eclipse.emf.internal.cdo.protocol.RegisterPackagesRequest;
@@ -39,7 +39,7 @@ import java.util.Set;
*/
public class CDOTransactionImpl
{
- private static final ContextTracer TRACER = new ContextTracer(CDO.DEBUG_TRANSCTION, CDOTransactionImpl.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_TRANSCTION, CDOTransactionImpl.class);
private static final long INITIAL_TEMPORARY_ID = -1L;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 90fddca..df69a95 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -37,7 +37,7 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.internal.cdo.bundle.CDO;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult;
import org.eclipse.emf.internal.cdo.protocol.ResourcePathRequest;
@@ -52,7 +52,7 @@ import java.util.Set;
*/
public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier implements CDOView, Adapter.Internal
{
- private static final ContextTracer TRACER = new ContextTracer(CDO.DEBUG_VIEW, CDOViewImpl.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_VIEW, CDOViewImpl.class);
private int id;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java
index b961395..a6f8033 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java
@@ -40,7 +40,7 @@ public final class Activator extends EMFPlugin
public void start(BundleContext context) throws Exception
{
super.start(context);
- CDO.BUNDLE.setBundleContext(context);
+ OM.BUNDLE.setBundleContext(context);
// EMFUtil.addModelInfos(EMFUtil.PACKAGE_MANAGER);
// IExtensionRegistry registry = Platform.getExtensionRegistry();
// IConfigurationElement[] elements =
@@ -71,7 +71,7 @@ public final class Activator extends EMFPlugin
// registry.removeRegistryChangeListener(this);
// EMFUtil.removeModelInfos(EMFUtil.PACKAGE_MANAGER);
plugin = null;
- CDO.BUNDLE.setBundleContext(null);
+ OM.BUNDLE.setBundleContext(null);
super.stop(context);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/CDO.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
index d85ad54..d512011 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/CDO.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
@@ -18,16 +18,18 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class CDO
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.emf.cdo"; //$NON-NLS-1$
- public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, CDO.class);
+ public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
public static final OMTracer DEBUG_UTIL = DEBUG.tracer("util"); //$NON-NLS-1$
+ public static final OMTracer DEBUG_MODEL = DEBUG.tracer("model"); //$NON-NLS-1$
+
public static final OMTracer DEBUG_REPOSITORY = DEBUG.tracer("repository"); //$NON-NLS-1$
public static final OMTracer DEBUG_SESSION = DEBUG.tracer("session"); //$NON-NLS-1$
@@ -45,8 +47,4 @@ public final class CDO
public static final OMLogger LOG = BUNDLE.logger();
public static final String PERSISTENT_PACKAGE_EXT_POINT = "persistent_package";
-
- private CDO()
- {
- }
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
index bda1163..9720868 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.internal.cdo.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.internal.protocol.revision.CDOReferenceConverter;
import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.protocol.CDOID;
@@ -37,8 +37,7 @@ import java.util.Map;
*/
public class CommitTransactionRequest extends CDOClientRequest<CommitTransactionResult>
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL,
- CommitTransactionRequest.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, CommitTransactionRequest.class);
private CDOTransactionImpl transaction;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
index 61bfe85..23642a1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.internal.cdo.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
@@ -30,8 +30,7 @@ import java.util.Set;
*/
public class InvalidationIndication extends Indication
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL,
- InvalidationIndication.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, InvalidationIndication.class);
public InvalidationIndication()
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java
index 622d3ad..c676443 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.internal.cdo.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
@@ -28,7 +28,7 @@ import java.io.IOException;
*/
public class LoadObjectRequest extends CDOClientRequest<CDORevisionImpl>
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, LoadObjectRequest.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, LoadObjectRequest.class);
private CDOID id;
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 07831f3..5c3ec1a 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,7 +10,7 @@
**************************************************************************/
package org.eclipse.emf.internal.cdo.protocol;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.util.ServerException;
@@ -30,7 +30,7 @@ import java.util.Set;
*/
public class OpenSessionRequest extends RequestWithConfirmation<OpenSessionResult>
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, OpenSessionRequest.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, OpenSessionRequest.class);
private String repositoryName;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java
index 9184cb6..4718447 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.internal.cdo.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
@@ -27,7 +27,7 @@ import java.io.IOException;
*/
public class ResourceIDRequest extends CDOClientRequest<CDOID>
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, ResourceIDRequest.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, ResourceIDRequest.class);
private String path;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java
index d34a4c0..ed6a572 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.internal.cdo.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
@@ -27,7 +27,7 @@ import java.io.IOException;
*/
public class ResourcePathRequest extends CDOClientRequest<String>
{
- private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, ResourcePathRequest.class);
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, ResourcePathRequest.class);
private CDOID id;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java
index e97180e..868ce0c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java
@@ -11,7 +11,7 @@
package org.eclipse.emf.internal.cdo.util;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
+import org.eclipse.emf.cdo.internal.protocol.bundle.OM;
import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
import org.eclipse.emf.cdo.internal.protocol.model.CDOClassRefImpl;
@@ -46,7 +46,7 @@ import java.util.List;
public final class EMFUtil
{
@SuppressWarnings("unused")
- private static final ContextTracer TRACER = new ContextTracer(CDOProtocol.DEBUG_MODEL, EMFUtil.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_MODEL, EMFUtil.class);
private EMFUtil()
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java
index f122c8e..4603b45 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java
@@ -10,8 +10,6 @@
**************************************************************************/
package org.eclipse.emf.internal.cdo.util;
-import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
-
import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.ecore.EClass;
@@ -20,7 +18,7 @@ import org.eclipse.emf.ecore.EOperation;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EParameter;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.internal.cdo.bundle.CDO;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import java.util.Collection;
import java.util.Collections;
@@ -35,7 +33,7 @@ import java.util.Set;
*/
public final class PackageClosure
{
- private static final ContextTracer TRACER = new ContextTracer(CDOProtocol.DEBUG_MODEL, PackageClosure.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_MODEL, PackageClosure.class);
private static final Set<EPackage> EMPTY_CLOSURE = Collections.emptySet();
@@ -103,7 +101,7 @@ public final class PackageClosure
else
{
String msg = "Package == null for " + eClass.getName();
- CDO.LOG.warn(msg);
+ OM.LOG.warn(msg);
if (TRACER.isEnabled())
{
TRACER.trace(msg);
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
index fc68f1e..5577ec6 100644
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.db.derby"; //$NON-NLS-1$
@@ -31,14 +31,10 @@ public final class OM
public static final OMLogger LOG = BUNDLE.logger();
- private OM()
- {
- }
-
/**
* @author Eike Stepper
*/
- public static final class Activator extends OSGiActivator
+ static final class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
index b135076..9c38298 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
@@ -27,7 +27,7 @@ import org.eclipse.core.runtime.Platform;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.db"; //$NON-NLS-1$
@@ -41,11 +41,7 @@ public final class OM
public static final String EXT_POINT = "dbAdapters";
- private OM()
- {
- }
-
- public static void start() throws Exception
+ static void start() throws Exception
{
IExtensionRegistry registry = Platform.getExtensionRegistry();
IConfigurationElement[] elements = registry.getConfigurationElementsFor(BUNDLE_ID, EXT_POINT);
@@ -78,7 +74,7 @@ public final class OM
/**
* @author Eike Stepper
*/
- public static final class Activator extends OSGiActivator
+ static final class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
index e43907a..7e40557 100644
--- a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.net4j.debug; singleton:=true
Bundle-Version: 0.8.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.net4j.internal.debug.bundle.Activator
+Bundle-Activator: org.eclipse.net4j.internal.debug.bundle.OM$Activator
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/Activator.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/Activator.java
deleted file mode 100644
index f80c89b..0000000
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/Activator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2007 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.net4j.internal.debug.bundle;
-
-import org.eclipse.net4j.internal.debug.RemoteTraceManager;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Eike Stepper
- */
-public class Activator extends AbstractUIPlugin
-{
- public static final String PLUGIN_ID = "org.eclipse.net4j.debug";
-
- private static Activator plugin;
-
- public Activator()
- {
- plugin = this;
- }
-
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- RemoteTraceManager.INSTANCE.activate();
- }
-
- public void stop(BundleContext context) throws Exception
- {
- RemoteTraceManager.INSTANCE.deactivate();
- plugin = null;
- super.stop(context);
- }
-
- public static Activator getDefault()
- {
- return plugin;
- }
-
- public static ImageDescriptor getImageDescriptor(String path)
- {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-}
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
new file mode 100644
index 0000000..aaac1c6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/bundle/OM.java
@@ -0,0 +1,53 @@
+/***************************************************************************
+ * Copyright (c) 2004-2007 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.net4j.internal.debug.bundle;
+
+import org.eclipse.net4j.internal.debug.RemoteTraceManager;
+import org.eclipse.net4j.util.om.OMBundle;
+import org.eclipse.net4j.util.om.OMPlatform;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
+
+/**
+ * @author Eike Stepper
+ */
+public abstract class OM
+{
+ public static final String BUNDLE_ID = "org.eclipse.net4j.debug"; //$NON-NLS-1$
+
+ public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
+
+ public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
+
+ public static final OMLogger LOG = BUNDLE.logger();
+
+ static void start() throws Exception
+ {
+ RemoteTraceManager.INSTANCE.activate();
+ }
+
+ static void stop() throws Exception
+ {
+ RemoteTraceManager.INSTANCE.deactivate();
+ }
+
+ /**
+ * @author Eike Stepper
+ */
+ static final class Activator extends OSGiActivator
+ {
+ public Activator()
+ {
+ super(BUNDLE);
+ }
+ }
+}
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
index 8b92fed..151787f 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.jms.admin"; //$NON-NLS-1$
@@ -31,14 +31,10 @@ public final class OM
public static final OMLogger LOG = BUNDLE.logger();
- private OM()
- {
- }
-
/**
* @author Eike Stepper
*/
- public static final class Activator extends OSGiActivator
+ static final class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
index 6f51715..f4ccdbee 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.jms.server.jdbc"; //$NON-NLS-1$
@@ -29,14 +29,10 @@ public final class OM
public static final OMLogger LOG = BUNDLE.logger();
- private OM()
- {
- }
-
/**
* @author Eike Stepper
*/
- public static final class Activator extends OSGiActivator
+ static final class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
index 58feb7f..199004f 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
@@ -20,7 +20,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.jms.server"; //$NON-NLS-1$
@@ -34,16 +34,12 @@ public final class OM
public static final OMLogger LOG = BUNDLE.logger();
- private OM()
- {
- }
-
- public static void start() throws Exception
+ static void start() throws Exception
{
Server.INSTANCE.activate();
}
- public static void stop() throws Exception
+ static void stop() throws Exception
{
Server.INSTANCE.deactivate();
}
@@ -51,7 +47,7 @@ public final class OM
/**
* @author Eike Stepper
*/
- public static final class Activator extends OSGiActivator
+ static final class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
index 54f3670..8ce5f00 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
@@ -279,11 +279,7 @@ public class ConnectionImpl extends Lifecycle implements Connection, IContainer<
{
for (SessionImpl session : getSessions())
{
- Exception ex = session.deactivate();
- if (ex != null)
- {
- OM.LOG.error(ex);
- }
+ session.deactivate();
}
stopped = true;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
index cfc33a8..6e2a570 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
@@ -316,11 +316,7 @@ public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Ses
public void close()
{
- Exception ex = deactivate();
- if (ex != null)
- {
- OM.LOG.error(ex);
- }
+ deactivate();
}
public void run()
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
index dd3ce49..908d02c 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
@@ -21,7 +21,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.jms"; //$NON-NLS-1$
@@ -33,11 +33,7 @@ public final class OM
public static final OMLogger LOG = BUNDLE.logger();
- private OM()
- {
- }
-
- public static void start() throws Exception
+ static void start() throws Exception
{
JMSUtil.setTransportContainer(IPluginTransportContainer.INSTANCE);
}
@@ -45,7 +41,7 @@ public final class OM
/**
* @author Eike Stepper
*/
- public static final class Activator extends OSGiActivator
+ static final class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
index 47b0bb1..7f0d37e 100644
--- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.net4j.jvm;singleton:=true
Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.net4j.internal.jvm.bundle.JVM$Activator
+Bundle-Activator: org.eclipse.net4j.internal.jvm.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;resolution:=optional,
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
index f59abff..41129f9 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/OM.java
@@ -19,24 +19,20 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class JVM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.jvm"; //$NON-NLS-1$
- public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, JVM.class);
+ public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
public static final OMLogger LOG = BUNDLE.logger();
- private JVM()
- {
- }
-
/**
* @author Eike Stepper
*/
- public static class Activator extends OSGiActivator
+ static class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
index cbe248a..cd7e871 100644
--- a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.net4j.tcp;singleton:=true
Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.net4j.internal.tcp.bundle.TCP$Activator
+Bundle-Activator: org.eclipse.net4j.internal.tcp.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;resolution:=optional,
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
index e314d71..b68b4da 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
@@ -19,24 +19,20 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class TCP
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.tcp"; //$NON-NLS-1$
- public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, TCP.class);
+ public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
public static final OMLogger LOG = BUNDLE.logger();
- private TCP()
- {
- }
-
/**
* @author Eike Stepper
*/
- public static class Activator extends OSGiActivator
+ static class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
index 3b9f6ec..2cb45b5 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
@@ -21,7 +21,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.ui"; //$NON-NLS-1$
@@ -35,14 +35,10 @@ public final class OM
public static final OMPreference<Boolean> PREF_ACTIVE = PREFS.init("active", false);
- private OM()
- {
- }
-
/**
* @author Eike Stepper
*/
- public static class Activator extends OSGiActivator
+ static class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
index c4d859d..4b76a98 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
@@ -25,7 +25,7 @@ import org.osgi.framework.BundleContext;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.util"; //$NON-NLS-1$
@@ -49,10 +49,6 @@ public final class OM
private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OM, OM.class);
- private OM()
- {
- }
-
/**
* @author Eike Stepper
*/
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java
index 66f1b7f..e23aae1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java
@@ -71,6 +71,7 @@ public class Lifecycle extends Notifier implements ILifecycle
}
catch (Exception ex)
{
+ OM.LOG.error(ex);
if (TRACER.isEnabled())
{
TRACER.trace(ex);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
index ac0a944..bf2bfb4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
@@ -12,7 +12,6 @@ package org.eclipse.net4j.util.om.trace;
import org.eclipse.net4j.util.om.OMBundle;
-
/**
* @author Eike Stepper
*/
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
index 439caad..20a8398 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
@@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class OM
+public abstract class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j"; //$NON-NLS-1$
@@ -45,11 +45,7 @@ public final class OM
public static final OMLogger LOG = BUNDLE.logger();
- private OM()
- {
- }
-
- public static void stop() throws Exception
+ static void stop() throws Exception
{
PluginTransportContainer.dispose();
}
@@ -57,7 +53,7 @@ public final class OM
/**
* @author Eike Stepper
*/
- public static final class Activator extends OSGiActivator
+ static final class Activator extends OSGiActivator
{
public Activator()
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java
index 7e5f0aa..385a700 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java
@@ -10,7 +10,6 @@
**************************************************************************/
package org.eclipse.net4j;
-
/**
* An event that is fired by an {@link IConnector} to indicate that its state
* has changed.