Guts exported to ObjectEditorTable.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3024 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/admin/client/DSetEditor.java

@@ -1,10 +1,12 @@
 //
-// $Id: DSetEditor.java,v 1.3 2004/06/03 19:11:18 ray Exp $
+// $Id: DSetEditor.java,v 1.4 2004/06/14 01:09:23 ray Exp $
 
 package com.threerings.admin.client;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.lang.reflect.Field;
 import java.util.BitSet;
 
@@ -12,6 +14,9 @@ import javax.swing.JPanel;
 import javax.swing.JTable;
 import javax.swing.table.AbstractTableModel;
 
+import com.samskivert.swing.ObjectEditorTable;
+import com.samskivert.swing.event.CommandEvent;
+
 import com.samskivert.util.ClassUtil;
 import com.samskivert.util.ListUtil;
 
@@ -29,68 +34,8 @@ import com.threerings.presents.dobj.SetListener;
  * Allows simple editing of DSets withing a distributed object.
  */
 public class DSetEditor extends JPanel
+    implements SetListener, ActionListener
 {
-    /**
-     * The default FieldInterpreter, which can be used to customize the
-     * name, values, and editing of a field in a DSet.Entry.
-     *
-     * There are a number of ways that the field editing can be customized.
-     * A custom renderer (and editor) may be installed on the table, possibly
-     * in conjunction with overriding getClass(). Or you may simply override
-     * getValue (and setValue) to interpret between types, say for instance
-     * turning an integer field that may be one of three constant values into
-     * String names of the values.
-     */
-    public static class FieldInterpreter
-    {
-        /**
-         * Get the name that she be used for the column header for the specified
-         * field. By default it's merely the name of the field.
-         */
-        public String getName (Field field)
-        {
-            return field.getName();
-        }
-
-        /**
-         * Get the class of the specified field. By default, the class of
-         * the field is used, or its object equivalent if it is a primitive
-         * class.
-         */
-        public Class getClass (Field field)
-        {
-            Class clazz = field.getType();
-            return ClassUtil.objectEquivalentOf(clazz);
-        }
-
-        /**
-         * Get the value of the specified field in the specified object.
-         * By default, the field is used to directly access the value.
-         */
-        public Object getValue (Object obj, Field field)
-        {
-            try {
-                return field.get(obj);
-            } catch (IllegalAccessException iae) {
-                Log.logStackTrace(iae);
-                return null;
-            }
-        }
-
-        /**
-         * Set the value of the specified field in the specified object.
-         * By default, the field is used to directly set the value.
-         */
-        public void setValue (Object obj, Object value, Field field)
-        {
-            try {
-                field.set(obj, value);
-            } catch (IllegalAccessException iae) {
-                Log.logStackTrace(iae);
-            }
-        }
-    }
-
     /**
      * Construct a DSet editor to merely display the specified set.
      *
@@ -132,23 +77,17 @@ public class DSetEditor extends JPanel
      * @param interp The FieldInterpreter to use.
      */
     public DSetEditor (DObject setter, String setName, Class entryClass,
-                       String[] editableFields, FieldInterpreter interp)
+                       String[] editableFields,
+                       ObjectEditorTable.FieldInterpreter interp)
     {
         super(new BorderLayout());
 
         _setter = setter;
         _setName = setName;
         _set = _setter.getSet(setName);
-        _interp = (interp != null) ? interp : new FieldInterpreter();
 
-        _fields = ClassUtil.getFields(entryClass);
+        _table = new ObjectEditorTable(entryClass, editableFields, interp);
-        for (int ii=0, nn=_fields.length; ii < nn; ii++) {
-            if (ListUtil.contains(editableFields, _fields[ii].getName())) {
-                _editable.set(ii);
-            }
-        }
 
-        _table = new JTable(_model = new EntryTableModel());
         add(new SafeScrollPane(_table), BorderLayout.CENTER);
     }
 
@@ -165,8 +104,7 @@ public class DSetEditor extends JPanel
      */
     public DSet.Entry getSelectedEntry ()
     {
-        int row = _table.getSelectedRow();
+        return (DSet.Entry) _table.getSelectedObject();
-        return (row == -1) ? null : _model.getEntry(row);
     }
 
     // documentation inherited
