Made changes to the converter API due to JDev dependency
diff --git a/tools/org.eclipse.persistence.tools.mapping.tests/src/org/eclipse/persistence/tools/mapping/tests/dom/orm/ConverterTests.java b/tools/org.eclipse.persistence.tools.mapping.tests/src/org/eclipse/persistence/tools/mapping/tests/dom/orm/ConverterTests.java
index 183e73d..343b201 100644
--- a/tools/org.eclipse.persistence.tools.mapping.tests/src/org/eclipse/persistence/tools/mapping/tests/dom/orm/ConverterTests.java
+++ b/tools/org.eclipse.persistence.tools.mapping.tests/src/org/eclipse/persistence/tools/mapping/tests/dom/orm/ConverterTests.java
@@ -40,7 +40,9 @@
return new ChildListNodeTester<T, ExternalClassConverter, String>() {
@Override
public ExternalClassConverter addChild(T form, String value) {
- return form.addConverter(value);
+ ExternalClassConverter converter = form.addConverter();
+ converter.setName(value);
+ return converter;
}
@Override
public ExternalClassConverter getChild(T form, int index) {
@@ -93,7 +95,9 @@
return new ChildListNodeTester<T, ExternalObjectTypeConverter, String>() {
@Override
public ExternalObjectTypeConverter addChild(T form, String value) {
- return form.addObjectTypeConverter(value);
+ ExternalObjectTypeConverter converter = form.addObjectTypeConverter();
+ converter.setName(value);
+ return converter;
}
@Override
public ExternalObjectTypeConverter getChild(T form, int index) {
@@ -150,7 +154,9 @@
return new ChildListNodeTester<T, ExternalStructConverter, String>() {
@Override
public ExternalStructConverter addChild(T form, String value) {
- return form.addStructConverter(value);
+ ExternalStructConverter converter = form.addStructConverter();
+ converter.setName(value);
+ return converter;
}
@Override
public ExternalStructConverter getChild(T form, int index) {
@@ -203,7 +209,9 @@
return new ChildListNodeTester<T, ExternalTypeConverter, String>() {
@Override
public ExternalTypeConverter addChild(T form, String value) {
- return form.addTypeConverter(value);
+ ExternalTypeConverter converter = form.addTypeConverter();
+ converter.setName(value);
+ return converter;
}
@Override
public ExternalTypeConverter getChild(T form, int index) {
diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalConverterProvider.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalConverterProvider.java
index 4916bfb..f602682 100644
--- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalConverterProvider.java
+++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalConverterProvider.java
@@ -31,22 +31,22 @@
/**
* Adds a converter to this entity.
*/
- ExternalClassConverter addConverter(String name);
+ ExternalClassConverter addConverter();
/**
* Adds a object type converter to this entity.
*/
- ExternalObjectTypeConverter addObjectTypeConverter(String name);
+ ExternalObjectTypeConverter addObjectTypeConverter();
/**
* Adds a struct converter to this entity.
*/
- ExternalStructConverter addStructConverter(String name);
+ ExternalStructConverter addStructConverter();
/**
* Adds a type converter to this entity.
*/
- ExternalTypeConverter addTypeConverter(String name);
+ ExternalTypeConverter addTypeConverter();
/**
* Returns a list of the converters defined for this entity.
diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalConvertibleMapping.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalConvertibleMapping.java
index 5adce71..12d5a39 100644
--- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalConvertibleMapping.java
+++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalConvertibleMapping.java
@@ -37,7 +37,7 @@
/**
* Sets the mapping to use this converter for its value converter.
*/
- ExternalConverter addConverter();
+ ExternalClassConverter addConverter();
/**
* Sets the mapping to use this object type converter for its value converter.
diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/Embeddable.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/Embeddable.java
index 263a0e8..bb0568a 100644
--- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/Embeddable.java
+++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/Embeddable.java
@@ -162,10 +162,9 @@
* {@inheritDoc}
*/
@Override
- public final ExternalClassConverter addConverter(String name) {
+ public final ExternalClassConverter addConverter() {
ClassConverter converter = buildConverter(-1);
converter.addSelf();
- converter.setName(name);
return converter;
}
@@ -257,10 +256,9 @@
* {@inheritDoc}
*/
@Override
- public final ExternalObjectTypeConverter addObjectTypeConverter(String name) {
+ public final ExternalObjectTypeConverter addObjectTypeConverter() {
ObjectTypeConverter converter = buildObjectTypeConverter(-1);
converter.addSelf();
- converter.setName(name);
return converter;
}
@@ -302,10 +300,9 @@
* {@inheritDoc}
*/
@Override
- public final ExternalStructConverter addStructConverter(String name) {
+ public final ExternalStructConverter addStructConverter() {
StructConverter converter = buildStructConverter(-1);
converter.addSelf();
- converter.setName(name);
return converter;
}
@@ -324,10 +321,9 @@
* {@inheritDoc}
*/
@Override
- public final ExternalTypeConverter addTypeConverter(String name) {
+ public final ExternalTypeConverter addTypeConverter() {
TypeConverter converter = buildTypeConverter(-1);
converter.addSelf();
- converter.setName(name);
return converter;
}
diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java
index e6095d8..7515414 100644
--- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java
+++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java
@@ -75,10 +75,9 @@
* {@inheritDoc}
*/
@Override
- public ExternalClassConverter addConverter(String name) {
+ public ExternalClassConverter addConverter() {
ClassConverter converter = buildConverter(-1);
converter.addSelf();
- converter.setName(name);
return converter;
}
@@ -162,10 +161,9 @@
* {@inheritDoc}
*/
@Override
- public ExternalObjectTypeConverter addObjectTypeConverter(String name) {
+ public ExternalObjectTypeConverter addObjectTypeConverter() {
ObjectTypeConverter converter = buildObjectTypeConverter(-1);
converter.addSelf();
- converter.setName(name);
return converter;
}
@@ -221,10 +219,9 @@
* {@inheritDoc}
*/
@Override
- public ExternalStructConverter addStructConverter(String name) {
+ public ExternalStructConverter addStructConverter() {
StructConverter converter = buildStructConverter(-1);
converter.addSelf();
- converter.setName(name);
return converter;
}
@@ -243,10 +240,9 @@
* {@inheritDoc}
*/
@Override
- public ExternalTypeConverter addTypeConverter(String name) {
+ public ExternalTypeConverter addTypeConverter() {
TypeConverter converter = buildTypeConverter(-1);
converter.addSelf();
- converter.setName(name);
return converter;
}
