QPID-2021: move the refresh button to the right side of the Refresh Interval combo box for clarity, add icons for various 'manager' mbeans, remove Thumbs.db file from repository.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@800508 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 55 insertions, 3 deletions

diff --git a/qpid/java/management/eclipse-plugin/icons/Thumbs.db b/qpid/java/management/eclipse-plugin/icons/Thumbs.db
deleted file mode 100644
index 306bfb2eda..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/Thumbs.db
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/configuration_management.gif b/qpid/java/management/eclipse-plugin/icons/configuration_management.gif
new file mode 100644
index 0000000000..d11c996e57
--- /dev/null
+++ b/qpid/java/management/eclipse-plugin/icons/configuration_management.gif
diff --git a/qpid/java/management/eclipse-plugin/icons/logging_management.gif b/qpid/java/management/eclipse-plugin/icons/logging_management.gif
new file mode 100644
index 0000000000..7f5fe98a73
--- /dev/null
+++ b/qpid/java/management/eclipse-plugin/icons/logging_management.gif
diff --git a/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif b/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
index 89489f11f2..17f927e9a4 100644
--- a/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
+++ b/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
diff --git a/qpid/java/management/eclipse-plugin/icons/refresh.gif b/qpid/java/management/eclipse-plugin/icons/refresh.gif
index a063c230ac..1b724a6784 100644
--- a/qpid/java/management/eclipse-plugin/icons/refresh.gif
+++ b/qpid/java/management/eclipse-plugin/icons/refresh.gif
diff --git a/qpid/java/management/eclipse-plugin/icons/server_information.gif b/qpid/java/management/eclipse-plugin/icons/server_information.gif
new file mode 100644
index 0000000000..716df436f9
--- /dev/null
+++ b/qpid/java/management/eclipse-plugin/icons/server_information.gif
diff --git a/qpid/java/management/eclipse-plugin/icons/user_management.gif b/qpid/java/management/eclipse-plugin/icons/user_management.gif
new file mode 100644
index 0000000000..d28c326dea
--- /dev/null
+++ b/qpid/java/management/eclipse-plugin/icons/user_management.gif
diff --git a/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif b/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif
new file mode 100644
index 0000000000..e7ec2a1544
--- /dev/null
+++ b/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif
diff --git a/qpid/java/management/eclipse-plugin/plugin.xml b/qpid/java/management/eclipse-plugin/plugin.xml
index 947e30fb7c..e151456fa1 100644
--- a/qpid/java/management/eclipse-plugin/plugin.xml
+++ b/qpid/java/management/eclipse-plugin/plugin.xml
@@ -150,6 +150,7 @@
            <toolbar id="qpidMC">
                <separator name="qpidActionsGroup" visible="false"/>
                <separator name="refresh" visible="true"/>
+               <separator name="refresh2" visible="false"/>
                <separator name="additions" visible="false"/>
            </toolbar>
        </menuContribution>
@@ -179,8 +180,8 @@
                label="Refresh"
                menubarPath="qpidmanager/additions"
                style="push"
-               toolbarPath="qpidMC/qpidActionsGroup"
-               tooltip="Refresh"/>
+               toolbarPath="qpidMC/refresh2"
+               tooltip="Refresh Now"/>
          <action
                class="org.apache.qpid.management.ui.actions.RemoveServer"
                definitionId="org.apache.qpid.management.ui.actions.cmd_remove"
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
index 2e87709a28..cb758efa43 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
@@ -64,6 +64,16 @@ public abstract class ApplicationRegistry
                 PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT));
         imageRegistry.put(Constants.NOTIFICATION_IMAGE,
                 org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/notifications.gif"));
+        imageRegistry.put(Constants.LOGGING_MANAGEMENT_IMAGE,
+                org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/logging_management.gif"));
+        imageRegistry.put(Constants.USER_MANAGEMENT_IMAGE,
+                org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/user_management.gif"));
+        imageRegistry.put(Constants.CONFIGURATION_MANAGEMENT_IMAGE,
+                org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/configuration_management.gif"));
+        imageRegistry.put(Constants.SERVER_INFO_IMAGE,
+                org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/server_information.gif"));
+        imageRegistry.put(Constants.VHOST_MANAGER_IMAGE,
+                org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/virtualhost_manager.gif"));
     }
     
     static
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
index e6f0e227d8..cec9c8a83c 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
@@ -104,6 +104,11 @@ public class Constants
     public final static String OPEN_FOLDER_IMAGE = "OpenFolderImage";
     public final static String MBEAN_IMAGE = "MBeanImage";
     public final static String NOTIFICATION_IMAGE = "NotificationImage";
+    public final static String LOGGING_MANAGEMENT_IMAGE = "LoggingManagementImage";
+    public final static String USER_MANAGEMENT_IMAGE = "UserManagementImage";
+    public final static String CONFIGURATION_MANAGEMENT_IMAGE = "ConfigurationManagementImage";
+    public final static String SERVER_INFO_IMAGE = "ServerInfoImage";
+    public final static String VHOST_MANAGER_IMAGE = "VhostManagerImage";
     
     public final static String FONT_BUTTON = "ButtonFont";
     public final static String FONT_BOLD = "BoldFont";
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
index 2f22a7164d..6563498d41 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
@@ -36,6 +36,7 @@ import org.apache.qpid.management.common.mbeans.UserManagement;
 import org.apache.qpid.management.ui.ApiVersion;
 import org.apache.qpid.management.ui.ApplicationRegistry;
 import org.apache.qpid.management.ui.ManagedBean;
+import org.apache.qpid.management.ui.ManagedObject;
 import org.apache.qpid.management.ui.ManagedServer;
 import org.apache.qpid.management.ui.ServerRegistry;
 import org.apache.qpid.management.ui.exceptions.InfoRequiredException;
@@ -1151,7 +1152,42 @@ public class NavigationView extends ViewPart
             }
             else
             {
-                return ApplicationRegistry.getImage(MBEAN_IMAGE);
+                ManagedObject obj = node.getManagedObject();
+                if(obj instanceof ManagedBean)
+                {
+                    ManagedBean mbean = (ManagedBean) obj;
+                    String mbeanType = mbean.getType();
+
+                    if(mbeanType.equals(LoggingManagement.TYPE))
+                    {
+                        return ApplicationRegistry.getImage(LOGGING_MANAGEMENT_IMAGE);
+                    }
+                    else if(mbeanType.equals(UserManagement.TYPE))
+                    {
+                        return ApplicationRegistry.getImage(USER_MANAGEMENT_IMAGE);
+                    }
+                    else if(mbeanType.equals(ConfigurationManagement.TYPE))
+                    {
+                        return ApplicationRegistry.getImage(CONFIGURATION_MANAGEMENT_IMAGE);
+                    }
+                    else if(mbeanType.equals(ServerInformation.TYPE))
+                    {
+                        return ApplicationRegistry.getImage(SERVER_INFO_IMAGE);
+                    }
+                    else if(mbeanType.equals("VirtualHost.VirtualHostManager"))
+                    {
+                        return ApplicationRegistry.getImage(VHOST_MANAGER_IMAGE);
+                    }
+                    else
+                    {
+                        return ApplicationRegistry.getImage(MBEAN_IMAGE);
+                    }
+                    
+                }
+                else
+                {
+                    return ApplicationRegistry.getImage(MBEAN_IMAGE);
+                }
             }
         }