summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-17 04:33:14 (EDT)
committerEike Stepper2007-08-17 04:33:14 (EDT)
commitc5fee94fa2cafa9a0da36d885b11aae216471cd8 (patch)
tree65afb0ca31b83c59e03d88c18a38cc4b3116e60a
parentc3b4dca8a03fe23a6614006a176fa55b45a99507 (diff)
downloadcdo-c5fee94fa2cafa9a0da36d885b11aae216471cd8.zip
cdo-c5fee94fa2cafa9a0da36d885b11aae216471cd8.tar.gz
cdo-c5fee94fa2cafa9a0da36d885b11aae216471cd8.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java6
3 files changed, 10 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
index 4bf69d6..f3d26e6 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
@@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.protocol.model.CDOClass;
import org.eclipse.emf.cdo.protocol.model.CDOFeature;
import org.eclipse.net4j.db.IDBField;
-import org.eclipse.net4j.db.IDBSchema;
import org.eclipse.net4j.db.IDBTable;
import java.util.Set;
@@ -34,20 +33,20 @@ public class HorizontalMappingStrategy extends MappingStrategy
}
@Override
- protected IDBTable map(IDBSchema schema, CDOClass cdoClass, Set<IDBTable> affectedTables)
+ protected IDBTable map(CDOClass cdoClass, Set<IDBTable> affectedTables)
{
if (cdoClass.isAbstract())
{
return null;
}
- IDBTable table = schema.addTable(cdoClass.getName());
+ IDBTable table = getSchema().addTable(cdoClass.getName());
initTable(table, true);
return table;
}
@Override
- protected IDBField map(IDBSchema schema, CDOClass cdoClass, CDOFeature cdoFeature, Set<IDBTable> affectedTables)
+ protected IDBField map(CDOClass cdoClass, CDOFeature cdoFeature, Set<IDBTable> affectedTables)
{
if (cdoClass.isAbstract())
{
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 4d9597f..97cdcd0 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
@@ -113,7 +113,7 @@ public abstract class MappingStrategy implements IMappingStrategy
for (CDOClass cdoClass : cdoPackage.getClasses())
{
cdoClasses.add(cdoClass);
- IDBTable table = map(schema, cdoClass, affectedTables);
+ IDBTable table = map(cdoClass, affectedTables);
if (table != null)
{
((DBClassInfo)cdoClass.getServerInfo()).setTable(table);
@@ -136,7 +136,7 @@ public abstract class MappingStrategy implements IMappingStrategy
for (CDOFeature cdoFeature : cdoClass.getAllFeatures())
{
- IDBField field = map(schema, cdoClass, cdoFeature, affectedTables);
+ IDBField field = map(cdoClass, cdoFeature, affectedTables);
if (field != null)
{
((DBFeatureInfo)cdoFeature.getServerInfo()).setField(field);
@@ -158,7 +158,7 @@ public abstract class MappingStrategy implements IMappingStrategy
* tables. There is no need to add the returned table to this set of
* affected tables. The caller takes care of that.
*/
- protected abstract IDBTable map(IDBSchema schema, CDOClass cdoClass, Set<IDBTable> affectedTables);
+ protected abstract IDBTable map(CDOClass cdoClass, Set<IDBTable> affectedTables);
/**
* @param affectedTables
@@ -166,8 +166,7 @@ public abstract class MappingStrategy implements IMappingStrategy
* tables. There is no need to add the table of the returned field to
* this set of affected tables. The caller takes care of that.
*/
- protected abstract IDBField map(IDBSchema schema, CDOClass cdoClass, CDOFeature cdoFeature,
- Set<IDBTable> affectedTables);
+ protected abstract IDBField map(CDOClass cdoClass, CDOFeature cdoFeature, Set<IDBTable> affectedTables);
protected IDBSchema createSchema()
{
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java
index 167319e..a2d55af 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java
@@ -43,20 +43,20 @@ public class VerticalMappingStrategy extends MappingStrategy
}
@Override
- protected IDBTable map(IDBSchema schema, CDOClass cdoClass, Set<IDBTable> affectedTables)
+ protected IDBTable map(CDOClass cdoClass, Set<IDBTable> affectedTables)
{
if (cdoClass.isRoot())
{
return null;
}
- IDBTable table = schema.addTable(cdoClass.getName());
+ IDBTable table = getSchema().addTable(cdoClass.getName());
initTable(table, false);
return table;
}
@Override
- protected IDBField map(IDBSchema schema, CDOClass cdoClass, CDOFeature cdoFeature, Set<IDBTable> affectedTables)
+ protected IDBField map(CDOClass cdoClass, CDOFeature cdoFeature, Set<IDBTable> affectedTables)
{
if (cdoFeature.getContainingClass() != cdoClass)
{