[jbosstools-commits] JBoss Tools SVN: r40226 - in trunk: jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui and 1 other directories.

Author: rob.stryker(a)jboss.com Date: 2012-04-16 19:23:08 -0400 (Mon, 16 Apr 2012) New Revision: 40226 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/AS71JMXClassLoaderRepository.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.java trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.properties trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java Log: /JBIDE-11064 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/AS71JMXClassLoaderRepository.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/AS71JMXClassLoaderRepository.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/AS71JMXClassLoaderRepository.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -37,9 +37,11 @@ IPath p2 = root.append(IJBossRuntimeResourceConstants.BIN) .append(IJBossRuntimeResourceConstants.CLIENT); String[] children = p2.toFile().list(); - for( int i = 0; i < children.length; i++ ) { - if( children[i].endsWith(".jar") && children[i].startsWith("jboss-client")) - return p2.append(children[i]); + if( children != null ) { + for( int i = 0; i < children.length; i++ ) { + if( children[i].endsWith(".jar") && children[i].startsWith("jboss-client")) + return p2.append(children[i]); + } } return null; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -47,16 +47,12 @@ else { port = ((IManagementPortProvider)sd).getManagementPort(); } - try { - String url = "service:jmx:remoting-jmx://" + s.getHost() + ":" + port; - Map<String, String[]> environment = new HashMap<String, String[]>(); - JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(url), environment); - MBeanServerConnection connection = connector.getMBeanServerConnection(); - return connection; - } catch(Exception e ) { - e.printStackTrace(); - return null; - } + + String url = "service:jmx:remoting-jmx://" + s.getHost() + ":" + port; + Map<String, String[]> environment = new HashMap<String, String[]>(); + JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(url), environment); + MBeanServerConnection connection = connector.getMBeanServerConnection(); + return connection; } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -27,6 +27,7 @@ import org.eclipse.wst.server.core.IServerListener; import org.eclipse.wst.server.core.ServerEvent; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; @@ -202,6 +203,8 @@ ((AbstractJBossJMXConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this); } } catch( Exception jmxe ) { + IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error connecting to jmx for server "+server.getName(), jmxe); + ServerLogger.getDefault().log(server, status); // I thought i was connected but I'm not. if( isConnected ) { isConnected = false; Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -87,6 +87,7 @@ public static String TypeInAFilter; public static String LoadingJMXNodes; public static String Loading; + public static String ErrorLoading; public static String UpdatingSelectionJob; public static String JMXUIImageDescriptorNotFound; Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.properties =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.properties 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.properties 2012-04-16 23:23:08 UTC (rev 40226) @@ -75,6 +75,7 @@ TypeInAFilter=Type in a filter LoadingJMXNodes=Loading JMX Nodes Loading=Loading... +ErrorLoading=Error loading JMX Nodes UpdatingSelectionJob=Updating selection job JMXUIImageDescriptorNotFound=Unable to load image {0} from plugin {1} \ No newline at end of file Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -27,6 +27,7 @@ import org.jboss.tools.jmx.core.IConnectionProviderListener; import org.jboss.tools.jmx.core.IConnectionWrapper; import org.jboss.tools.jmx.core.MBeanFeatureInfoWrapper; +import org.jboss.tools.jmx.core.tree.ErrorRoot; import org.jboss.tools.jmx.core.tree.Node; import org.jboss.tools.jmx.core.tree.ObjectNameNode; import org.jboss.tools.jmx.core.tree.Root; @@ -86,6 +87,9 @@ ObjectNameNode node = (ObjectNameNode) parent; return node.getMbeanInfoWrapper().getMBeanFeatureInfos(); } + if( parent instanceof ErrorRoot ) { + return new Object[0]; + } if (parent instanceof Node) { Node node = (Node) parent; return node.getChildren(); 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 23:16:22 UTC (rev 40225) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -26,6 +26,7 @@ import org.jboss.tools.jmx.core.MBeanInfoWrapper; import org.jboss.tools.jmx.core.MBeanOperationInfoWrapper; import org.jboss.tools.jmx.core.tree.DomainNode; +import org.jboss.tools.jmx.core.tree.ErrorRoot; import org.jboss.tools.jmx.core.tree.ObjectNameNode; import org.jboss.tools.jmx.core.tree.PropertyNode; import org.jboss.tools.jmx.ui.Messages; @@ -75,6 +76,9 @@ if( obj instanceof DelayProxy ) { return Messages.Loading; } + if( obj instanceof ErrorRoot ) { + return Messages.ErrorLoading; + } if (obj instanceof DomainNode) { DomainNode node = (DomainNode) obj; @@ -122,7 +126,10 @@ if( obj instanceof DelayProxy ) { return null; } - + if( obj instanceof ErrorRoot ) { + return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK); + } + if (obj instanceof DomainNode) { return JMXImages.get(JMXImages.IMG_OBJS_LIBRARY); }