Thread: [Ejtools-cvs] CVS: libraries/adwt/src/main/net/sourceforge/ejtools/awt BeanContextListPanel.java,1.1
Brought to you by:
letiemble
From: Laurent E. <let...@us...> - 2002-04-30 21:07:13
|
Update of /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt In directory usw-pr-cvs1:/tmp/cvs-serv3510/libraries/adwt/src/main/net/sourceforge/ejtools/awt Modified Files: BeanContextListPanel.java BeanContextListView.java BeanContextTreePanel.java BeanContextTreeView.java GenericCustomizer.java GenericMBeanCustomizer.java GenericMBeanMethodDialog.java Log Message: Pretty print source code Index: BeanContextListPanel.java =================================================================== RCS file: /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt/BeanContextListPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BeanContextListPanel.java 28 Apr 2002 13:01:37 -0000 1.1 --- BeanContextListPanel.java 30 Apr 2002 21:07:09 -0000 1.2 *************** *** 1,16 **** /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.awt; - import java.awt.Container; import java.awt.Dimension; ! import java.beans.beancontext.*; ! import javax.swing.*; ! import javax.swing.event.*; ! import javax.swing.tree.*; /** --- 1,29 ---- /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at www.gnu.org. */ package net.sourceforge.ejtools.awt; import java.awt.Dimension; ! import java.beans.beancontext.BeanContext; ! import java.beans.beancontext.BeanContextChildComponentProxy; ! import java.beans.beancontext.BeanContextContainerProxy; ! ! import javax.swing.BorderFactory; ! import javax.swing.JLabel; ! import javax.swing.JList; ! import javax.swing.JPanel; ! import javax.swing.JScrollPane; ! import javax.swing.JSplitPane; ! import javax.swing.ListModel; ! import javax.swing.SwingUtilities; ! import javax.swing.event.ListDataEvent; ! import javax.swing.event.ListDataListener; ! import javax.swing.event.ListSelectionEvent; ! import javax.swing.event.ListSelectionListener; ! ! import net.sourceforge.ejtools.awt.BeanContextListView.ContextElement; /** *************** *** 20,113 **** * @created 16 octobre 2001 */ ! public class BeanContextListPanel extends JSplitPane { ! JList list; ! /** ! *Constructor for the BeanContextListPanel object ! * ! * @param beancontext Description of Parameter ! */ ! public BeanContextListPanel(BeanContext beancontext) { ! this(beancontext, null); ! } ! /** ! *Constructor for the BeanContextListPanel object ! * ! * @param beancontext Description of Parameter ! * @param s Description of Parameter ! */ ! public BeanContextListPanel(BeanContext beancontext, String s) { ! super(1); ! if (s != null) { ! setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), s)); ! } ! list = new BeanContextListView(beancontext); ! JScrollPane jscrollpane = new JScrollPane(list); ! jscrollpane.setMinimumSize(new Dimension(200, 300)); ! jscrollpane.setPreferredSize(new Dimension(200, 300)); ! final JPanel dummyMsg = new JPanel(); ! dummyMsg.add(new JLabel("", 0)); ! setLeftComponent(jscrollpane); ! setRightComponent(dummyMsg); ! list.addListSelectionListener( ! new ListSelectionListener() { ! public void valueChanged(ListSelectionEvent e) { ! if (e.getValueIsAdjusting()) { ! return; ! } ! final int index = list.getSelectedIndex(); ! final ListModel model = list.getModel(); ! SwingUtilities.invokeLater( ! new Runnable() { ! public void run() { ! try { ! Object obj = ((BeanContextListView.ContextElement) model.getElementAt(index)).getUserObject(); ! if (obj instanceof BeanContextChildComponentProxy) { ! BeanContextChildComponentProxy beancontextchildcomponentproxy = (BeanContextChildComponentProxy) obj; ! setRightComponent(beancontextchildcomponentproxy.getComponent()); ! } else ! if (obj instanceof BeanContextContainerProxy) { ! BeanContextContainerProxy beancontextcontainerproxy = (BeanContextContainerProxy) obj; ! setRightComponent(beancontextcontainerproxy.getContainer()); ! } ! validate(); ! } catch (Exception _ex) { ! } ! } ! }); ! } ! }); ! list.getModel().addListDataListener( ! new ListDataListener() { ! public void intervalAdded(ListDataEvent e) { ! list.clearSelection(); ! setRightComponent(dummyMsg); ! validate(); ! } ! public void intervalRemoved(ListDataEvent e) { ! list.clearSelection(); ! setRightComponent(dummyMsg); ! validate(); ! } ! public void contentsChanged(ListDataEvent e) { ! list.clearSelection(); ! setRightComponent(dummyMsg); ! validate(); ! } ! }); ! } } --- 33,146 ---- * @created 16 octobre 2001 */ ! public class BeanContextListPanel extends JSplitPane ! { ! /** Description of the Field */ ! JList list; ! /** ! *Constructor for the BeanContextListPanel object ! * ! * @param beancontext Description of Parameter ! */ ! public BeanContextListPanel(BeanContext beancontext) ! { ! this(beancontext, null); ! } ! /** ! *Constructor for the BeanContextListPanel object ! * ! * @param beancontext Description of Parameter ! * @param s Description of Parameter ! */ ! public BeanContextListPanel(BeanContext beancontext, String s) ! { ! super(1); ! if (s != null) ! { ! setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), s)); ! } ! list = new BeanContextListView(beancontext); ! JScrollPane jscrollpane = new JScrollPane(list); ! jscrollpane.setMinimumSize(new Dimension(200, 300)); ! jscrollpane.setPreferredSize(new Dimension(200, 300)); ! final JPanel dummyMsg = new JPanel(); ! dummyMsg.add(new JLabel("", 0)); ! setLeftComponent(jscrollpane); ! setRightComponent(dummyMsg); ! list.addListSelectionListener( ! new ListSelectionListener() ! { ! public void valueChanged(ListSelectionEvent e) ! { ! if (e.getValueIsAdjusting()) ! { ! return; ! } ! final int index = list.getSelectedIndex(); ! final ListModel model = list.getModel(); ! SwingUtilities.invokeLater( ! new Runnable() ! { ! public void run() ! { ! try ! { ! Object obj = ((BeanContextListView.ContextElement) model.getElementAt(index)).getUserObject(); ! if (obj instanceof BeanContextChildComponentProxy) ! { ! BeanContextChildComponentProxy beancontextchildcomponentproxy = (BeanContextChildComponentProxy) obj; ! setRightComponent(beancontextchildcomponentproxy.getComponent()); ! } ! else ! if (obj instanceof BeanContextContainerProxy) ! { ! BeanContextContainerProxy beancontextcontainerproxy = (BeanContextContainerProxy) obj; ! setRightComponent(beancontextcontainerproxy.getContainer()); ! } ! validate(); ! } ! catch (Exception _ex) ! { ! } ! } ! }); ! } ! }); ! list.getModel().addListDataListener( ! new ListDataListener() ! { ! public void intervalAdded(ListDataEvent e) ! { ! list.clearSelection(); ! setRightComponent(dummyMsg); ! validate(); ! } ! public void intervalRemoved(ListDataEvent e) ! { ! list.clearSelection(); ! setRightComponent(dummyMsg); ! validate(); ! } ! public void contentsChanged(ListDataEvent e) ! { ! list.clearSelection(); ! setRightComponent(dummyMsg); ! validate(); ! } ! }); ! } } Index: BeanContextListView.java =================================================================== RCS file: /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt/BeanContextListView.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BeanContextListView.java 28 Apr 2002 13:01:38 -0000 1.1 --- BeanContextListView.java 30 Apr 2002 21:07:09 -0000 1.2 *************** *** 7,18 **** package net.sourceforge.ejtools.awt; ! import java.awt.*; ! import java.awt.event.*; ! import java.beans.*; ! import java.beans.beancontext.*; ! import java.lang.reflect.*; ! import java.util.*; ! import javax.swing.*; ! import javax.swing.event.*; /** --- 7,29 ---- package net.sourceforge.ejtools.awt; ! import java.awt.Component; ! import java.beans.BeanInfo; ! import java.beans.Introspector; ! import java.beans.beancontext.BeanContext; ! import java.beans.beancontext.BeanContextChildComponentProxy; ! import java.beans.beancontext.BeanContextContainerProxy; ! import java.beans.beancontext.BeanContextMembershipEvent; ! import java.beans.beancontext.BeanContextMembershipListener; ! import java.lang.reflect.Method; ! import java.util.Iterator; ! import java.util.Vector; ! ! import javax.swing.DefaultListCellRenderer; ! import javax.swing.ImageIcon; ! import javax.swing.JLabel; ! import javax.swing.JList; ! import javax.swing.ListModel; ! import javax.swing.event.ListDataEvent; ! import javax.swing.event.ListDataListener; /** Index: BeanContextTreePanel.java =================================================================== RCS file: /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt/BeanContextTreePanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BeanContextTreePanel.java 28 Apr 2002 13:01:55 -0000 1.1 --- BeanContextTreePanel.java 30 Apr 2002 21:07:09 -0000 1.2 *************** *** 7,16 **** package net.sourceforge.ejtools.awt; - import java.awt.Container; import java.awt.Dimension; ! import java.beans.beancontext.*; ! import javax.swing.*; ! import javax.swing.event.*; ! import javax.swing.tree.*; import net.sourceforge.ejtools.jmx.ObjectNameFinder; --- 7,29 ---- package net.sourceforge.ejtools.awt; import java.awt.Dimension; ! import java.beans.beancontext.BeanContext; ! import java.beans.beancontext.BeanContextChildComponentProxy; ! import java.beans.beancontext.BeanContextContainerProxy; ! ! import javax.swing.BorderFactory; ! import javax.swing.JLabel; ! import javax.swing.JPanel; ! import javax.swing.JScrollPane; ! import javax.swing.JSplitPane; ! import javax.swing.JTree; ! import javax.swing.SwingUtilities; ! import javax.swing.event.TreeModelEvent; ! import javax.swing.event.TreeModelListener; ! import javax.swing.event.TreeSelectionEvent; ! import javax.swing.event.TreeSelectionListener; ! import javax.swing.tree.DefaultMutableTreeNode; ! import javax.swing.tree.TreePath; ! import net.sourceforge.ejtools.jmx.ObjectNameFinder; Index: BeanContextTreeView.java =================================================================== RCS file: /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt/BeanContextTreeView.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BeanContextTreeView.java 18 Apr 2002 21:10:30 -0000 1.1 --- BeanContextTreeView.java 30 Apr 2002 21:07:09 -0000 1.2 *************** *** 7,24 **** package net.sourceforge.ejtools.awt; ! import java.awt.*; ! import java.awt.event.*; ! import java.beans.*; ! import java.beans.beancontext.*; ! import java.io.*; ! import java.lang.reflect.*; ! import java.util.*; ! import javax.swing.*; ! import javax.swing.event.*; ! import javax.swing.tree.*; - import com.dreambean.awt.*; import net.sourceforge.ejtools.jmx.ObjectNameFinder; ! import org.apache.log4j.*; /** --- 7,49 ---- package net.sourceforge.ejtools.awt; ! import java.awt.Component; ! import java.awt.event.ActionEvent; ! import java.awt.event.MouseAdapter; ! import java.awt.event.MouseEvent; ! import java.beans.BeanInfo; ! import java.beans.Introspector; ! import java.beans.MethodDescriptor; ! import java.beans.beancontext.BeanContext; ! import java.beans.beancontext.BeanContextChildComponentProxy; ! import java.beans.beancontext.BeanContextContainerProxy; ! import java.beans.beancontext.BeanContextMembershipEvent; ! import java.beans.beancontext.BeanContextMembershipListener; ! import java.lang.reflect.Method; ! import java.util.Collection; ! import java.util.Enumeration; ! import java.util.Hashtable; ! import java.util.Iterator; ! ! import javax.swing.AbstractAction; ! import javax.swing.Icon; ! import javax.swing.ImageIcon; ! import javax.swing.JFrame; ! import javax.swing.JLabel; ! import javax.swing.JPopupMenu; ! import javax.swing.JTree; ! import javax.swing.SwingUtilities; ! import javax.swing.event.TreeSelectionEvent; ! import javax.swing.event.TreeSelectionListener; ! import javax.swing.tree.DefaultMutableTreeNode; ! import javax.swing.tree.DefaultTreeCellRenderer; ! import javax.swing.tree.DefaultTreeModel; ! import javax.swing.tree.TreeNode; ! import javax.swing.tree.TreePath; ! ! import com.dreambean.awt.GenericMethodDialog; import net.sourceforge.ejtools.jmx.ObjectNameFinder; ! ! import org.apache.log4j.Category; /** Index: GenericCustomizer.java =================================================================== RCS file: /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt/GenericCustomizer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GenericCustomizer.java 18 Apr 2002 21:10:30 -0000 1.1 --- GenericCustomizer.java 30 Apr 2002 21:07:09 -0000 1.2 *************** *** 1,22 **** /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at gnu.org. */ package net.sourceforge.ejtools.awt; ! import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; ! import java.beans.*; ! import java.beans.beancontext.*; ! import java.io.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; ! import java.util.*; ! import javax.swing.*; ! import javax.swing.border.*; ! import com.dreambean.awt.*; /** --- 1,44 ---- /* ! * EJTools, the Enterprise Java Tools * ! * Distributable under LGPL license. ! * See terms of license at gnu.org. */ package net.sourceforge.ejtools.awt; ! import java.awt.Component; ! import java.awt.Frame; ! import java.awt.GridBagConstraints; ! import java.awt.GridBagLayout; ! import java.awt.GridLayout; ! import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; ! import java.beans.BeanInfo; ! import java.beans.Customizer; ! import java.beans.Introspector; ! import java.beans.MethodDescriptor; ! import java.beans.PropertyChangeEvent; ! import java.beans.PropertyChangeListener; ! import java.beans.PropertyDescriptor; ! import java.beans.PropertyEditor; ! import java.beans.PropertyEditorManager; ! import java.beans.PropertyVetoException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; ! import java.util.StringTokenizer; ! ! import javax.swing.BorderFactory; ! import javax.swing.JButton; ! import javax.swing.JComponent; ! import javax.swing.JLabel; ! import javax.swing.JOptionPane; ! import javax.swing.JPanel; ! import javax.swing.JScrollPane; ! import javax.swing.SwingUtilities; ! import javax.swing.border.TitledBorder; ! ! import com.dreambean.awt.GenericMethodDialog; ! import com.dreambean.awt.GenericPropertyCustomizer; /** *************** *** 96,99 **** --- 118,297 ---- /** + * Sets the Object attribute of the GenericCustomizer object + * + * @param obj The new Object value + */ + public void setObject(Object obj) + { + try + { + p.removeAll(); + + if (obj == null) + { + validate(); + repaint(); + return; + } + object = obj; + + GridBagConstraints gridbagconstraints = new GridBagConstraints(); + gridbagconstraints.insets = new Insets(3, 3, 3, 3); + gridbagconstraints.anchor = GridBagConstraints.NORTH; + gridbagconstraints.weighty = 1.0D; + + BeanInfo beaninfo; + if (obj instanceof BeanInfo) + { + beaninfo = (BeanInfo) obj; + } + else + { + beaninfo = Introspector.getBeanInfo(obj.getClass()); + } + + beanGui = new JPanel(new GridBagLayout()); + beanGui.setBorder(new TitledBorder(BorderFactory.createEtchedBorder(), beaninfo.getBeanDescriptor().getDisplayName())); + /* + * if (beaninfo.getIcon(BeanInfo.ICON_COLOR_32x32) != null) + * { + * beanGui.setBorder(new GenericTitledBorder(BorderFactory.createEtchedBorder(), beaninfo.getBeanDescriptor().getDisplayName(), new ImageIcon(beaninfo.getIcon(BeanInfo.ICON_COLOR_32x32)))); + * } + * else + * { + * beanGui.setBorder(new TitledBorder(BorderFactory.createEtchedBorder(), beaninfo.getBeanDescriptor().getDisplayName())); + * } + */ + pd = beaninfo.getPropertyDescriptors(); + if (pd != null) + { + if (beaninfo.getBeanDescriptor().getValue("propertyorder") == null) + { + for (int i = 0; i < pd.length; i++) + { + if (!pd[i].getReadMethod().getDeclaringClass().equals(java.lang.Object.class) && !pd[i].isHidden()) + { + PropertyEditor propertyeditor = null; + + // Test if there is an editor + Class class1 = pd[i].getPropertyEditorClass(); + if (class1 != null) + { + propertyeditor = (PropertyEditor) class1.newInstance(); + } + + // System.out.println("Property " + pd[i].getPropertyType()); + + // If it's an array, take + if (pd[i].getPropertyType().isArray()) + { + Class componentType = pd[i].getPropertyType().getComponentType(); + propertyeditor = PropertyEditorManager.findEditor(componentType); + + addArrayProperty(propertyeditor, pd[i]); + } + else + { + if (propertyeditor == null) + { + propertyeditor = PropertyEditorManager.findEditor(pd[i].getPropertyType()); + } + if (propertyeditor != null) + { + addProperty(propertyeditor, pd[i]); + } + } + gridbagconstraints.weighty = 1.0D; + } + } + } + else + { + for (StringTokenizer stringtokenizer = new StringTokenizer((String) beaninfo.getBeanDescriptor().getValue("propertyorder"), ":"); stringtokenizer.hasMoreTokens(); ) + { + String s = stringtokenizer.nextToken(); + for (int k = 0; k < pd.length; k++) + { + if (pd[k].getName().equals(s) && !pd[k].isHidden()) + { + PropertyEditor propertyeditor1 = null; + Class class2 = pd[k].getPropertyEditorClass(); + if (class2 != null) + { + propertyeditor1 = (PropertyEditor) class2.newInstance(); + } + + // System.out.println("Property " + pd[k].getPropertyType()); + + // If it's an array, take + if (pd[k].getPropertyType().isArray()) + { + Class componentType = pd[k].getPropertyType().getComponentType(); + propertyeditor1 = PropertyEditorManager.findEditor(componentType); + + addArrayProperty(propertyeditor1, pd[k]); + } + else + { + if (propertyeditor1 == null) + { + propertyeditor1 = PropertyEditorManager.findEditor(pd[k].getPropertyType()); + } + if (propertyeditor1 != null) + { + addProperty(propertyeditor1, pd[k]); + } + } + gridbagconstraints.weighty = 1.0D; + } + } + } + } + } + + if (showMethods) + { + md = beaninfo.getMethodDescriptors(); + + gridbagconstraints.weighty = 1.0D; + gridbagconstraints.gridwidth = GridBagConstraints.REMAINDER; + gridbagconstraints.fill = GridBagConstraints.HORIZONTAL; + + if (md != null) + { + for (int j = 0; j < md.length; j++) + { + if (!md[j].getName().startsWith("get") && !md[j].getName().startsWith("set") && !md[j].getName().startsWith("is")) + { + JButton jbutton = new JButton(md[j].getDisplayName()); + jbutton.setToolTipText(md[j].getShortDescription()); + beanGui.add(jbutton, gridbagconstraints); + jbutton.addActionListener(new MethodInvoker(md[j])); + } + } + } + } + + gridbagconstraints.weighty = 0.0D; + gridbagconstraints.weightx = 1.0D; + gridbagconstraints.fill = GridBagConstraints.BOTH; + p.add(beanGui, gridbagconstraints); + + // Add a spacer + gridbagconstraints.weighty = 1.0D; + p.add(new JLabel(" "), gridbagconstraints); + + validate(); + repaint(); + } + catch (Exception exception) + { + System.out.println("Exception occurred"); + exception.printStackTrace(); + } + } + + + /** * Adds a feature to the ArrayProperty attribute of the GenericCustomizer * object *************** *** 324,503 **** _ex2.printStackTrace(); } - } - } - - - /** - * Sets the Object attribute of the GenericCustomizer object - * - * @param obj The new Object value - */ - public void setObject(Object obj) - { - try - { - p.removeAll(); - - if (obj == null) - { - validate(); - repaint(); - return; - } - object = obj; - - GridBagConstraints gridbagconstraints = new GridBagConstraints(); - gridbagconstraints.insets = new Insets(3, 3, 3, 3); - gridbagconstraints.anchor = GridBagConstraints.NORTH; - gridbagconstraints.weighty = 1.0D; - - BeanInfo beaninfo; - if (obj instanceof BeanInfo) - { - beaninfo = (BeanInfo) obj; - } - else - { - beaninfo = Introspector.getBeanInfo(obj.getClass()); - } - - beanGui = new JPanel(new GridBagLayout()); - beanGui.setBorder(new TitledBorder(BorderFactory.createEtchedBorder(), beaninfo.getBeanDescriptor().getDisplayName())); - /* - * if (beaninfo.getIcon(BeanInfo.ICON_COLOR_32x32) != null) - * { - * beanGui.setBorder(new GenericTitledBorder(BorderFactory.createEtchedBorder(), beaninfo.getBeanDescriptor().getDisplayName(), new ImageIcon(beaninfo.getIcon(BeanInfo.ICON_COLOR_32x32)))); - * } - * else - * { - * beanGui.setBorder(new TitledBorder(BorderFactory.createEtchedBorder(), beaninfo.getBeanDescriptor().getDisplayName())); - * } - */ - pd = beaninfo.getPropertyDescriptors(); - if (pd != null) - { - if (beaninfo.getBeanDescriptor().getValue("propertyorder") == null) - { - for (int i = 0; i < pd.length; i++) - { - if (!pd[i].getReadMethod().getDeclaringClass().equals(java.lang.Object.class) && !pd[i].isHidden()) - { - PropertyEditor propertyeditor = null; - - // Test if there is an editor - Class class1 = pd[i].getPropertyEditorClass(); - if (class1 != null) - { - propertyeditor = (PropertyEditor) class1.newInstance(); - } - - // System.out.println("Property " + pd[i].getPropertyType()); - - // If it's an array, take - if (pd[i].getPropertyType().isArray()) - { - Class componentType = pd[i].getPropertyType().getComponentType(); - propertyeditor = PropertyEditorManager.findEditor(componentType); - - addArrayProperty(propertyeditor, pd[i]); - } - else - { - if (propertyeditor == null) - { - propertyeditor = PropertyEditorManager.findEditor(pd[i].getPropertyType()); - } - if (propertyeditor != null) - { - addProperty(propertyeditor, pd[i]); - } - } - gridbagconstraints.weighty = 1.0D; - } - } - } - else - { - for (StringTokenizer stringtokenizer = new StringTokenizer((String) beaninfo.getBeanDescriptor().getValue("propertyorder"), ":"); stringtokenizer.hasMoreTokens(); ) - { - String s = stringtokenizer.nextToken(); - for (int k = 0; k < pd.length; k++) - { - if (pd[k].getName().equals(s) && !pd[k].isHidden()) - { - PropertyEditor propertyeditor1 = null; - Class class2 = pd[k].getPropertyEditorClass(); - if (class2 != null) - { - propertyeditor1 = (PropertyEditor) class2.newInstance(); - } - - // System.out.println("Property " + pd[k].getPropertyType()); - - // If it's an array, take - if (pd[k].getPropertyType().isArray()) - { - Class componentType = pd[k].getPropertyType().getComponentType(); - propertyeditor1 = PropertyEditorManager.findEditor(componentType); - - addArrayProperty(propertyeditor1, pd[k]); - } - else - { - if (propertyeditor1 == null) - { - propertyeditor1 = PropertyEditorManager.findEditor(pd[k].getPropertyType()); - } - if (propertyeditor1 != null) - { - addProperty(propertyeditor1, pd[k]); - } - } - gridbagconstraints.weighty = 1.0D; - } - } - } - } - } - - if (showMethods) - { - md = beaninfo.getMethodDescriptors(); - - gridbagconstraints.weighty = 1.0D; - gridbagconstraints.gridwidth = GridBagConstraints.REMAINDER; - gridbagconstraints.fill = GridBagConstraints.HORIZONTAL; - - if (md != null) - { - for (int j = 0; j < md.length; j++) - { - if (!md[j].getName().startsWith("get") && !md[j].getName().startsWith("set") && !md[j].getName().startsWith("is")) - { - JButton jbutton = new JButton(md[j].getDisplayName()); - jbutton.setToolTipText(md[j].getShortDescription()); - beanGui.add(jbutton, gridbagconstraints); - jbutton.addActionListener(new MethodInvoker(md[j])); - } - } - } - } - - gridbagconstraints.weighty = 0.0D; - gridbagconstraints.weightx = 1.0D; - gridbagconstraints.fill = GridBagConstraints.BOTH; - p.add(beanGui, gridbagconstraints); - - // Add a spacer - gridbagconstraints.weighty = 1.0D; - p.add(new JLabel(" "), gridbagconstraints); - - validate(); - repaint(); - } - catch (Exception exception) - { - System.out.println("Exception occurred"); - exception.printStackTrace(); } } --- 522,525 ---- Index: GenericMBeanCustomizer.java =================================================================== RCS file: /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt/GenericMBeanCustomizer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GenericMBeanCustomizer.java 28 Apr 2002 10:18:54 -0000 1.3 --- GenericMBeanCustomizer.java 30 Apr 2002 21:07:09 -0000 1.4 *************** *** 7,25 **** package net.sourceforge.ejtools.awt; ! import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; ! import java.beans.*; ! import java.beans.beancontext.*; ! import java.io.*; ! import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; ! import java.util.*; ! import javax.management.*; ! import javax.swing.*; ! import javax.swing.border.*; ! import com.dreambean.awt.*; import net.sourceforge.ejtools.jmx.MBeanAccessor; ! import net.sourceforge.ejtools.util.*; /** --- 7,45 ---- package net.sourceforge.ejtools.awt; ! import java.awt.Component; ! import java.awt.Container; ! import java.awt.Frame; ! import java.awt.GridBagConstraints; ! import java.awt.GridBagLayout; ! import java.awt.GridLayout; ! import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; ! import java.beans.Customizer; ! import java.beans.PropertyChangeEvent; ! import java.beans.PropertyChangeListener; ! import java.beans.PropertyEditor; ! import java.beans.PropertyEditorManager; import java.lang.reflect.Method; ! ! import javax.management.Attribute; ! import javax.management.MBeanAttributeInfo; ! import javax.management.MBeanInfo; ! import javax.management.MBeanNotificationInfo; ! import javax.management.MBeanOperationInfo; ! import javax.management.MBeanParameterInfo; ! import javax.swing.BorderFactory; ! import javax.swing.JButton; ! import javax.swing.JComponent; ! import javax.swing.JLabel; ! import javax.swing.JOptionPane; ! import javax.swing.JPanel; ! import javax.swing.JScrollPane; ! import javax.swing.SwingUtilities; ! ! import com.dreambean.awt.GenericPropertyCustomizer; ! import net.sourceforge.ejtools.jmx.MBeanAccessor; ! import net.sourceforge.ejtools.util.ClassTools; /** *************** *** 339,394 **** - /** - * Gets the class attribute of the GenericMBeanCustomizer class - * - * @param obj The new object value - */ - /* - * static Class getClass(String fullPathClassName) - * { - * if (fullPathClassName.equals("int")) - * { - * return Integer.TYPE; - * } - * if (fullPathClassName.equals("short")) - * { - * return Short.TYPE; - * } - * if (fullPathClassName.equals("long")) - * { - * return Long.TYPE; - * } - * if (fullPathClassName.equals("byte")) - * { - * return Byte.TYPE; - * } - * if (fullPathClassName.equals("char")) - * { - * return Character.TYPE; - * } - * if (fullPathClassName.equals("float")) - * { - * return Float.TYPE; - * } - * if (fullPathClassName.equals("double")) - * { - * return Double.TYPE; - * } - * if (fullPathClassName.equals("boolean")) - * { - * return Boolean.TYPE; - * } - * Class c = null; - * try - * { - * c = Class.forName(fullPathClassName); - * } - * catch (Throwable e) - * { - * } - * System.out.println("Class is " + c); - * return c; - * } - */ /** * Sets the Object attribute of the GenericCustomizer object --- 359,362 ---- Index: GenericMBeanMethodDialog.java =================================================================== RCS file: /cvsroot/ejtools/libraries/adwt/src/main/net/sourceforge/ejtools/awt/GenericMBeanMethodDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GenericMBeanMethodDialog.java 18 Apr 2002 21:10:30 -0000 1.1 --- GenericMBeanMethodDialog.java 30 Apr 2002 21:07:09 -0000 1.2 *************** *** 7,24 **** package net.sourceforge.ejtools.awt; ! import com.dreambean.awt.*; ! import java.awt.*; ! import java.awt.event.*; ! import java.beans.*; ! import java.lang.reflect.*; import java.util.Arrays; import java.util.Iterator; import java.util.Vector; ! import javax.management.InstanceNotFoundException; import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; import javax.management.ObjectName; ! import javax.swing.*; import net.sourceforge.ejtools.jmx.MBeanAccessor; /** --- 7,37 ---- package net.sourceforge.ejtools.awt; ! import java.awt.Component; ! import java.awt.Dimension; ! import java.awt.Frame; ! import java.awt.GridBagConstraints; ! import java.awt.GridBagLayout; ! import java.awt.Insets; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! import java.beans.PropertyEditor; ! import java.beans.PropertyEditorManager; import java.util.Arrays; import java.util.Iterator; import java.util.Vector; ! import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; import javax.management.ObjectName; ! import javax.swing.JButton; ! import javax.swing.JDialog; ! import javax.swing.JLabel; ! import javax.swing.JOptionPane; ! import javax.swing.JPanel; ! ! import com.dreambean.awt.GenericPropertyCustomizer; ! import net.sourceforge.ejtools.jmx.MBeanAccessor; + import net.sourceforge.ejtools.util.ClassTools; /** *************** *** 86,90 **** { MBeanParameterInfo lParameter = (MBeanParameterInfo) i.next(); ! Class cl = GenericMBeanCustomizer.getClass(lParameter.getType()); lName = new JLabel(lParameter.getName() + ":", JLabel.RIGHT); --- 99,103 ---- { MBeanParameterInfo lParameter = (MBeanParameterInfo) i.next(); ! Class cl = ClassTools.getClass(lParameter.getType()); lName = new JLabel(lParameter.getName() + ":", JLabel.RIGHT); |