@@ -181,104 +119,53 @@ public class DSetEditor extends JPanel
     public void addNotify ()
     {
         super.addNotify();
-        _setter.addListener(_model);
+        _setter.addListener(this);
+        _table.addActionListener(this);
+        makeData();
     }
 
     // documentation inherited
     public void removeNotify ()
     {
+        _setter.removeListener(this);
+        _table.removeActionListener(this);
         super.removeNotify();
-        _setter.removeListener(_model);
-        _model.startup();
     }
 
-    public class EntryTableModel extends AbstractTableModel
+    protected void makeData ()
-        implements SetListener
     {
-        public void startup ()
+        _table.setData(_set.toArray(null));
-        {
+    }
-            fireTableDataChanged();
-        }
 
-        // documentation inherited from interface SetListener
+    // documentation inherited from interface SetListener
-        public void entryAdded (EntryAddedEvent event)
+    public void entryAdded (EntryAddedEvent event)
-        {
+    {
-            if (event.getName().equals(_setName)) {
+        if (event.getName().equals(_setName)) {
-                fireTableDataChanged(); // sloppy, but not too bad.
+            makeData(); // recreate the entire shebang
-            }
         }
+    }
 
-        // documentation inherited from interface SetListener
+    // documentation inherited from interface SetListener
-        public void entryRemoved (EntryRemovedEvent event)
+    public void entryRemoved (EntryRemovedEvent event)
-        {
+    {
-            if (event.getName().equals(_setName)) {
+        if (event.getName().equals(_setName)) {
-                fireTableDataChanged(); // sloppy, but not too bad.
+            makeData(); // recreate the entire shebang
-            }
         }
+    }
 
-        // documentation inherited from interface SetListener
+    // documentation inherited from interface SetListener
-        public void entryUpdated (EntryUpdatedEvent event)
+    public void entryUpdated (EntryUpdatedEvent event)
-        {
+    {
-            if (event.getName().equals(_setName)) {
+        if (event.getName().equals(_setName)) {
-                fireTableDataChanged(); // sloppy, but not too bad.
+            makeData(); // recreate the entire shebang
-            }
         }
+    }
 
-        // documentation inherited
+    // documentation inherited from interface ActionListener
-        public int getColumnCount ()
+    public void actionPerformed (ActionEvent event)
-        {
+    {
-            return _fields.length;
+        CommandEvent ce = (CommandEvent) event;
-        }
+        _setter.updateSet(_setName, (DSet.Entry) ce.getArgument());
-
-        // documentation inherited
-        public int getRowCount ()
-        {
-            return _set.size();
-        }
-
-        // documentation inherited
-        public String getColumnName (int col)
-        {
-            return _interp.getName(_fields[col]);
-        }
-
-        // documentation inherited
-        public boolean isCellEditable (int row, int col)
-        {
-            return _editable.get(col);
-        }
-
-        // documentation inherited
-        public Class getColumnClass (int col)
-        {
-            return _interp.getClass(_fields[col]);
-        }
-
-        // documentation inherited
-        public Object getValueAt (int row, int col)
-        {
-            DSet.Entry entry = getEntry(row);
-            return _interp.getValue(entry, _fields[col]);
-        }
-
-        // documentation inherited
-        public void setValueAt (Object value, int row, int col)
-        {
-            DSet.Entry entry = getEntry(row);
-            _interp.setValue(entry, value, _fields[col]);
-            _setter.updateSet(_setName, entry);
-        }
-
-        /**
-         * Get a particular entry in the set.
-         * TODO: check safety of this.
-         */
-        protected DSet.Entry getEntry (int row)
-        {
-            DSet.Entry[] vals = new DSet.Entry[_set.size()];
-            _set.toArray(vals);
-            return vals[row];
-        }
     }
 
     /** The object that contains the set we're displaying. */
@@ -290,20 +177,6 @@ public class DSetEditor extends JPanel
     /** The set itself. */
     protected DSet _set;
 
-    /** The list of fields in the prototypical Entry object. */
-    protected Field[] _fields;
-
-    /** An interpreter that is used to massage values in and out of the
-     * entries. */
-    protected FieldInterpreter _interp;
-
     /** The table used to edit. */
-    protected JTable _table;
+    protected ObjectEditorTable _table;
-
-    /** The model of the table used to edit the set. */
-    protected EntryTableModel _model;
-
-    /** A list of flags corresponding to the _fields (and the table columns)
-     * that indicate if the field is editable. */
-    protected BitSet _editable = new BitSet();
 }