[jbosstools-commits] JBoss Tools SVN: r2388 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui/views and 1 other directory.
Author: scabanovich
Date: 2007-07-11 10:22:06 -0400 (Wed, 11 Jul 2007)
New Revision: 2388
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/RootContentProvider.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java
Log:
EXIN-218
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2007-07-11 14:19:58
UTC (rev 2387)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/META-INF/MANIFEST.MF 2007-07-11 14:22:06
UTC (rev 2388)
@@ -16,6 +16,7 @@
org.eclipse.wst.common.modulecore,
org.eclipse.wst.common.frameworks,
org.eclipse.wst.common.project.facet.core,
+ org.eclipse.jdt.core,
org.eclipse.jst.jsf.ui,
org.eclipse.wst.common.frameworks.ui,
org.jboss.tools.seam.core,
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/RootContentProvider.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/RootContentProvider.java 2007-07-11
14:19:58 UTC (rev 2387)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/RootContentProvider.java 2007-07-11
14:22:06 UTC (rev 2388)
@@ -13,6 +13,7 @@
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Display;
import org.jboss.tools.seam.core.ISeamComponent;
+import org.jboss.tools.seam.core.ISeamComponentDeclaration;
import org.jboss.tools.seam.core.ISeamElement;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamScope;
@@ -62,6 +63,7 @@
}
public boolean hasChildren(Object element) {
+ if(element instanceof ISeamComponentDeclaration) return false;
return true;
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2007-07-11
14:19:58 UTC (rev 2387)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2007-07-11
14:22:06 UTC (rev 2388)
@@ -1,12 +1,16 @@
package org.jboss.tools.seam.ui.views;
import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IType;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentDeclaration;
+import org.jboss.tools.seam.core.ISeamElement;
+import org.jboss.tools.seam.core.ISeamJavaSourceReference;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamScope;
@@ -19,6 +23,18 @@
return ((ISeamScope)element).getType().toString();
} else if(element instanceof ISeamComponent) {
return "" + ((ISeamComponent)element).getName();
+ } else if(element instanceof ISeamJavaSourceReference) {
+ ISeamJavaSourceReference d = (ISeamJavaSourceReference)element;
+ IMember m = d.getSourceMember();
+ IType type = (m instanceof IType) ? (IType)m : m.getTypeRoot().findPrimaryType();
+ if(type.isBinary()) {
+ IResource r = ((ISeamElement)element).getResource();
+ String s = (r == null) ? "???" : r.getName();
+ return s + "/" + type.getFullyQualifiedName();
+ } else {
+ return type.getFullyQualifiedName();
+ }
+
} else if(element instanceof ISeamComponentDeclaration) {
IResource r = ((ISeamComponentDeclaration)element).getResource();
return r == null ? "???" : r.getName();