[jbosstools-commits] JBoss Tools SVN: r5763 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: el and 1 other directory.
Author: scabanovich
Date: 2008-01-17 08:50:56 -0500 (Thu, 17 Jan 2008)
New Revision: 5763
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java
Log:
JBIDE-1642
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2008-01-17
13:36:03 UTC (rev 5762)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2008-01-17
13:50:56 UTC (rev 5763)
@@ -188,6 +188,10 @@
if(superclass.indexOf('.') < 0) {
superclass = EclipseJavaUtil.resolveType(type, superclass);
}
+ if(superclass != null && superclass.equals(type.getFullyQualifiedName())) {
+ //FIX JBIDE-1642
+ return null;
+ }
SeamProject p = (SeamProject)getSeamProject();
return p == null ? null : p.getAllJavaComponentDeclarations().get(superclass);
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java 2008-01-17
13:36:03 UTC (rev 5762)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java 2008-01-17
13:50:56 UTC (rev 5763)
@@ -534,6 +534,10 @@
if(superclassName!=null) {
String fullySuperclassName = EclipseJavaUtil.resolveType(type, superclassName);
if(fullySuperclassName!=null&&!fullySuperclassName.equals("java.lang.Object"))
{ //$NON-NLS-1$
+ if(fullySuperclassName.equals(type.getFullyQualifiedName())) {
+ //FIX JBIDE-1642
+ return null;
+ }
IType superType = type.getJavaProject().findType(fullySuperclassName);
return superType;
}