[jbosstools-commits] JBoss Tools SVN: r39815 - in trunk/as/plugins: org.jboss.ide.eclipse.as.jmx.integration/icons and 2 other directories.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-03-25 08:08:28 -0400 (Sun, 25 Mar 2012)
New Revision: 39815

Added:
   trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/icons/jboss.png
Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml
   trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss70ConnectionProvider.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-11396  changes to allow for proper icon for jmx connections

Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/icons/jboss.png
===================================================================
(Binary files differ)


Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/icons/jboss.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml	2012-03-25 11:20:46 UTC (rev 39814)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml	2012-03-25 12:08:28 UTC (rev 39815)
@@ -19,6 +19,23 @@
             class="org.jboss.ide.eclipse.as.jmx.integration.JBoss71ConnectionProvider">
       </connectionProvider>
    </extension>
+   
+	<!-- JMX Stuff -->
+	<extension
+         point="org.jboss.tools.jmx.ui.providerUI">
+      <providerUI
+            icon="$nl$/icons/jboss.png"
+            id="org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"
+            name="JBoss Server"/>
+      <providerUI
+            icon="$nl$/icons/jboss.png"
+            id="org.jboss.ide.eclipse.as.core.extensions.jmx.JBoss70ConnectionProvider"
+            name="JBoss Server"/>
+      <providerUI
+            icon="$nl$/icons/jboss.png"
+            id="org.jboss.ide.eclipse.as.core.extensions.jmx.JBoss71ServerConnectionProvider"
+            name="JBoss Server"/>
+   </extension>
 
    <extension
          point="org.jboss.ide.eclipse.as.core.pollers">
@@ -104,4 +121,5 @@
        </includes>
     </viewerActionBinding>
 	</extension>
+	
 </plugin>

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss70ConnectionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss70ConnectionProvider.java	2012-03-25 11:20:46 UTC (rev 39814)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss70ConnectionProvider.java	2012-03-25 12:08:28 UTC (rev 39815)
@@ -22,8 +22,11 @@
 import org.jboss.ide.eclipse.as.core.server.internal.ExtendedServerPropertiesAdapterFactory;
 import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
 import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
+import org.jboss.tools.jmx.core.ExtensionManager;
+import org.jboss.tools.jmx.core.IConnectionProvider;
 import org.jboss.tools.jmx.core.IConnectionProviderListener;
 import org.jboss.tools.jmx.core.IConnectionWrapper;
+import org.jboss.tools.jmx.core.providers.DefaultConnectionProvider;
 import org.jboss.tools.jmx.core.providers.DefaultConnectionWrapper;
 import org.jboss.tools.jmx.core.providers.MBeanServerConnectionDescriptor;
 
@@ -36,8 +39,11 @@
 	}
 
 	public String getName(IConnectionWrapper wrapper) {
-		if( wrapper instanceof JBossServerConnection) {
-			return ((JBossServerConnection)wrapper).getName();
+		if( wrapper instanceof ExtendedDefaultConnectionWrapper) {
+			MBeanServerConnectionDescriptor desc =
+					((ExtendedDefaultConnectionWrapper)wrapper).getDescriptor();
+				if( desc != null )
+					return desc.getID();
 		}
 		return null;
 	}
@@ -108,10 +114,13 @@
 		}
 		public void connectionChanged(IConnectionWrapper connection) {
 		}
+		
+		public IConnectionProvider getProvider() {
+			return ExtensionManager.getProvider(PROVIDER_ID);
+		}
 	}
 
 	public String getId() {
 		return PROVIDER_ID;
 	}
-	
 }

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml	2012-03-25 11:20:46 UTC (rev 39814)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml	2012-03-25 12:08:28 UTC (rev 39815)
@@ -485,16 +485,7 @@
       </decorator>
    </extension>
 	
-	<!-- JMX Stuff 
-	   <extension
-         point="org.jboss.tools.jmx.ui.providerUI">
-      <providerUI
-            icon="$nl$/icons/jboss.png"
-            id="org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"
-            name="JBoss Server">
-      </providerUI>
-   </extension>-->
-    <extension
+   <extension
           point="org.eclipse.debug.ui.launchConfigurationTypeImages">
        <launchConfigurationTypeImage
              configTypeID="org.jboss.ide.eclipse.as.core.server.startupConfiguration"