Author: scabanovich
Date: 2011-07-12 18:18:25 -0400 (Tue, 12 Jul 2011)
New Revision: 32870
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-07-12
22:18:00 UTC (rev 32869)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-07-12
22:18:25 UTC (rev 32870)
@@ -64,10 +64,11 @@
*/
Set<? extends IClassBean> getSpecializingBeans();
- IParametedType getSuperType();
-
+ /**
+ * Returns class bean of super class of this bean, or null if it is not a bean.
+ *
+ * @return class bean of super class of this bean, or null if it is not a bean
+ */
IClassBean getSuperClassBean();
- void setSuperClassBean(IClassBean bean);
-
}
\ No newline at end of file
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-12
22:18:00 UTC (rev 32869)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-12
22:18:25 UTC (rev 32870)
@@ -1150,10 +1150,12 @@
}
for (IClassBean bean: newClassBeans.values()) {
- IParametedType s = bean.getSuperType();
+ IParametedType s = ((ClassBean)bean).getSuperType();
if(s != null && s.getType() != null) {
IClassBean superClassBean = newClassBeans.get(s.getType());
- bean.setSuperClassBean(superClassBean);
+ if(bean instanceof ClassBean) {
+ ((ClassBean)bean).setSuperClassBean(superClassBean);
+ }
}
}
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-07-12
22:18:00 UTC (rev 32869)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-07-12
22:18:25 UTC (rev 32870)
@@ -560,7 +560,6 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IClassBean#getSuperType()
*/
- @Override
public ParametedType getSuperType() {
return getDefinition().getSuperType();
}