294899 - refactoring in an effort to support default Cacheable again
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXmlContextNodeFactory.java
index 0dfeebe..5cbe156 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXmlContextNodeFactory.java
@@ -54,4 +54,9 @@
JarFile buildJarFile(JarFileRef parent, JavaResourcePackageFragmentRoot jarResourcePackageFragmentRoot);
PersistenceUnit.Property buildProperty(PersistenceUnit parent, XmlProperty property);
+
+ PersistenceUnitProperties buildConnection(PersistenceUnit parent);
+
+ PersistenceUnitProperties buildOptions(PersistenceUnit parent);
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXmlContextNodeFactory.java
index ed50092..64b67b6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXmlContextNodeFactory.java
@@ -9,8 +9,21 @@
******************************************************************************/
package org.eclipse.jpt.core.internal.context.persistence;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnitProperties;
+import org.eclipse.jpt.core.internal.jpa2.context.persistence.connection.NullConnection2_0;
+import org.eclipse.jpt.core.internal.jpa2.context.persistence.options.NullOptions2_0;
+
public class GenericPersistenceXmlContextNodeFactory extends AbstractPersistenceXmlContextNodeFactory
{
+ public PersistenceUnitProperties buildConnection(PersistenceUnit parent) {
+ return new NullConnection2_0(parent);
+ }
+
+ public PersistenceUnitProperties buildOptions(PersistenceUnit parent) {
+ return new NullOptions2_0(parent);
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/Generic2_0PersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/Generic2_0PersistenceXmlContextNodeFactory.java
index cc8c4f1..c7f3fa3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/Generic2_0PersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/Generic2_0PersistenceXmlContextNodeFactory.java
@@ -10,17 +10,29 @@
package org.eclipse.jpt.core.internal.jpa2.context.persistence;
import org.eclipse.jpt.core.context.persistence.Persistence;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceXmlContextNodeFactory;
+import org.eclipse.jpt.core.internal.jpa2.context.persistence.connection.GenericConnection2_0;
+import org.eclipse.jpt.core.internal.jpa2.context.persistence.options.GenericOptions2_0;
import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
+import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
+import org.eclipse.jpt.core.jpa2.context.persistence.options.JpaOptions2_0;
import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
public class Generic2_0PersistenceXmlContextNodeFactory extends AbstractPersistenceXmlContextNodeFactory
{
-
@Override
public PersistenceUnit2_0 buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
return new GenericPersistenceUnit2_0(parent, xmlPersistenceUnit);
}
+
+ public JpaConnection2_0 buildConnection(PersistenceUnit parent) {
+ return new GenericConnection2_0(parent);
+ }
+
+ public JpaOptions2_0 buildOptions(PersistenceUnit parent) {
+ return new GenericOptions2_0(parent);
+ }
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/GenericPersistenceUnit2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/GenericPersistenceUnit2_0.java
index a9fcd6e..43067c2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/GenericPersistenceUnit2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/GenericPersistenceUnit2_0.java
@@ -11,8 +11,6 @@
import org.eclipse.jpt.core.context.persistence.Persistence;
import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceUnit;
-import org.eclipse.jpt.core.internal.jpa2.context.persistence.connection.GenericConnection2_0;
-import org.eclipse.jpt.core.internal.jpa2.context.persistence.options.GenericOptions2_0;
import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
import org.eclipse.jpt.core.jpa2.context.persistence.options.JpaOptions2_0;
@@ -69,8 +67,8 @@
protected void initializeProperties() {
super.initializeProperties();
- this.connection = new GenericConnection2_0(this);
- this.options = new GenericOptions2_0(this);
+ this.connection = (JpaConnection2_0) getContextNodeFactory().buildConnection(this);
+ this.options = (JpaOptions2_0) getContextNodeFactory().buildOptions(this);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java
new file mode 100644
index 0000000..2e7130f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+* Copyright (c) 2009 Oracle. 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:
+* Oracle - initial API and implementation
+*******************************************************************************/
+package org.eclipse.jpt.core.internal.jpa2.context.persistence.connection;
+
+import java.util.Map;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceUnitProperties;
+import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
+
+/**
+ * GenericConnection2_0
+ */
+public class NullConnection2_0 extends AbstractPersistenceUnitProperties
+ implements JpaConnection2_0
+{
+
+
+ // ********** constructors **********
+ public NullConnection2_0(PersistenceUnit parent) {
+ super(parent);
+ }
+
+ // ********** initialization **********
+ /**
+ * Initializes properties with values from the persistence unit.
+ */
+ @Override
+ protected void initializeProperties() {
+ //do nothing
+ }
+
+ // ********** behavior **********
+
+ public void propertyValueChanged(String propertyName, String newValue) {
+ //do nothing
+ }
+
+ public void propertyRemoved(String propertyName) {
+ //do nothing
+ }
+
+ /**
+ * Adds property names key/value pairs, where:
+ * key = PU property key
+ * value = property id
+ */
+ @Override
+ protected void addPropertyNames(Map<String, String> propertyNames) {
+ //do nothing
+ }
+
+ // ********** Driver **********
+ public String getDriver() {
+ return null;
+ }
+
+ public void setDriver(String newDriver) {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getDefaultDriver() {
+ return DEFAULT_JDBC_DRIVER;
+ }
+
+ // ********** URL **********
+ public String getUrl() {
+ return null;
+ }
+
+ public void setUrl(String newUrl) {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getDefaultUrl() {
+ return DEFAULT_JDBC_URL;
+ }
+
+ // ********** User **********
+ public String getUser() {
+ return null;
+ }
+
+ public void setUser(String newUser) {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getDefaultUser() {
+ return DEFAULT_JDBC_USER;
+ }
+
+ // ********** Password **********
+ public String getPassword() {
+ return null;
+ }
+
+ public void setPassword(String newPassword) {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getDefaultPassword() {
+ return DEFAULT_JDBC_PASSWORD;
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/options/NullOptions2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/options/NullOptions2_0.java
new file mode 100644
index 0000000..a097683
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/persistence/options/NullOptions2_0.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+* Copyright (c) 2009 Oracle. 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:
+* Oracle - initial API and implementation
+*******************************************************************************/
+package org.eclipse.jpt.core.internal.jpa2.context.persistence.options;
+
+import java.util.Map;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceUnitProperties;
+import org.eclipse.jpt.core.jpa2.context.persistence.options.JpaOptions2_0;
+
+/**
+ * JPA 2.0 options
+ */
+public class NullOptions2_0 extends AbstractPersistenceUnitProperties
+ implements JpaOptions2_0
+{
+
+
+ // ********** constructors **********
+ public NullOptions2_0(PersistenceUnit parent) {
+ super(parent);
+ }
+
+ // ********** initialization **********
+ /**
+ * Initializes properties with values from the persistence unit.
+ */
+ @Override
+ protected void initializeProperties() {
+ //do nothing
+ }
+
+ // ********** behavior **********
+
+ public void propertyValueChanged(String propertyName, String newValue) {
+ //do nothing
+ }
+
+ public void propertyRemoved(String propertyName) {
+ //do nothing
+ }
+
+ /**
+ * Adds property names key/value pairs, where:
+ * key = PU property key
+ * value = property id
+ */
+ @Override
+ protected void addPropertyNames(Map<String, String> propertyNames) {
+ //do nothing
+ }
+
+ // ********** LockTimeout **********
+ public Integer getLockTimeout() {
+ return null;
+ }
+
+ public void setLockTimeout(Integer newLockTimeout) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Integer getDefaultLockTimeout() {
+ return DEFAULT_LOCK_TIMEOUT;
+ }
+
+ // ********** QueryTimeout **********
+ public Integer getQueryTimeout() {
+ return null;
+ }
+
+ public void setQueryTimeout(Integer newQueryTimeout) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Integer getDefaultQueryTimeout() {
+ return DEFAULT_QUERY_TIMEOUT;
+ }
+
+
+ // ********** ValidationGroupPrePersist **********
+ public String getValidationGroupPrePersist() {
+ return null;
+ }
+
+ public void setValidationGroupPrePersist(String newValidationGroupPrePersist) {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getDefaultValidationGroupPrePersist() {
+ return DEFAULT_VALIDATION_GROUP_PRE_PERSIST;
+ }
+
+ // ********** ValidationGroupPreUpdate **********
+ public String getValidationGroupPreUpdate() {
+ return null;
+ }
+
+ public void setValidationGroupPreUpdate(String newValidationGroupPreUpdate) {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getDefaultValidationGroupPreUpdate() {
+ return DEFAULT_VALIDATION_GROUP_PRE_UPDATE;
+ }
+
+ // ********** ValidationGroupPreRemove **********
+ public String getValidationGroupPreRemove() {
+ return null;
+ }
+
+ public void setValidationGroupPreRemove(String newValidationGroupPreRemove) {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getDefaultValidationGroupPreRemove() {
+ return DEFAULT_VALIDATION_GROUP_PRE_REMOVE;
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
index 6545d6d..fd49fa8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnit.java
@@ -31,11 +31,9 @@
import org.eclipse.jpt.eclipselink.core.context.persistence.schema.generation.SchemaGeneration;
import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.EclipseLinkCaching;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.EclipseLinkConnection;
import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customization.EclipseLinkCustomization;
import org.eclipse.jpt.eclipselink.core.internal.context.persistence.general.EclipseLinkGeneralProperties;
import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.EclipseLinkLogging;
-import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions;
import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.EclipseLinkSchemaGeneration;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
@@ -171,7 +169,7 @@
}
protected Connection buildEclipseLinkConnection() {
- return new EclipseLinkConnection(this);
+ return (Connection) getContextNodeFactory().buildConnection(this);
}
protected Customization buildEclipseLinkCustomization() {
@@ -187,7 +185,7 @@
}
protected Options buildEclipseLinkOptions() {
- return new EclipseLinkOptions(this);
+ return (Options) getContextNodeFactory().buildOptions(this);
}
protected SchemaGeneration buildEclipseLinkSchemaGeneration() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
index 703b228..1f09758 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
@@ -12,9 +12,12 @@
import org.eclipse.jpt.core.context.persistence.JarFileRef;
import org.eclipse.jpt.core.context.persistence.Persistence;
import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.context.persistence.PersistenceUnitProperties;
import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceXmlContextNodeFactory;
import org.eclipse.jpt.core.resource.persistence.XmlJarFileRef;
import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.EclipseLinkConnection;
+import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions;
public class EclipseLinkPersistenceXmlContextNodeFactory extends AbstractPersistenceXmlContextNodeFactory
@@ -30,4 +33,11 @@
return new EclipseLinkJarFileRef(parent, xmlJarFileRef);
}
+ public PersistenceUnitProperties buildConnection(PersistenceUnit parent) {
+ return new EclipseLinkConnection(parent);
+ }
+
+ public PersistenceUnitProperties buildOptions(PersistenceUnit parent) {
+ return new EclipseLinkOptions(parent);
+ }
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java
index a0efed3..e2d6f9a 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java
@@ -12,7 +12,12 @@
import org.eclipse.jpt.core.context.persistence.Persistence;
import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
import org.eclipse.jpt.core.internal.context.persistence.AbstractPersistenceXmlContextNodeFactory;
+import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
+import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
+import org.eclipse.jpt.core.jpa2.context.persistence.options.JpaOptions2_0;
import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.connection.EclipseLinkConnection2_0;
+import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.options.EclipseLinkOptions2_0;
public class EclipseLink2_0PersistenceXmlContextNodeFactory extends AbstractPersistenceXmlContextNodeFactory
@@ -22,5 +27,13 @@
public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
return new EclipseLinkPersistenceUnit2_0(parent, xmlPersistenceUnit);
}
+
+ public JpaConnection2_0 buildConnection(PersistenceUnit parent) {
+ return new EclipseLinkConnection2_0((PersistenceUnit2_0) parent);
+ }
+
+ public JpaOptions2_0 buildOptions(PersistenceUnit parent) {
+ return new EclipseLinkOptions2_0((PersistenceUnit2_0) parent);
+ }
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java
index a49df17..21fc980 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/EclipseLinkPersistenceUnit2_0.java
@@ -14,10 +14,7 @@
import org.eclipse.jpt.core.jpa2.context.persistence.options.SharedCacheMode;
import org.eclipse.jpt.core.jpa2.context.persistence.options.ValidationMode;
import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.context.persistence.connection.Connection;
import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.connection.EclipseLinkConnection2_0;
-import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.options.EclipseLinkOptions2_0;
import org.eclipse.jpt.eclipselink.core.v2_0.context.persistence.connection.Connection2_0;
import org.eclipse.jpt.eclipselink.core.v2_0.context.persistence.options.Options2_0;
@@ -66,19 +63,7 @@
public XmlPersistenceUnit getXmlPersistenceUnit() {
return this.xmlPersistenceUnit;
}
-
- // **************** factory methods *********************************************
- @Override
- protected Connection buildEclipseLinkConnection() {
-
- return new EclipseLinkConnection2_0(this);
- }
-
- @Override
- protected Options2_0 buildEclipseLinkOptions() {
- return new EclipseLinkOptions2_0(this);
- }
// **************** properties *********************************************
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java
index 2fd0f8e..4dbfccd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java
@@ -11,7 +11,7 @@
import java.util.Map;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
import org.eclipse.jpt.eclipselink.core.context.persistence.connection.Connection;
import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.EclipseLinkConnection;
@@ -26,7 +26,7 @@
{
// ********** constructors **********
- public EclipseLinkConnection2_0(PersistenceUnit parent) {
+ public EclipseLinkConnection2_0(PersistenceUnit2_0 parent) {
super(parent);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java
index 23030ed..7eafd2c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java
@@ -11,7 +11,6 @@
import java.util.Map;
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions;
import org.eclipse.jpt.eclipselink.core.v2_0.context.persistence.options.Options2_0;
@@ -31,7 +30,7 @@
// ********** constructors **********
- public EclipseLinkOptions2_0(PersistenceUnit parent) {
+ public EclipseLinkOptions2_0(PersistenceUnit2_0 parent) {
super(parent);
}
