You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2009/08/03 21:32:59 UTC
svn commit: r800508 - in /qpid/trunk/qpid/java/management/eclipse-plugin: ./
icons/ src/main/java/org/apache/qpid/management/ui/
src/main/java/org/apache/qpid/management/ui/views/
Author: robbie
Date: Mon Aug 3 19:32:59 2009
New Revision: 800508
URL: http://svn.apache.org/viewvc?rev=800508&view=rev
Log:
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.
Added:
qpid/trunk/qpid/java/management/eclipse-plugin/icons/configuration_management.gif
qpid/trunk/qpid/java/management/eclipse-plugin/icons/logging_management.gif
qpid/trunk/qpid/java/management/eclipse-plugin/icons/server_information.gif
qpid/trunk/qpid/java/management/eclipse-plugin/icons/user_management.gif
qpid/trunk/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif
Removed:
qpid/trunk/qpid/java/management/eclipse-plugin/icons/Thumbs.db
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
qpid/trunk/qpid/java/management/eclipse-plugin/icons/refresh.gif
qpid/trunk/qpid/java/management/eclipse-plugin/plugin.xml
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
Added: qpid/trunk/qpid/java/management/eclipse-plugin/icons/configuration_management.gif
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/icons/configuration_management.gif?rev=800508&view=auto
==============================================================================
Files qpid/trunk/qpid/java/management/eclipse-plugin/icons/configuration_management.gif (added) and qpid/trunk/qpid/java/management/eclipse-plugin/icons/configuration_management.gif Mon Aug 3 19:32:59 2009 differ
Added: qpid/trunk/qpid/java/management/eclipse-plugin/icons/logging_management.gif
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/icons/logging_management.gif?rev=800508&view=auto
==============================================================================
Files qpid/trunk/qpid/java/management/eclipse-plugin/icons/logging_management.gif (added) and qpid/trunk/qpid/java/management/eclipse-plugin/icons/logging_management.gif Mon Aug 3 19:32:59 2009 differ
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif?rev=800508&r1=800507&r2=800508&view=diff
==============================================================================
Binary files - no diff available.
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/icons/refresh.gif
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/icons/refresh.gif?rev=800508&r1=800507&r2=800508&view=diff
==============================================================================
Binary files - no diff available.
Added: qpid/trunk/qpid/java/management/eclipse-plugin/icons/server_information.gif
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/icons/server_information.gif?rev=800508&view=auto
==============================================================================
Files qpid/trunk/qpid/java/management/eclipse-plugin/icons/server_information.gif (added) and qpid/trunk/qpid/java/management/eclipse-plugin/icons/server_information.gif Mon Aug 3 19:32:59 2009 differ
Added: qpid/trunk/qpid/java/management/eclipse-plugin/icons/user_management.gif
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/icons/user_management.gif?rev=800508&view=auto
==============================================================================
Files qpid/trunk/qpid/java/management/eclipse-plugin/icons/user_management.gif (added) and qpid/trunk/qpid/java/management/eclipse-plugin/icons/user_management.gif Mon Aug 3 19:32:59 2009 differ
Added: qpid/trunk/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif?rev=800508&view=auto
==============================================================================
Files qpid/trunk/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif (added) and qpid/trunk/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif Mon Aug 3 19:32:59 2009 differ
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/plugin.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/plugin.xml?rev=800508&r1=800507&r2=800508&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/plugin.xml (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/plugin.xml Mon Aug 3 19:32:59 2009
@@ -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"
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java?rev=800508&r1=800507&r2=800508&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java Mon Aug 3 19:32:59 2009
@@ -64,6 +64,16 @@
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
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java?rev=800508&r1=800507&r2=800508&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java Mon Aug 3 19:32:59 2009
@@ -104,6 +104,11 @@
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";
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java?rev=800508&r1=800507&r2=800508&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java Mon Aug 3 19:32:59 2009
@@ -36,6 +36,7 @@
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 @@
}
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);
+ }
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org