summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2013-02-12 10:48:00 (EST)
committerKaren Butzke2013-02-12 10:48:00 (EST)
commit52498b07ba94d28dfd73cf466515fb5fdc535ee2 (patch)
tree62a0dc71b91ed3d5d574ecd6b3a9d79362b5c709
parentca16884d1179929c0ce0b59efa51e02c65c57c0e (diff)
downloadwebtools.dali-52498b07ba94d28dfd73cf466515fb5fdc535ee2.zip
webtools.dali-52498b07ba94d28dfd73cf466515fb5fdc535ee2.tar.gz
webtools.dali-52498b07ba94d28dfd73cf466515fb5fdc535ee2.tar.bz2
further isolating the JpaStructureNode.dispose() method, would like to eventually remove this from the hierarchy completely. Currently only VirtualOrmPersistentAttribute need to be disposed.
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaStructureNode.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/EntityMappings.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyPersistentAttribute.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/MappingFileRef.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/Persistence.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistenceUnit.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentAttribute.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java4
20 files changed, 28 insertions, 66 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaStructureNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaStructureNode.java
index 0000d55..4ae4740 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaStructureNode.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaStructureNode.java
@@ -105,13 +105,6 @@ public interface JpaStructureNode
*/
void gatherRootStructureNodes(JpaFile jpaFile, Collection<JpaStructureNode> rootStructureNodes);
- /**
- * Dispose the structure node and its children.
- * Typically this would be used to update the structure node's
- * JPA file's root structure nodes.
- */
- void dispose();
-
/**
* Type used to identify a JPA structure node's type with respect to the
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/EntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/EntityMappings.java
index eb10822..f3b0b45 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/EntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/EntityMappings.java
@@ -203,4 +203,8 @@ public interface EntityMappings
* @see #getPackage()
*/
String qualify(String className);
+
+ //TODO would like to remove this eventually
+ void dispose();
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java
index 4d75cc6..c4ea189 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java
@@ -147,4 +147,7 @@ public interface OrmPersistentType
* mappings.
*/
String getDefaultPackage();
+
+ //TODO would like to remove this eventually
+ void dispose();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyPersistentAttribute.java
index 33d6ba4..c5cf6e6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyPersistentAttribute.java
@@ -103,4 +103,7 @@ public interface OrmReadOnlyPersistentAttribute
* @throw IllegalStateException if the attribute is already specified
*/
OrmPersistentAttribute addToXml(String mappingKey);
+
+ //TODO would like to remove this eventually
+ void dispose();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/MappingFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/MappingFileRef.java
index 6afd492..f42d77a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/MappingFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/MappingFileRef.java
@@ -159,4 +159,7 @@ public interface MappingFileRef
return ref.getMappingFileGenerators();
}
}
+
+ //TODO would like to remove this eventually
+ void dispose();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/Persistence.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/Persistence.java
index 99b74a3..a0563c6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/Persistence.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/Persistence.java
@@ -85,4 +85,7 @@ public interface Persistence
*/
void removePersistenceUnit(int index);
+ //TODO would like to remove this eventually
+ void dispose();
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistenceUnit.java
index 4fc754a..670a90a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistenceUnit.java
@@ -818,4 +818,8 @@ public interface PersistenceUnit
* (For instance, if the connection is not active, then it should not.)
*/
boolean validatesAgainstDatabase();
+
+ //TODO would like to remove this eventually
+ void dispose();
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java
index 55d23da..e7ab07b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java
@@ -482,10 +482,6 @@ public abstract class AbstractJavaPersistentAttribute
return this.getResourceAttribute().getNameTextRange();
}
- public void dispose() {
- // nothing to dispose
- }
-
// ********** type **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java
index d01cfe3..5ecc3ae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java
@@ -991,10 +991,6 @@ public abstract class AbstractJavaPersistentType
}
}
- public void dispose() {
- //nothing
- }
-
protected void initializeChildren() {
this.children.addAll(this.attributes);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java
index c86d79e..c3ea523 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 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.
@@ -171,7 +171,6 @@ public class GenericJavaIdClassReference
JavaResourceType resourceIdClass = this.resolveResourceIdClass();
if (resourceIdClass == null) {
if (this.idClass != null) {
- this.idClass.dispose();
this.setIdClass(null);
}
} else {
@@ -181,7 +180,6 @@ public class GenericJavaIdClassReference
if (this.idClass.getJavaResourceType() == resourceIdClass) {
this.idClass.update();
} else {
- this.idClass.dispose();
this.setIdClass(this.buildIdClass(resourceIdClass));
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
index 87e4bb3..cc18aeb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
@@ -258,8 +258,8 @@ public abstract class AbstractEntityMappings
}
public void dispose() {
- for (JpaStructureNode child : this.getChildren()) {
- child.dispose();
+ for (OrmPersistentType persistentType : this.getPersistentTypes()) {
+ persistentType.dispose();
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java
index d91ea5f..102af92 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java
@@ -94,7 +94,6 @@ public class GenericOrmIdClassReference
if (this.firePropertyChanged(FULLY_QUALIFIED_ID_CLASS_PROPERTY, old, name)) {
// clear out the Java id class here, it will be rebuilt during "update"
if (this.idClass != null) {
- this.idClass.dispose();
this.setIdClass(null);
}
}
@@ -227,7 +226,6 @@ public class GenericOrmIdClassReference
protected void updateIdClass() {
if (this.fullyQualifiedIdClassName == null) {
if (this.idClass != null) {
- this.idClass.dispose();
this.setIdClass(null);
}
} else {
@@ -237,7 +235,6 @@ public class GenericOrmIdClassReference
if (this.idClass.getName().equals(this.fullyQualifiedIdClassName)) {
this.idClass.update();
} else {
- this.idClass.dispose();
this.setIdClass(this.buildIdClass());
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
index 79442ad..eac7b8d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
@@ -204,7 +204,6 @@ public abstract class SpecifiedOrmPersistentType
if (this.firePropertyChanged(NAME_PROPERTY, old, name)) {
// clear out the Java persistent type here, it will be rebuilt during "update"
if (this.javaPersistentType != null) {
- this.javaPersistentType.dispose();
this.setJavaPersistentType(null);
}
}
@@ -269,7 +268,6 @@ public abstract class SpecifiedOrmPersistentType
protected void updateJavaPersistentType() {
if (this.getName() == null) {
if (this.javaPersistentType != null) {
- this.javaPersistentType.dispose();
this.setJavaPersistentType(null);
}
}
@@ -285,7 +283,6 @@ public abstract class SpecifiedOrmPersistentType
if (this.javaPersistentType.getJavaResourceType() == resourceType) {
this.javaPersistentType.update();
} else {
- this.javaPersistentType.dispose();
this.setJavaPersistentType(this.buildJavaPersistentType(resourceType));
}
}
@@ -1164,9 +1161,6 @@ public abstract class SpecifiedOrmPersistentType
}
public void dispose() {
- if (this.javaPersistentType != null) {
- this.javaPersistentType.dispose();
- }
for (OrmReadOnlyPersistentAttribute defaultAttribute : this.getDefaultAttributes()) {
defaultAttribute.dispose();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java
index 37b18cd..6625e55 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java
@@ -123,10 +123,6 @@ public abstract class AbstractJarFileRef
return (this.xmlJarFileRef == null) ? null : this.xmlJarFileRef.getFileNameTextRange();
}
- public void dispose() {
- // NOP
- }
-
// ********** file name **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java
index 732f695..cf1ffae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java
@@ -381,8 +381,8 @@ public abstract class AbstractPersistenceUnit
}
public void dispose() {
- for (JpaStructureNode child : this.getChildren()) {
- child.dispose();
+ for (MappingFileRef mappingFileRef : this.getMappingFileRefs()) {
+ mappingFileRef.dispose();
}
}
@@ -801,10 +801,6 @@ public abstract class AbstractPersistenceUnit
protected XmlJarFileRef getResourceElement(JarFileRef contextElement) {
return contextElement.getXmlJarFileRef();
}
- @Override
- protected void disposeElement(JarFileRef element) {
- element.dispose();
- }
}
// ********** class refs **********
@@ -926,10 +922,6 @@ public abstract class AbstractPersistenceUnit
protected XmlJavaClassRef getResourceElement(ClassRef contextElement) {
return contextElement.getXmlClassRef();
}
- @Override
- protected void disposeElement(ClassRef contextElement) {
- contextElement.dispose();
- }
}
@@ -1021,10 +1013,6 @@ public abstract class AbstractPersistenceUnit
protected JavaResourceAbstractType getResourceElement(ClassRef contextElement) {
return contextElement.getJavaResourceType();
}
- @Override
- protected void disposeElement(ClassRef contextElement) {
- contextElement.dispose();
- }
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java
index 6cf020b..14ef346 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java
@@ -176,7 +176,6 @@ public class GenericClassRef
this.resourceType = this.resolveJavaResourceType();
if (this.resourceType == null || this.resourceType.getAstNodeType() != AstNodeType.TYPE) {
if (this.javaPersistentType != null) {
- this.javaPersistentType.dispose();
this.setJavaPersistentType(null);
}
} else {
@@ -187,7 +186,6 @@ public class GenericClassRef
if (this.javaPersistentType.getJavaResourceType() == jrt) {
this.javaPersistentType.update();
} else {
- this.javaPersistentType.dispose();
this.setJavaPersistentType(this.buildJavaPersistentType(jrt));
}
}
@@ -280,12 +278,6 @@ public class GenericClassRef
return this.isVirtual() ? null : this.xmlJavaClassRef.getJavaClassTextRange();
}
- public void dispose() {
- if (this.javaPersistentType != null) {
- this.javaPersistentType.dispose();
- }
- }
-
// ********** PersistentType.Owner implementation **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
index 4bf8b0c..3408b11 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
@@ -293,8 +293,8 @@ public class GenericPersistence
}
public void dispose() {
- for (JpaStructureNode child : this.getChildren()) {
- child.dispose();
+ for (PersistenceUnit persistenceUnit : this.getPersistenceUnits()) {
+ persistenceUnit.dispose();
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java
index 626fa2c..c08656d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java
@@ -104,7 +104,6 @@ public class EclipseLinkOrmPersistentTypeImpl
if (this.firePropertyChanged(DYNAMIC_PROPERTY, old, this.dynamic)) {
// clear out the Java persistent type here, it will be rebuilt during "update"
if (this.javaPersistentType != null) {
- this.javaPersistentType.dispose();
this.setJavaPersistentType(null);
}
}
@@ -341,6 +340,7 @@ public class EclipseLinkOrmPersistentTypeImpl
// ********** metamodel **********
+ @Override
public PersistentType2_0 getMetamodelType() {
return (this.isDynamic()) ? null : this;
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentAttribute.java
index fc5fb50..64d0b82 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentAttribute.java
@@ -175,10 +175,6 @@ public class VirtualJavaPersistentAttribute
throw new UnsupportedOperationException();
}
- public void dispose() {
- throw new UnsupportedOperationException();
- }
-
public AccessType getAccess() {
return null;
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java
index 424740b..3c5dafa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java
@@ -371,10 +371,6 @@ public class VirtualJavaPersistentType
sb.append(this.getName());
}
- public void dispose() {
- //nothing to dispose
- }
-
// ********** metamodel **********
public PersistentType2_0 getMetamodelType() {