[jbosstools-commits] JBoss Tools SVN: r40210 - in trunk: jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator and 1 other directory.
Author: rob.stryker(a)jboss.com
Date: 2012-04-16 10:20:27 -0400 (Mon, 16 Apr 2012)
New Revision: 40210
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java
Log:
JBIDE-11452 - MBean Explorer displays NPE
JBIDE-11396 - JBoss jmx sever connections should have jboss server icon
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties 2012-04-16
14:06:22 UTC (rev 40209)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties 2012-04-16
14:20:27 UTC (rev 40210)
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ icons/
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java
===================================================================
---
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java 2012-04-16
14:06:22 UTC (rev 40209)
+++
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java 2012-04-16
14:20:27 UTC (rev 40210)
@@ -52,8 +52,12 @@
public void dispose() {
instances.remove(this);
if( instances.isEmpty()) {
- for( Iterator<Image> i = images.values().iterator(); i.hasNext(); )
- i.next().dispose();
+ Iterator<Image> i = images.values().iterator();
+ while(i.hasNext()) {
+ Image o = i.next();
+ if( o != null )
+ o.dispose();
+ }
}
super.dispose();
}
@@ -104,8 +108,8 @@
if( obj instanceof IConnectionWrapper ) {
IConnectionProvider provider = ((IConnectionWrapper)obj).getProvider();
ConnectionProviderUI ui =
UIExtensionManager.getConnectionProviderUI(provider.getId());
- if( ui != null ) {
- if(!images.containsKey(ui.getId()) || images.get(ui.getId()).isDisposed()) {
+ if( ui != null && ui.getId() != null ) {
+ if(images.get(ui.getId()) == null || images.get(ui.getId()).isDisposed()) {
Image i = null;
if( ui.getImageDescriptor() != null ) {
i = ui.getImageDescriptor().createImage();