Add AKB icons

https://www.argeo.org/bugzilla/show_bug.cgi?id=196

git-svn-id: https://svn.argeo.org/slc/trunk@6611 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/plugins/org.argeo.slc.akb.ui/icons/addConnector.gif b/plugins/org.argeo.slc.akb.ui/icons/addConnector.gif
new file mode 100644 (file)
index 0000000..b1526e9
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/addConnector.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/addItem.gif b/plugins/org.argeo.slc.akb.ui/icons/addItem.gif
new file mode 100644 (file)
index 0000000..252d7eb
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/addItem.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/akb.gif b/plugins/org.argeo.slc.akb.ui/icons/akb.gif
new file mode 100644 (file)
index 0000000..8eefad3
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/akb.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/akb.png b/plugins/org.argeo.slc.akb.ui/icons/akb.png
deleted file mode 100644 (file)
index 6588de8..0000000
Binary files a/plugins/org.argeo.slc.akb.ui/icons/akb.png and /dev/null differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/connectors.gif b/plugins/org.argeo.slc.akb.ui/icons/connectors.gif
new file mode 100644 (file)
index 0000000..e8abf43
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/connectors.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/environment.png b/plugins/org.argeo.slc.akb.ui/icons/environment.png
new file mode 100644 (file)
index 0000000..0afea5b
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/environment.png differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/environments.gif b/plugins/org.argeo.slc.akb.ui/icons/environments.gif
new file mode 100644 (file)
index 0000000..22f78af
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/environments.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/itemFolder.gif b/plugins/org.argeo.slc.akb.ui/icons/itemFolder.gif
new file mode 100644 (file)
index 0000000..7efb86e
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/itemFolder.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/jcrConnector.gif b/plugins/org.argeo.slc.akb.ui/icons/jcrConnector.gif
new file mode 100644 (file)
index 0000000..ae98299
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/jcrConnector.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/jcrQuery.gif b/plugins/org.argeo.slc.akb.ui/icons/jcrQuery.gif
new file mode 100644 (file)
index 0000000..0dc862c
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/jcrQuery.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/jdbcConnector.gif b/plugins/org.argeo.slc.akb.ui/icons/jdbcConnector.gif
new file mode 100644 (file)
index 0000000..0470e15
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/jdbcConnector.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/jdbcQuery.gif b/plugins/org.argeo.slc.akb.ui/icons/jdbcQuery.gif
new file mode 100644 (file)
index 0000000..6c7320c
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/jdbcQuery.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/note.gif b/plugins/org.argeo.slc.akb.ui/icons/note.gif
new file mode 100644 (file)
index 0000000..6e63b99
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/note.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/searchView.png b/plugins/org.argeo.slc.akb.ui/icons/searchView.png
new file mode 100644 (file)
index 0000000..aa0dc0b
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/searchView.png differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/sshCommand.png b/plugins/org.argeo.slc.akb.ui/icons/sshCommand.png
new file mode 100644 (file)
index 0000000..14ebb9e
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/sshCommand.png differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/sshConnector.png b/plugins/org.argeo.slc.akb.ui/icons/sshConnector.png
new file mode 100644 (file)
index 0000000..c11b767
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/sshConnector.png differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/sshFile.gif b/plugins/org.argeo.slc.akb.ui/icons/sshFile.gif
new file mode 100644 (file)
index 0000000..7ccc6a7
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/sshFile.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/template.gif b/plugins/org.argeo.slc.akb.ui/icons/template.gif
new file mode 100644 (file)
index 0000000..64d7907
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/template.gif differ

diff --git a/plugins/org.argeo.slc.akb.ui/icons/treeView.png b/plugins/org.argeo.slc.akb.ui/icons/treeView.png
new file mode 100644 (file)
index 0000000..c75c196
Binary files /dev/null and b/plugins/org.argeo.slc.akb.ui/icons/treeView.png differ

