--- old/src/share/classes/sun/tools/jconsole/inspector/XTextField.java 2012-05-21 01:34:19.427061466 +0200 +++ new/src/share/classes/sun/tools/jconsole/inspector/XTextField.java 2012-05-21 01:34:18.562028673 +0200 @@ -26,12 +26,7 @@ package sun.tools.jconsole.inspector; import java.awt.*; -import java.awt.dnd.*; import java.awt.event.*; -import java.awt.datatransfer.*; -import java.io.*; -import java.util.*; -import javax.swing.plaf.*; import javax.swing.event.*; import javax.swing.*; @@ -44,16 +39,8 @@ implements DocumentListener, ActionListener { - private static final Color selF = Color.red; - private static final Color selB = Color.yellow; - private Color fore=null, back=null; - private HashMap items = null; //used for popup menu selection private XObject selectedObject; - private XObject currentObject; - private Class expectedClass; - private Object value; protected JTextField textField; - private JButton browseObjects; private static boolean allowNullSelection = false; @@ -81,13 +68,12 @@ } public XTextField(Object value, - Class expectedClass, + Class expectedClass, int colWidth, boolean isCallable, JButton button, XOperations operation) { super(new BorderLayout()); - this.expectedClass = expectedClass; this.button = button; this.operation = operation; add(textField = new JTextField(value.toString(),colWidth), @@ -112,17 +98,13 @@ return allowNullSelection; } - protected void init(Object value, Class expectedClass) { - this.expectedClass = expectedClass; - this.value = value; - boolean fieldEditable = Utils.isEditableType(expectedClass.getName()); + protected void init(Object value, Class expectedClass) { + boolean fieldEditable = Utils.isEditableType(expectedClass.getName()); clearObject(); if (value != null) { - currentObject = new XObject(value); textField.setText(value.toString()); } else { - currentObject = XObject.NULL_OBJECT; //null String value for the moment textField.setText(""); } @@ -140,35 +122,12 @@ } } - - - - - private synchronized void setObject(XObject object) { - clearObject(); - selectedObject = object; - currentObject = object; - setSelectedColors(); - textField.setText(object.getText()); - textField.getDocument().addDocumentListener(this); - paintImmediately(getVisibleRect()); - } - private synchronized void clearObject() { textField.getDocument().removeDocumentListener(this); selectedObject = null; - currentObject = null; setDefaultColors(); } - private synchronized void setSelectedColors() { - // fore = textField.getForeground(); - // back = textField.getBackground(); - - //textField.setForeground(Color.red); - // textField.setBackground(Color.yellow); - } - private synchronized void setDefaultColors() { // if (fore != null) textField.setForeground(fore); // if (back != null) textField.setBackground(back); @@ -194,12 +153,6 @@ } } - private JPopupMenu buildEditPopupMenu() { - JPopupMenu menu = new JPopupMenu(); - return menu; - } - - // ACTIONLISTENER IMPLEMENTATION public void actionPerformed(ActionEvent e) { if (e.getSource() instanceof JTextField) {