X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.akb.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fakb%2Fui%2Fviews%2FAkbTemplatesTreeView.java;h=2686a486de780adb3f154431be3c69fc68230ed6;hb=f4eb864e415405e87cdd2aa2be1eb1d502f23421;hp=0930701e7b9f656516e3a9dd8ca53be5311cbe47;hpb=b331d1e6936fc825ee2565f423e7e249dbecb687;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/views/AkbTemplatesTreeView.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/views/AkbTemplatesTreeView.java
index 0930701e7..2686a486d 100644
--- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/views/AkbTemplatesTreeView.java
+++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/views/AkbTemplatesTreeView.java
@@ -42,6 +42,7 @@ import org.argeo.slc.akb.ui.commands.DeleteAkbNodes;
 import org.argeo.slc.akb.ui.commands.OpenAkbNodeEditor;
 import org.argeo.slc.akb.ui.providers.AkbTreeLabelProvider;
 import org.argeo.slc.akb.ui.providers.TemplatesTreeContentProvider;
+import org.argeo.slc.akb.ui.utils.AkbItemsComparator;
 import org.argeo.slc.akb.ui.utils.Refreshable;
 import org.argeo.slc.akb.utils.AkbJcrUtils;
 import org.eclipse.jface.action.IContributionItem;
@@ -61,7 +62,7 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.services.IServiceLocator;
 
-/** SLC generic JCR Result tree view. */
+/** AKB template tree view. */
 public class AkbTemplatesTreeView extends ViewPart implements Refreshable {
 	// private final static Log log =
 	// LogFactory.getLog(AkbTemplatesTreeView.class);
@@ -99,45 +100,13 @@ public class AkbTemplatesTreeView extends ViewPart implements Refreshable {
 	public void createPartControl(Composite parent) {
 		initialize();
 
-		envTreeViewer = createResultsTreeViewer(parent);
-		envTreeViewer.setInput(initializeResultTree());
-
-		// parent.setLayout(new FillLayout());
-		// // Main layout
-		// SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
-		// sashForm.setSashWidth(4);
-		// sashForm.setLayout(new FillLayout());
-
-		// Create the tree on top of the view
-		// Composite top = new Composite(sashForm, SWT.NONE);
-		// GridLayout gl = new GridLayout(1, false);
-		// top.setLayout(gl);
-		// resultTreeViewer = createResultsTreeViewer(top);
-
-		// // Create the property viewer on the bottom
-		// Composite bottom = new Composite(sashForm, SWT.NONE);
-		// bottom.setLayout(new GridLayout(1, false));
-		// propertiesViewer = createPropertiesViewer(bottom);
-		//
-		// sashForm.setWeights(getWeights());
-
-		// setOrderedInput(resultTreeViewer);
+		envTreeViewer = createTreeViewer(parent);
+		envTreeViewer.setInput(initializeTree());
+		envTreeViewer.setComparator(new AkbItemsComparator());
 	}
 
-	/**
-	 * Override default behaviour so that default defined order remains
-	 * unchanged on first level of the tree
-	 */
-	// private void setOrderedInput(TreeViewer viewer) {
-	// // Add specific ordering
-	// viewer.setInput(null);
-	// viewer.setComparator(null);
-	// viewer.setInput(initializeResultTree());
-	// viewer.setComparator(new ResultItemsComparator());
-	// }
-
 	// The main tree viewer
-	protected TreeViewer createResultsTreeViewer(Composite parent) {
+	protected TreeViewer createTreeViewer(Composite parent) {
 		parent.setLayout(AkbUiUtils.gridLayoutNoBorder());
 		int style = SWT.BORDER | SWT.MULTI;
 
@@ -199,7 +168,7 @@ public class AkbTemplatesTreeView extends ViewPart implements Refreshable {
 	public void setFocus() {
 	}
 
-	private Node[] initializeResultTree() {
+	private Node[] initializeTree() {
 		try {
 			NodeIterator ni = templatesParentNode.getNodes();
 			List<Node> templates = new ArrayList<Node>();
@@ -218,7 +187,7 @@ public class AkbTemplatesTreeView extends ViewPart implements Refreshable {
 
 	@Override
 	public void forceRefresh(Object object) {
-		envTreeViewer.setInput(initializeResultTree());
+		envTreeViewer.setInput(initializeTree());
 	}
 
 	// ///////////////////////////
@@ -351,7 +320,7 @@ public class AkbTemplatesTreeView extends ViewPart implements Refreshable {
 		if (currItem != null)
 			subMenu.remove(currItem);
 		subMenu.add(AkbUiUtils.createContributionItem(menuManager, locator,
-				currItemId, OpenAkbNodeEditor.ID, "JDBC", null, tmpParams));
+				currItemId, OpenAkbNodeEditor.ID, "JDBC Query", null, tmpParams));
 
 		// SSH COMMAND
 		tmpParams = new HashMap<String, String>();
@@ -492,7 +461,7 @@ public class AkbTemplatesTreeView extends ViewPart implements Refreshable {
 
 			Object[] visibles = envTreeViewer.getExpandedElements();
 			if (fullRefresh)
-				envTreeViewer.setInput(initializeResultTree());
+				envTreeViewer.setInput(initializeTree());
 			else
 				envTreeViewer.refresh();