diff --git a/plugins/org.argeo.slc.akb.ui/plugin.xml b/plugins/org.argeo.slc.akb.ui/plugin.xml
index ab27bc70c9953115385adbe612a4c80697bed8de..f762d1b3fa84088f3aecfcff061e77571ad9ca71 100644 (file)
--- a/plugins/org.argeo.slc.akb.ui/plugin.xml
+++ b/plugins/org.argeo.slc.akb.ui/plugin.xml
@@ -6,13 +6,13 @@
                point="org.eclipse.ui.perspectives">
                <perspective
                        class="org.argeo.slc.akb.ui.AkbEnvPerspective"
-                       icon="icons/akb.png"
+                       icon="icons/akb.gif"
             id="org.argeo.slc.akb.ui.akbEnvPerspective"
             name="AKB">
                </perspective>
                <perspective
                        class="org.argeo.slc.akb.ui.AkbTemplatesPerspective"
-                       icon="icons/akb.png"
+                       icon="icons/template.gif"
             id="org.argeo.slc.akb.ui.akbTemplatesPerspective"
             name="AKB Templates">
       </perspective>
@@ -22,14 +22,14 @@
                point="org.eclipse.ui.views">
                <view
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/akb.png"
+                       icon="icons/searchView.png"
                        id="org.argeo.slc.akb.ui.akbDefaultView"
                        name="Search"
                        restorable="true">
                </view>
                <view
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/akb.png"
+                       icon="icons/treeView.png"
                        id="org.argeo.slc.akb.ui.akbTemplatesTreeView"
                        name="Akb Templates"
                        restorable="true">
@@ -40,32 +40,32 @@
                point="org.eclipse.ui.editors">
                <editor
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/akb.png"
+                       icon="icons/template.gif"
                        id="org.argeo.slc.akb.ui.envTemplateEditor"
                        name="Environment Template Editor">
                </editor>
                <editor
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/akb.png"
+                       icon="icons/addConnector.gif"
                        id="org.argeo.slc.akb.ui.connectorAliasEditor"
                        name="Connector Alias Editor">
                </editor>
                <!-- ITEMS EDITORS --> 
                <editor
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/akb.png"
+                       icon="icons/jdbcQuery.gif"
                        id="org.argeo.slc.akb.ui.jdbcQueryTemplateEditor"
                        name="JDBC Query Template Editor">
                </editor>
                <editor
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/akb.png"
+                       icon="icons/sshFile.gif"
                        id="org.argeo.slc.akb.ui.sshFileTemplateEditor"
                        name="SSH File Template Editor">
                </editor>
                <editor
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/akb.png"
+                       icon="icons/sshCommand.png"
                        id="org.argeo.slc.akb.ui.sshCommandTemplateEditor"
                        name="SSH Command Template Editor">
                </editor>
@@ -104,4 +104,4 @@
        <extension
                point="org.eclipse.ui.menus">
        </extension>
-</plugin>
\ No newline at end of file
+</plugin>

diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/AkbImages.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/AkbImages.java
index 168d787c4c524c75cbb3a26c3fe7639bd494235a..32241afd811572f8e8d5e4284de031b47ce61bef 100644 (file)
--- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/AkbImages.java
+++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/AkbImages.java
@@ -7,4 +7,23 @@ public class AkbImages {
 
        public final static Image LOGO_SMALL = AkbUiPlugin.getImageDescriptor(
                        "icons/smallerOrnamentLogo.png").createImage();
+
+       public final static Image TEMPLATE = AkbUiPlugin.getImageDescriptor(
+                       "icons/template.gif").createImage();
+       public final static Image CONNECTOR_FOLDER = AkbUiPlugin
+                       .getImageDescriptor("icons/connectors.gif").createImage();
+
+       public final static Image ITEM_FOLDER = AkbUiPlugin.getImageDescriptor(
+                       "icons/itemFolder.gif").createImage();
+       public final static Image JDBC_CONNECTOR = AkbUiPlugin.getImageDescriptor(
+                       "icons/jdbcConnector.gif").createImage();
+       public final static Image JDBC_QUERY = AkbUiPlugin.getImageDescriptor(
+                       "icons/jdbcQuery.gif").createImage();
+
+       public final static Image SSH_CONNECTOR = AkbUiPlugin.getImageDescriptor(
+                       "icons/sshConnector.png").createImage();
+       public final static Image SSH_COMMAND = AkbUiPlugin.getImageDescriptor(
+                       "icons/sshCommand.png").createImage();
+       public final static Image SSH_FILE = AkbUiPlugin.getImageDescriptor(
+                       "icons/sshFile.gif").createImage();
 }

diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/AkbTreeLabelProvider.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/AkbTreeLabelProvider.java
index 8fb639cc7094a7904dc1c7b9c4d15b2e53f2d734..167b57611104ab1e9ceea7ff3f4bf5a4fb8e3408 100644 (file)
--- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/AkbTreeLabelProvider.java
+++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/providers/AkbTreeLabelProvider.java
@@ -7,6 +7,8 @@ import javax.jcr.nodetype.NodeType;
 
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.akb.AkbException;
+import org.argeo.slc.akb.AkbTypes;
+import org.argeo.slc.akb.ui.AkbImages;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 
@@ -18,7 +20,6 @@ public class AkbTreeLabelProvider extends LabelProvider {
        @Override
        public String getText(Object element) {
                try {
-
                        if (element instanceof Node) {
                                Node node = (Node) element;
                                if (node.isNodeType(NodeType.MIX_TITLE))
@@ -33,21 +34,31 @@ public class AkbTreeLabelProvider extends LabelProvider {
                return ((TreeParent) element).getName();
        }
 
-       public Image getImage(Object obj) {
-               // if (obj instanceof SingleResultNode) {
-               // // FIXME add realtime modification of process icon (SCHEDULED,
-               // // RUNNING, COMPLETED...)
-               // // Node resultNode = ((SingleResultNode) obj).getNode();
-               // // int status = SlcJcrUtils.aggregateTestStatus(resultNode);
-               // return SlcImages.PROCESS_COMPLETED;
-               // } else if (obj instanceof ResultParent) {
-               // ResultParent rParent = (ResultParent) obj;
-               // if (SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL.equals(rParent
-               // .getName()))
-               // return SlcImages.MY_RESULTS_FOLDER;
-               // else
-               // return SlcImages.FOLDER;
-               // } else
+       public Image getImage(Object element) {
+               try {
+                       if (element instanceof Node) {
+                               Node node = (Node) element;
+                               if (node.isNodeType(AkbTypes.AKB_ITEM_FOLDER))
+                                       return AkbImages.ITEM_FOLDER;
+                               else if (node.isNodeType(AkbTypes.AKB_SSH_CONNECTOR))
+                                       return AkbImages.SSH_CONNECTOR;
+                               else if (node.isNodeType(AkbTypes.AKB_SSH_COMMAND))
+                                       return AkbImages.SSH_COMMAND;
+                               else if (node.isNodeType(AkbTypes.AKB_SSH_FILE))
+                                       return AkbImages.SSH_FILE;
+                               else if (node.isNodeType(AkbTypes.AKB_JDBC_CONNECTOR))
+                                       return AkbImages.JDBC_CONNECTOR;
+                               else if (node.isNodeType(AkbTypes.AKB_JDBC_QUERY))
+                                       return AkbImages.JDBC_QUERY;
+                               else if (node.isNodeType(AkbTypes.AKB_ENV_TEMPLATE))
+                                       return AkbImages.TEMPLATE;
+                               else if (node.isNodeType(AkbTypes.AKB_CONNECTOR_FOLDER))
+                                       return AkbImages.CONNECTOR_FOLDER;
+                       }
+               } catch (RepositoryException e) {
+                       throw new AkbException("Unexpected error while getting "
+                                       + "Custom node label", e);
+               }
                return null;
        }
 }