JBoss Tools SVN: r4732 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-11-06 07:25:14 -0500 (Tue, 06 Nov 2007)
New Revision: 4732
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectResourceBundles.java
Log:
JBIDE-1259
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectResourceBundles.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectResourceBundles.java 2007-11-06 12:24:32 UTC (rev 4731)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectResourceBundles.java 2007-11-06 12:25:14 UTC (rev 4732)
@@ -18,6 +18,8 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl;
+import org.jboss.tools.common.model.filesystems.impl.FileSystemsLoader;
import org.jboss.tools.common.model.impl.*;
public class JSFProjectResourceBundles extends JSFProjectFolder {
@@ -56,8 +58,13 @@
protected Iterator<XModelObject> getRoots() {
List<XModelObject> list = new ArrayList<XModelObject>();
- XModelObject r = FileSystemsHelper.getFileSystem(getModel(), "src");
- if(r != null) list.add(r);
+ FileSystemsImpl fs = (FileSystemsImpl)FileSystemsHelper.getFileSystems(getModel());
+ new FileSystemsLoader().updateSrcs(fs);
+ XModelObject[] cs = FileSystemsHelper.getFileSystems(getModel()).getChildren("FileSystemFolder");
+ for (int i = 0; i < cs.length; i++) {
+ String n = cs[i].getAttributeValue("name");
+ if(n.startsWith("src")) list.add(cs[i]);
+ }
XModelObject web = getModel().getByPath("Web");
XModelObject[] ms = (web == null) ? new XModelObject[0] : web.getChildren("WebJSFModule");
if(ms.length > 0) {
@@ -67,7 +74,7 @@
while(st.hasMoreTokens()) {
String t = st.nextToken().trim();
if(t.length() == 0 || "src".equals(t)) continue;
- r = FileSystemsHelper.getFileSystem(getModel(), t);
+ XModelObject r = FileSystemsHelper.getFileSystem(getModel(), t);
if(r != null) list.add(r);
}
}
18 years, 2 months
JBoss Tools SVN: r4731 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-11-06 07:24:32 -0500 (Tue, 06 Nov 2007)
New Revision: 4731
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
Log:
JBIDE-1259
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2007-11-06 12:02:25 UTC (rev 4730)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2007-11-06 12:24:32 UTC (rev 4731)
@@ -60,6 +60,7 @@
}
updateLibs(object);
removeMissingJarSystems(object);
+ updateSrcs(object);
try {
((FileSystemsImpl)object).updateOverlapped();
} catch (Exception e) {
@@ -201,6 +202,52 @@
}
return lib;
}
+
+ public void updateSrcs(XModelObject object) {
+ if(WatcherLoader.isLocked(object.getModel())) {
+ return;
+ }
+ IProject p = EclipseResourceUtil.getProject(object);
+ if(p == null || !p.isAccessible()) return;
+ String[] srcs = EclipseResourceUtil.getJavaProjectSrcLocations(p);
+ Set<String> paths = new HashSet<String>();
+ for (int i = 0; i < srcs.length; i++) {
+ String path = EclipseResourceUtil.getRelativeLocation(object.getModel(), srcs[i]);
+ if(path == null) continue;
+ paths.add(path);
+ }
+ XModelObject[] cs = object.getChildren("FileSystemFolder");
+ for (int i = 0; i < cs.length; i++) {
+ if(cs[i].getAttributeValue("name").startsWith("src")) {
+ String loc = cs[i].getAttributeValue("location");
+ if(!paths.contains(loc)) {
+ object.removeChild(cs[i]);
+ } else {
+ paths.remove(loc);
+ }
+ }
+ }
+ for (String path : paths) {
+ String n = getNextSrcName(object);
+ Properties properties = new Properties();
+ properties.setProperty("location", path);
+ properties.setProperty("name", n);
+ FileSystemImpl s = (FileSystemImpl)object.getModel().createModelObject("FileSystemFolder", properties);
+ object.addChild(s);
+ }
+ }
+
+ private String getNextSrcName(XModelObject object) {
+ if(object.getChildByPath("src") == null) return "src";
+ int i = 1;
+ while(true) {
+ String s = "src-" + i;
+ if(object.getChildByPath(s) == null) return s;
+ i++;
+ return s;
+ }
+ }
+
}
class FileSystemsLoaderUtil extends XModelObjectLoaderUtil {
18 years, 2 months
JBoss Tools SVN: r4730 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-11-06 07:02:25 -0500 (Tue, 06 Nov 2007)
New Revision: 4730
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1256 Fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java 2007-11-06 07:49:01 UTC (rev 4729)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/TypeInfoCollector.java 2007-11-06 12:02:25 UTC (rev 4730)
@@ -503,9 +503,9 @@
boolean isInstanceofType = qualifiedTypeName.equals(type.getFullyQualifiedName());
if (!isInstanceofType) {
ITypeHierarchy typeHierarchy = type.newSupertypeHierarchy(new NullProgressMonitor());
- IType[] superTypes = typeHierarchy == null ? null : typeHierarchy.getSupertypes(type);
+ IType[] superTypes = typeHierarchy == null ? null : typeHierarchy.getAllSupertypes(type);
for (int i = 0; !isInstanceofType && superTypes != null && i < superTypes.length; i++) {
- if (qualifiedTypeName.equals(superTypes[i])) {
+ if (qualifiedTypeName.equals(superTypes[i].getFullyQualifiedName())) {
return true;
}
}
18 years, 2 months
JBoss Tools SVN: r4729 - trunk/seam/docs/SeamToolsRef/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-11-06 02:49:01 -0500 (Tue, 06 Nov 2007)
New Revision: 4729
Modified:
trunk/seam/docs/SeamToolsRef/reference/en/modules/DevelopAsimpleJSPWebApplication.xml
Log:
http://jira.jboss.com/jira/browse/RHDS-283 error is fixed in jsp scriptlet
Modified: trunk/seam/docs/SeamToolsRef/reference/en/modules/DevelopAsimpleJSPWebApplication.xml
===================================================================
--- trunk/seam/docs/SeamToolsRef/reference/en/modules/DevelopAsimpleJSPWebApplication.xml 2007-11-06 07:42:41 UTC (rev 4728)
+++ trunk/seam/docs/SeamToolsRef/reference/en/modules/DevelopAsimpleJSPWebApplication.xml 2007-11-06 07:49:01 UTC (rev 4729)
@@ -72,7 +72,7 @@
<listitem><para>Insert this line inside the <emphasis role="bold"><property><body></property></emphasis><emphasis role="bold"><property></body></property></emphasis> tag:
</para></listitem>
</itemizedlist>
-<programlisting role="XML"><![CDATA[<% out.println("Hello World!"); %>]]>
+<programlisting role="XML"><![CDATA[<% System.out.println("Hello World!"); %>]]>
</programlisting>
<para>Notice that content assist functionality is always available when you are typing:</para>
18 years, 2 months
JBoss Tools SVN: r4728 - trunk/seam/docs/SeamToolsRef/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-11-06 02:42:41 -0500 (Tue, 06 Nov 2007)
New Revision: 4728
Modified:
trunk/seam/docs/SeamToolsRef/reference/en/modules/RADdevelopmentOfSimpleJSFapplication.xml
Log:
http://jira.jboss.com/jira/browse/RHDS-286 mistakes are corrected in names of jsp files
Modified: trunk/seam/docs/SeamToolsRef/reference/en/modules/RADdevelopmentOfSimpleJSFapplication.xml
===================================================================
--- trunk/seam/docs/SeamToolsRef/reference/en/modules/RADdevelopmentOfSimpleJSFapplication.xml 2007-11-06 06:40:27 UTC (rev 4727)
+++ trunk/seam/docs/SeamToolsRef/reference/en/modules/RADdevelopmentOfSimpleJSFapplication.xml 2007-11-06 07:42:41 UTC (rev 4728)
@@ -357,10 +357,10 @@
Editor.</para>
<section id="EditingInputjsp">
<?dbhtml filename="EditingInputjsp.html"?>
-<title>Editing inputname.jsp page</title>
+<title>Editing inputnumber.jsp page</title>
<para>On this page we will have an output text component displaying a message, a text field for user's number entering and a button for input submission.</para>
<itemizedlist>
-<listitem><para>Open inputnumber.jsp by double-clicking on the <emphasis><property>/pages/inputnamber.
+<listitem><para>Open inputnumber.jsp by double-clicking on the <emphasis><property>/pages/inputnumber.
jsp</property></emphasis> icon</para></listitem>
</itemizedlist>
<para>The Visual Page Editor will open in a screen split between source code along the top and
18 years, 2 months
JBoss Tools SVN: r4727 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-11-06 01:40:27 -0500 (Tue, 06 Nov 2007)
New Revision: 4727
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/OperationGroup.java
Log:
Moving along towards getting operations implemented.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/OperationGroup.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/OperationGroup.java 2007-11-06 06:40:25 UTC (rev 4726)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/OperationGroup.java 2007-11-06 06:40:27 UTC (rev 4727)
@@ -21,6 +21,8 @@
*/
package org.jboss.ide.eclipse.as.ui.views.server.providers.jmx;
+import java.util.HashMap;
+
import javax.management.MBeanParameterInfo;
import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -29,6 +31,8 @@
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
@@ -38,6 +42,7 @@
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
import org.jboss.ide.eclipse.as.core.extensions.jmx.JMXModel.WrappedMBeanOperationInfo;
+import org.jboss.ide.eclipse.as.core.extensions.jmx.JMXModel.WrappedMBeanOperationParameter;
/**
*
@@ -51,6 +56,7 @@
protected TreeViewer treeViewer;
protected JMXPropertySheetPage page;
protected Button executeButton;
+ protected WrappedMBeanOperationInfo selectedOperation;
public OperationGroup(Composite parent, int style, JMXPropertySheetPage page) {
super(parent, style);
@@ -100,8 +106,19 @@
// JMXAttributePropertySelListener selListener = new JMXOperationPropertySelListener();
// tree.addListener(SWT.MouseDoubleClick, selListener);
+ executeButton.addSelectionListener(new SelectionListener() {
+ public void widgetDefaultSelected(SelectionEvent e) {
+ widgetSelected(e);
+ }
+ public void widgetSelected(SelectionEvent e) {
+ executePressed();
+ }
+ });
}
+ protected void executePressed() {
+ }
+
protected class OperationViewerContentProvider implements
ITreeContentProvider {
@@ -141,7 +158,7 @@
MBeanParameterInfo info = (MBeanParameterInfo)element;
if( columnIndex == 0 ) return info.getName();
if( columnIndex == 1 ) return info.getType();
- if( columnIndex == 2 ) return "";
+ if( columnIndex == 2 ) return opParams.get(element) == null ? "null" : opParams.get(element).toString();
if( columnIndex == 3 ) return info.getDescription();
}
return "";
@@ -149,7 +166,14 @@
}
+ protected HashMap<MBeanParameterInfo, Object> opParams;
public void setOperation(WrappedMBeanOperationInfo op) {
+ opParams = new HashMap<MBeanParameterInfo, Object>();
+ WrappedMBeanOperationParameter[] params = op.getParameters();
+ for( int i = 0; i < params.length; i++ ) {
+ opParams.put(params[i].getInfo(), null);
+ }
+ selectedOperation = op;
treeViewer.setInput(op);
}
18 years, 2 months
JBoss Tools SVN: r4726 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-11-06 01:40:25 -0500 (Tue, 06 Nov 2007)
New Revision: 4726
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java
Log:
Moving along towards getting operations implemented.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java 2007-11-06 05:46:45 UTC (rev 4725)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java 2007-11-06 06:40:25 UTC (rev 4726)
@@ -371,6 +371,7 @@
public Object getValue() { return value; }
public void setValue(Object o) { this.value = o; }
+ public MBeanParameterInfo getInfo() { return this.parameterInfo; }
}
public static class WrappedMBeanAttributeInfo {
18 years, 2 months
JBoss Tools SVN: r4725 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-11-06 00:46:45 -0500 (Tue, 06 Nov 2007)
New Revision: 4725
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jmxIcon.JPG
Log:
image commit
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jmxIcon.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jmxIcon.JPG
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 2 months
JBoss Tools SVN: r4724 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-11-05 23:30:47 -0500 (Mon, 05 Nov 2007)
New Revision: 4724
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
Log:
JBIDE-1272
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2007-11-05 22:37:26 UTC (rev 4723)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2007-11-06 04:30:47 UTC (rev 4724)
@@ -128,7 +128,6 @@
public static String XPathNameInUse;
public static String XPathColumnLocation;
public static String XPathColumnAttributeVals;
- public static String XPathColumnRawXML;
public static String XPathName;
public static String XPathPattern;
18 years, 2 months
JBoss Tools SVN: r4723 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-11-05 17:37:26 -0500 (Mon, 05 Nov 2007)
New Revision: 4723
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/AttributeGroup.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/JMXPropertySheetPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/JMXViewProvider.java
Log:
cleaning up JMX in case I get lucky and finish it in time tonight =D
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/AttributeGroup.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/AttributeGroup.java 2007-11-05 20:56:12 UTC (rev 4722)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/AttributeGroup.java 2007-11-05 22:37:26 UTC (rev 4723)
@@ -21,6 +21,8 @@
*/
package org.jboss.ide.eclipse.as.ui.views.server.providers.jmx;
+import java.util.ArrayList;
+
import javax.management.Attribute;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
@@ -43,7 +45,6 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
@@ -134,6 +135,14 @@
final WrappedMBeanAttributeInfo attInfo = (WrappedMBeanAttributeInfo) item
.getData();
+ // If we can't create one of these objects via a string,
+ // handle it through a wizard instead.
+ if( !isSimpleType(attInfo.getInfo().getType())) {
+ handleComplexType(attInfo);
+ return;
+ }
+
+
final int column = 3;
boolean isCarbon = SWT.getPlatform().equals("carbon");
final Composite composite = new Composite(tree, SWT.NONE);
@@ -200,22 +209,32 @@
}
}
-
- protected void saveAttributeChange(final WrappedMBeanAttributeInfo attInfo, Text text) {
- if (text.isDisposed())
- return;
- final String text2 = text.getText();
- final Attribute att = createAttribute(attInfo, text2);
- final Boolean[] errorBool = new Boolean[1];
+
+ protected void saveAttributeChange(WrappedMBeanAttributeInfo attInfo, Text text) {
+ if (!text.isDisposed()) {
+ Attribute att = createAttribute(attInfo, text.getText());
+ if( att == null ) {
+ // throw up a message box and say no can do, for now
+ MessageBox messageBox = new MessageBox (new Shell(), SWT.OK);
+ messageBox.setText ("Cannot update bean");
+ messageBox.setMessage ("Bean update cannot proceed. Plug-in cannot convert " + text.getText() + " into " + attInfo.getInfo().getType());
+ messageBox.open();
+ return;
+ }
+ saveAttributeChange(attInfo, att);
+ }
+ }
+
+ protected void saveAttributeChange(final WrappedMBeanAttributeInfo attInfo, final Attribute att) {
if( att == null ) {
// throw up a message box and say no can do, for now
MessageBox messageBox = new MessageBox (new Shell(), SWT.OK);
messageBox.setText ("Cannot update bean");
- messageBox.setMessage ("Bean update cannot proceed. Plug-in cannot convert " + text2 + " into " + attInfo.getInfo().getType());
+ messageBox.setMessage ("Bean update cannot proceed. Plug-in cannot convert " + att.getValue().toString() + " into " + attInfo.getInfo().getType());
messageBox.open();
return;
}
-
+ final Boolean[] errorBool = new Boolean[1];
final JMXRunnable run = new JMXRunnable() {
public void run(MBeanServerConnection connection) {
try {
@@ -249,15 +268,39 @@
Object val = null;
if( type != null ) {
- if( type.equals("java.lang.String")) val = text;
- else if( type.equals("boolean")) val = new Boolean(text);
- else if( type.equals("int")) val = new Integer(text);
- else if( type.equals("long")) val = new Long(text);
+ try {
+ if( type.equals("java.lang.String")) val = text;
+ else if( type.equals("boolean")) val = new Boolean(text);
+ else if( type.equals("int")) val = new Integer(text);
+ else if( type.equals("long")) val = new Long(text);
+ } catch( Exception e ) {}
}
return val == null ? null :
new Attribute(attInfo.getInfo().getName(), val);
}
+ protected ArrayList<String> simpleTypeList = null;
+ protected boolean isSimpleType(String fullClassName) {
+ if( simpleTypeList == null ) {
+ simpleTypeList = new ArrayList<String>();
+ simpleTypeList.add("java.lang.String");
+ simpleTypeList.add("boolean");
+ simpleTypeList.add("int");
+ simpleTypeList.add("long");
+ }
+ return simpleTypeList.contains(fullClassName);
+ }
+
+ protected void handleComplexType(WrappedMBeanAttributeInfo info) {
+ // throw up a message box and say no can do, for now
+ MessageBox messageBox = new MessageBox (new Shell(), SWT.OK);
+ messageBox.setText ("Cannot update bean");
+ messageBox.setMessage ("Bean update cannot proceed. Plug-in cannot create instances of " + info.getInfo().getType() + " at this time.");
+ messageBox.open();
+ return;
+ }
+
+
protected class AttributeViewerContentProvider implements
ITreeContentProvider {
public Object[] getChildren(Object parentElement) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/JMXPropertySheetPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/JMXPropertySheetPage.java 2007-11-05 20:56:12 UTC (rev 4722)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/JMXPropertySheetPage.java 2007-11-05 22:37:26 UTC (rev 4723)
@@ -153,6 +153,7 @@
protected void setInputObject(Object obj) {
if (obj instanceof JMXDomain) {
showDomainComposite((JMXDomain) obj);
+ setBean(null);
} else if (obj instanceof JMXBean) {
setBean((JMXBean) obj);
} else if (obj instanceof JMXAttributesWrapper
@@ -168,9 +169,6 @@
&& bean.getException() == null;
boolean hasError = bean.getOperations() == null
&& bean.getException() != null;
- boolean currentBeanLoading = bean == this.bean
- && pulldown.getItems().length == 1
- && pulldown.getItems()[0].equals(JMXViewProvider.LOADING_STRING_ARRAY[0]);
boolean finishedLoading = bean.getOperations() != null;
this.bean = bean;
@@ -193,6 +191,10 @@
+ bean.getAttributes().length + " attributes)");
}
main.layout();
+ } else {
+ beanLabel.setText("Please select an mbean from the JBoss Servers View");
+ pulldown.setItems(JMXViewProvider.SELECT_MBEAN_ARRAY);
+ pulldown.select(0); // select Loading...
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/JMXViewProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/JMXViewProvider.java 2007-11-05 20:56:12 UTC (rev 4722)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/jmx/JMXViewProvider.java 2007-11-05 22:37:26 UTC (rev 4723)
@@ -53,6 +53,7 @@
public class JMXViewProvider extends JBossServerViewExtension {
public static final Object LOADING = new Object();
public static final String[] LOADING_STRING_ARRAY = new String[] { "Loading..." };
+ public static final String[] SELECT_MBEAN_ARRAY = new String[] { "Please select an MBean from the JBoss Server's View"};
public static final String ATTRIBUTES_STRING = "Attributes...";
public static final Object CLASSLOADING_TOKEN = new Object();
18 years, 2 months