Fix keyring on active environments and a few bugs

[gpl/argeo-slc.git] / plugins / org.argeo.slc.akb.ui / src / main / java / org / argeo / slc / akb / ui / views / AkbTemplatesTreeView.java

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