summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-23 10:06:43 (EDT)
committerEike Stepper2007-08-23 10:06:43 (EDT)
commit87be62c167c06842af9641e17adccb1e126790f0 (patch)
tree368841644fd3ac00ca5a10a944df0ade6c3089a4
parenta542dc06b9735fda7e2f03a6f33f7e36d2498e2a (diff)
downloadcdo-87be62c167c06842af9641e17adccb1e126790f0.zip
cdo-87be62c167c06842af9641e17adccb1e126790f0.tar.gz
cdo-87be62c167c06842af9641e17adccb1e126790f0.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMapping.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java4
5 files changed, 18 insertions, 23 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java
index b95b7db..1508d1e 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java
@@ -12,12 +12,10 @@ package org.eclipse.emf.cdo.server.db;
import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOFeature;
import org.eclipse.net4j.db.IDBSchema;
import org.eclipse.net4j.db.IDBTable;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -40,10 +38,6 @@ public interface IMappingStrategy
public IMapping getMapping(CDOClass cdoClass);
- public List<IAttributeMapping> getAttributeMappings(CDOFeature[] features);
-
- public List<IReferenceMapping> getReferenceMappings(CDOFeature[] features);
-
/**
* @return A collection of the affected tables.
*/
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMapping.java
index 148d9ec..a4e7350 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMapping.java
@@ -41,8 +41,8 @@ public class HorizontalMapping extends FullInfoMapping
{
super(mappingStrategy, cdoClass);
CDOFeature[] features = cdoClass.getAllFeatures();
- attributeMappings = mappingStrategy.getAttributeMappings(features);
- referenceMappings = mappingStrategy.getReferenceMappings(features);
+ attributeMappings = createAttributeMappings(features);
+ referenceMappings = createReferenceMappings(features);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java
index 889c8ab..bdeea62 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java
@@ -11,12 +11,16 @@
package org.eclipse.emf.cdo.server.internal.db;
import org.eclipse.emf.cdo.protocol.model.CDOClass;
+import org.eclipse.emf.cdo.protocol.model.CDOFeature;
+import org.eclipse.emf.cdo.server.db.IAttributeMapping;
import org.eclipse.emf.cdo.server.db.IMapping;
import org.eclipse.emf.cdo.server.db.IMappingStrategy;
+import org.eclipse.emf.cdo.server.db.IReferenceMapping;
import org.eclipse.net4j.db.IDBTable;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
/**
@@ -50,4 +54,14 @@ public abstract class Mapping implements IMapping
{
return affectedTables;
}
+
+ public List<IAttributeMapping> createAttributeMappings(CDOFeature[] features)
+ {
+ return null;
+ }
+
+ public List<IReferenceMapping> createReferenceMappings(CDOFeature[] features)
+ {
+ return null;
+ }
}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
index 34b37e2..c3af05f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
@@ -13,11 +13,9 @@ package org.eclipse.emf.cdo.server.internal.db;
import org.eclipse.emf.cdo.protocol.model.CDOClass;
import org.eclipse.emf.cdo.protocol.model.CDOFeature;
import org.eclipse.emf.cdo.protocol.model.CDOType;
-import org.eclipse.emf.cdo.server.db.IAttributeMapping;
import org.eclipse.emf.cdo.server.db.IDBStore;
import org.eclipse.emf.cdo.server.db.IMapping;
import org.eclipse.emf.cdo.server.db.IMappingStrategy;
-import org.eclipse.emf.cdo.server.db.IReferenceMapping;
import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
import org.eclipse.net4j.db.DBException;
@@ -30,7 +28,6 @@ import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.ImplementationError;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
@@ -104,16 +101,6 @@ public abstract class MappingStrategy implements IMappingStrategy
return mapping;
}
- public List<IAttributeMapping> getAttributeMappings(CDOFeature[] features)
- {
- return null;
- }
-
- public List<IReferenceMapping> getReferenceMappings(CDOFeature[] features)
- {
- return null;
- }
-
protected abstract IMapping createMapping(CDOClass cdoClass);
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java
index 1069766..51dc913 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java
@@ -58,8 +58,8 @@ public class VerticalMapping extends IDInfoMapping
}
CDOFeature[] features = cdoClass.getFeatures();
- attributeMappings = mappingStrategy.getAttributeMappings(features);
- referenceMappings = mappingStrategy.getReferenceMappings(features);
+ attributeMappings = createAttributeMappings(features);
+ referenceMappings = createReferenceMappings(features);
}
public List<IMapping> getSuperMappings()