Author: scabanovich
Date: 2007-08-23 12:30:01 -0400 (Thu, 23 Aug 2007)
New Revision: 3300
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java
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/actions/ScopePresentationActionProvider.java
Log:
JBIDE-820
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java 2007-08-23
16:29:47 UTC (rev 3299)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java 2007-08-23
16:30:01 UTC (rev 3300)
@@ -73,6 +73,10 @@
// Boolean b = (Boolean)viewer.getData("scopeAsNode");
// return b != null && b.booleanValue();
}
+
+ boolean isPackageStructureFlat() {
+ return ScopePresentationActionProvider.isPackageStructureFlat();
+ }
public boolean hasChildren(Object element) {
if(element instanceof ISeamComponentDeclaration) return false;
@@ -85,15 +89,33 @@
ISeamProject project = (ISeamProject)parentElement;
if(isNotShowingScopeNodes()) {
project.resolve();
- return project.getPackages().toArray(new Object[0]);
+
+ if(isPackageStructureFlat()) {
+ return project.getAllPackages().toArray(new Object[0]);
+ } else {
+ return project.getPackages().toArray(new Object[0]);
+ }
}
return project.getScopes();
} else if(parentElement instanceof ISeamScope) {
((ISeamScope)parentElement).getSeamProject().resolve();
- return ((ISeamScope)parentElement).getPackages().toArray(new Object[0]);
+
+ if(isPackageStructureFlat()) {
+ return ((ISeamScope)parentElement).getAllPackages().toArray(new Object[0]);
+ } else {
+ return ((ISeamScope)parentElement).getPackages().toArray(new Object[0]);
+ }
// return ((ISeamScope)parentElement).getComponents().toArray(new Object[0]);
} else if(parentElement instanceof ISeamPackage) {
- return ((ISeamPackage)parentElement).getComponents().toArray(new Object[0]);
+ ISeamPackage p = (ISeamPackage)parentElement;
+ List<Object> children = new ArrayList<Object>();
+ for (ISeamComponent c : p.getComponents()) {
+ children.add(c);
+ }
+ for (ISeamPackage pc : p.getPackages().values()) {
+ children.add(pc);
+ }
+ return children.toArray(new Object[0]);
} else if(parentElement instanceof ISeamComponent) {
List<Object> children = new ArrayList<Object>();
Set<ISeamComponentDeclaration> ds =
((ISeamComponent)parentElement).getAllDeclarations();
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-08-23
16:29:47 UTC (rev 3299)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2007-08-23
16:30:01 UTC (rev 3300)
@@ -51,7 +51,11 @@
} else if(element instanceof ISeamScope) {
return ((ISeamScope)element).getType().getLabel();
} else if(element instanceof ISeamPackage) {
- return ((ISeamPackage)element).getName();
+ if(ScopePresentationActionProvider.isPackageStructureFlat()) {
+ return ((ISeamPackage)element).getQualifiedName();
+ } else {
+ return ((ISeamPackage)element).getName();
+ }
} else if(element instanceof ISeamComponent) {
ISeamComponent c = (ISeamComponent)element;
String name = c.getName();
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java 2007-08-23
16:29:47 UTC (rev 3299)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java 2007-08-23
16:30:01 UTC (rev 3300)
@@ -32,12 +32,17 @@
*/
public class ScopePresentationActionProvider extends CommonActionProvider {
public static String SCOPE_PRESENTATION = "seam.scopePresentation";
+ public static String PACKAGE_STRUCTURE = "seam.packageStructure";
public static boolean isScopePresentedAsLabel() {
String s = SeamPreferences.getInstancePreference(SCOPE_PRESENTATION);
return "label".equals(s);
}
+ public static boolean isPackageStructureFlat() {
+ return true;
+ }
+
public void setScopePresentedAsLabel(boolean s) {
IEclipsePreferences p = SeamPreferences.getInstancePreferences();
p.put(SCOPE_PRESENTATION, s ? "label" : "node");
Show replies by date