removed compatibility methods, not needed for Juno

7 files changed, 3 insertions, 59 deletions

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 bddecd461e..163f844407 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
@@ -42,8 +42,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentAttribute2_0;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation;
 import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
-import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt.jpa.core.resource.java.JavaResourcePersistentAttributeCompatibility;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
@@ -581,11 +579,6 @@ public abstract class AbstractJavaPersistentAttribute
 	public JavaResourceAttribute getResourceAttribute() {
 		return this.accessor.getResourceAttribute();
 	}
-	
-	//TODO compatibility method should be removed for Juno release
-	public JavaResourcePersistentAttribute getResourcePersistentAttribute(){
-		return new JavaResourcePersistentAttributeCompatibility(this.getResourceAttribute());
-	}
 
 	public String getPrimaryKeyColumnName() {
 		return this.mapping.getPrimaryKeyColumnName();
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 53506af8ce..d490f58a73 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
@@ -14,7 +14,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Vector;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -385,11 +384,6 @@ public abstract class AbstractJavaPersistentType
 	public ListIterable<JavaPersistentAttribute> getAttributes() {
 		return new LiveCloneListIterable<JavaPersistentAttribute>(this.attributes);
 	}
-	
-	//TODO remove this legacy compatibility method in the Juno release
-	public ListIterator<JavaPersistentAttribute> attributes() {
-		return this.getAttributes().iterator(); 
-	}
 
 	public int getAttributesSize() {
 		return this.attributes.size();
@@ -423,11 +417,6 @@ public abstract class AbstractJavaPersistentType
 				}
 			);
 	}
-	
-	//TODO remove this compatibility method in the Juno release
-	public Iterator<ReadOnlyPersistentAttribute> allAttributes() {
-		return getAllAttributes().iterator();
-	}
 
 	public Iterable<String> getAllAttributeNames() {
 		return this.convertToNames(this.getAllAttributes());
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 aad8269592..e4676d1071 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
@@ -14,7 +14,6 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 import java.util.Vector;
 import org.eclipse.core.resources.IFile;
@@ -372,12 +371,6 @@ public abstract class SpecifiedOrmPersistentType
 	public ListIterable<OrmReadOnlyPersistentAttribute> getAttributes() {
 		return new CompositeListIterable<OrmReadOnlyPersistentAttribute>(this.getReadOnlySpecifiedAttributes(), this.getVirtualAttributes());
 	}
-	
-	//TODO remove this compatibility method in the Juno release
-	public ListIterator<OrmReadOnlyPersistentAttribute> attributes() {
-		return this.getAttributes().iterator();
-	}
-
 
 	public int getAttributesSize() {
 		return this.getSpecifiedAttributesSize() + this.getVirtualAttributesSize();
@@ -402,11 +395,6 @@ public abstract class SpecifiedOrmPersistentType
 				}
 			);
 	}
-	
-	//TODO remove this compatibility method in the Juno release
-	public Iterator<ReadOnlyPersistentAttribute> allAttributes() {
-		return getAllAttributes().iterator();
-	}
 
 	public Iterable<String> getAllAttributeNames() {
 		return this.convertToNames(this.getAllAttributes());
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 c0b6ebd947..cc9566d224 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
@@ -736,12 +736,6 @@ public abstract class AbstractPersistenceUnit
 	public int getClassRefsSize() {
 		return this.getSpecifiedClassRefsSize() + this.getImpliedClassRefsSize();
 	}
-	
-	// ********** legacy compatibility methods *********
-	//TODO remove this compatibility method in Juno release
-	public Iterator<ClassRef> classRefs() {
-		return this.getClassRefs().iterator();
-	}
 
 	// ********** specified class refs **********
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java
index 7bf9a677a8..3b77df2586 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2012 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.
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.core.internal.jpa1.context.java;
 
 import java.util.List;
-import java.util.ListIterator;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
@@ -83,11 +82,6 @@ public class GenericJavaQueryContainer
 	public ListIterable<JavaNamedQuery> getNamedQueries() {
 		return this.namedQueryContainer.getContextElements();
 	}
-	
-	//TODO remove this compatibility method in the Juno release
-	public ListIterator<JavaNamedQuery> namedQueries() {
-		return this.getNamedQueries().iterator();
-	}
 
 	public int getNamedQueriesSize() {
 		return this.namedQueryContainer.getContextElementsSize();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java
index acd9e2eef0..2a18873415 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2012 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.
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
 
 import java.util.List;
-import java.util.ListIterator;
 
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
@@ -82,11 +81,6 @@ public class GenericOrmQueryContainer
 	public ListIterable<OrmNamedQuery> getNamedQueries() {
 		return this.namedQueryContainer.getContextElements();
 	}
-	
-	//TODO remove this compatibility method for Juno release
-	public ListIterator<OrmNamedQuery> namedQueries() {
-		return getNamedQueries().iterator();
-	}
 
 	public int getNamedQueriesSize() {
 		return this.namedQueryContainer.getContextElementsSize();
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 c84b5985c5..a81707e11a 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 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.
@@ -10,8 +10,6 @@
 package org.eclipse.jpt.jpa.core.internal.jpa1.context.persistence;
 
 import java.util.List;
-import java.util.ListIterator;
-
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable;
 import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
@@ -166,12 +164,6 @@ public class GenericPersistence
 		return this.getContextNodeFactory().buildPersistenceUnit(this, xmlPersistenceUnit);
 	}
 
-	// ********** legacy compatibility methods **********
-	
-	//TODO Remove this compatibility method on Juno release
-	public ListIterator<PersistenceUnit> persistenceUnits() {
-		return this.getPersistenceUnits().iterator();
-	}
 
 	// ********** metamodel **********