[468637] fix StackOverflowError when type hierarchy has a cycle

6 files changed, 17 insertions, 17 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
index ea9fc4bee1..9f43d0c248 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 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.
@@ -704,7 +704,7 @@ public class EclipseLinkPersistenceUnit
 							loggerProperty.getValue()
 					)
 			);
-		} else if (!TypeTools.isSubType(
+		} else if (!TypeTools.isSubTypeOf(
 				loggerProperty.getValue(), EclipseLinkLogging.ECLIPSELINK_LOGGER_CLASS_NAME, javaProject)
 		) {
 			messages.add(
@@ -749,7 +749,7 @@ public class EclipseLinkPersistenceUnit
 							handlerProperty.getValue()
 					)
 			);
-		} else if ( ! TypeTools.isSubType(
+		} else if ( ! TypeTools.isSubTypeOf(
 				handlerProperty.getValue(),
 				org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkCustomization.ECLIPSELINK_EXCEPTION_HANDLER_CLASS_NAME,
 				javaProject)
@@ -801,7 +801,7 @@ public class EclipseLinkPersistenceUnit
 							profilerProperty.getValue()
 					)
 			);
-		} else if (!TypeTools.isSubType(
+		} else if (!TypeTools.isSubTypeOf(
 				profilerProperty.getValue(), org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkCustomization.ECLIPSELINK_SESSION_PROFILER_CLASS_NAME, javaProject)
 		) {
 			messages.add(
@@ -847,7 +847,7 @@ public class EclipseLinkPersistenceUnit
 									property.getValue()
 							)
 					);
-				} else if (!TypeTools.isSubType(
+				} else if (!TypeTools.isSubTypeOf(
 						property.getValue(), org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkCustomization.ECLIPSELINK_SESSION_CUSTOMIZER_CLASS_NAME, javaProject)
 				) {
 					messages.add(
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterClassConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterClassConverter.java
index b79e2cbbd2..42caa82046 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterClassConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterClassConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 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.
@@ -92,7 +92,7 @@ public abstract class EclipseLinkJavaConverterClassConverter<A extends NamedConv
 	 */
 	protected boolean typeImplementsInterface(String typeName, String interfaceName) {
 		return (typeName != null) && 
-				TypeTools.isSubType(typeName, interfaceName, this.getJavaProject());
+				TypeTools.isSubTypeOf(typeName, interfaceName, this.getJavaProject());
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java
index 5b62017ca8..c52435453e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 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.
@@ -198,7 +198,7 @@ public class EclipseLinkJavaCustomizer
 	 */
 	protected boolean typeImplementsInterface(String typeName, String interfaceName) {
 		return (typeName != null) && 
-				TypeTools.isSubType(typeName, interfaceName, this.getJavaProject());
+				TypeTools.isSubTypeOf(typeName, interfaceName, this.getJavaProject());
 	}
 
 	protected TextRange getCustomizerClassTextRange() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterClassConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterClassConverter.java
index 67445474b6..2e4baf08ae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterClassConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterClassConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 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.
@@ -156,7 +156,7 @@ public abstract class EclipseLinkOrmConverterClassConverter<X extends XmlNamedCo
 	 */
 	protected boolean typeImplementsInterface(String typeName, String interfaceName) {
 		return (typeName != null) && 
-				TypeTools.isSubType(typeName, interfaceName, this.getJavaProject());
+				TypeTools.isSubTypeOf(typeName, interfaceName, this.getJavaProject());
 	}
 
 	protected boolean converterClassImplementsInterface(String interfaceName) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java
index 2cfa3378e9..af685dd55c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 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.
@@ -284,7 +284,7 @@ public class EclipseLinkOrmCustomizer
 					)
 			);
 		}
-		if (!TypeTools.isSubType(customizerJdtType, ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME)) {
+		if (!TypeTools.isSubTypeOf(customizerJdtType, ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME)) {
 			messages.add(
 					this.buildValidationMessage(
 							this.getValidationTextRange(),
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentAttribute.java
index 19662314b4..234c9a2cb0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentAttribute.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2016 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.
@@ -212,8 +212,8 @@ public class EclipseLinkVirtualJavaPersistentAttribute
 		if (typeName == null) {
 			return false;
 		}
-		return TypeTools.isSubType(typeName, DATE_TYPE_NAME, this.getJavaProject())
-			|| TypeTools.isSubType(typeName, CALENDAR_TYPE_NAME, this.getJavaProject());
+		return TypeTools.isSubTypeOf(typeName, DATE_TYPE_NAME, this.getJavaProject())
+			|| TypeTools.isSubTypeOf(typeName, CALENDAR_TYPE_NAME, this.getJavaProject());
 	}
 
 	public boolean typeIsSerializable() {
@@ -316,7 +316,7 @@ public class EclipseLinkVirtualJavaPersistentAttribute
 				}
 			}
 			for (JpaContainerDefinition definition : this.getJpaContainerDefinitions()) {
-				if (TypeTools.isSubType(typeName, definition.getTypeName(), this.getJavaProject())) {
+				if (TypeTools.isSubTypeOf(typeName, definition.getTypeName(), this.getJavaProject())) {
 					return definition;
 				}
 			}