Author: rob.stryker(a)jboss.com
Date: 2008-11-25 17:40:21 -0500 (Tue, 25 Nov 2008)
New Revision: 12054
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
Log:
JBIDE-3278 - ensuring all elements work for tomcat servers and other servers as well. JMX
does not and so does not show.
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java 2008-11-25
20:59:12 UTC (rev 12053)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java 2008-11-25
22:40:21 UTC (rev 12054)
@@ -18,8 +18,11 @@
delegate = new MBeanExplorerContentProvider();
}
public Object[] getChildren(Object parentElement) {
- if( parentElement instanceof IServer )
- return new Object[] {
JBossServerConnectionProvider.getConnection((IServer)parentElement)};
+ if( parentElement instanceof IServer ) {
+ Object sel = JBossServerConnectionProvider.getConnection((IServer)parentElement);
+ if( sel != null )
+ return new Object[] { sel };
+ }
return delegate.getChildren(parentElement);
}
public Object getParent(Object element) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2008-11-25
20:59:12 UTC (rev 12053)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2008-11-25
22:40:21 UTC (rev 12054)
@@ -218,12 +218,14 @@
return;
if (first instanceof ServerWrapper) {
+ selectedNode = first;
menu.add(newXPathCategoryAction);
menu.add(new Separator());
return;
}
if (first instanceof XPathCategory) {
+ selectedNode = first;
menu.add(newXPathAction);
menu.add(deleteXPathCategoryAction);
menu.add(new Separator());
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java 2008-11-25
20:59:12 UTC (rev 12053)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java 2008-11-25
22:40:21 UTC (rev 12054)
@@ -31,7 +31,7 @@
}
if( element instanceof XPathResultNode ) {
- return ((XPathResultNode)element).getText();
+ return " " + ((XPathResultNode)element).getText();
}
return null;
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2008-11-25
20:59:12 UTC (rev 12053)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2008-11-25
22:40:21 UTC (rev 12054)
@@ -49,6 +49,9 @@
if( element instanceof XPathFileResult )
return ((XPathFileResult)element).getFileLocation();
+ if( element instanceof XPathResultNode )
+ return "Match " + ((XPathResultNode)element).getIndex();
+
return "";
}
Show replies by date