Menu
▾
▴
[Jmri-commits] jmri/jmrit/beantable SignalMastTableAction.java, NONE, 1.1 AudioTableAction.java, 1.4, 1.5 BeanTableBundle.properties, 1.41, 1.42 BeanTableDataModel.java, 1.28, 1.29 BeanTableFrame.java, 1.21, 1.22 BlockTableAction.java, 1.10, 1.11 LRouteTableAction.java, 1.11, 1.12 LightTableAction.java, 1.35, 1.36 LogixTableAction.java, 1.52, 1.53 MemoryTableAction.java, 1.13, 1.14 ReporterTableAction.java, 1.12, 1.13 RouteTableAction.java, 1.52, 1.53 SectionTableAction.java, 1.8, 1.9 SensorTableAction.java, 1.22, 1.23 TransitTableAction.java, 1.13, 1.14 TurnoutTableAction.java, 1.61, 1.62
Update of /cvsroot/jmri/jmri/jmrit/beantable In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10002 Modified Files: AudioTableAction.java BeanTableBundle.properties BeanTableDataModel.java BeanTableFrame.java BlockTableAction.java LRouteTableAction.java LightTableAction.java LogixTableAction.java MemoryTableAction.java ReporterTableAction.java RouteTableAction.java SectionTableAction.java SensorTableAction.java TransitTableAction.java TurnoutTableAction.java Added Files: SignalMastTableAction.java Log Message: refactor sensor; add signalmast; clean up separation Index: LightTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/LightTableAction.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** LightTableAction.java 11 Jul 2009 00:02:37 -0000 1.35 --- LightTableAction.java 27 Dec 2009 10:03:24 -0000 1.36 *************** *** 164,168 **** // all properties update for now ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; } --- 164,168 ---- // all properties update for now ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; } Index: BeanTableFrame.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/BeanTableFrame.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** BeanTableFrame.java 13 Jun 2009 01:31:11 -0000 1.21 --- BeanTableFrame.java 27 Dec 2009 10:03:24 -0000 1.22 *************** *** 5,17 **** import java.util.ResourceBundle; ! import javax.swing.BoxLayout; ! import javax.swing.JMenuBar; ! import javax.swing.JScrollPane; import javax.swing.*; import java.awt.*; ! import java.awt.event.ActionListener; ! import java.awt.event.ActionEvent; - import jmri.util.JTableUtil; import jmri.util.com.sun.TableSorter; --- 5,13 ---- import java.util.ResourceBundle; ! import javax.swing.table.*; import javax.swing.*; import java.awt.*; ! import java.awt.event.*; import jmri.util.com.sun.TableSorter; *************** *** 52,56 **** dataModel = model; ! dataTable = JTableUtil.sortableDataModel(dataModel); dataScroll = new JScrollPane(dataTable); --- 48,54 ---- dataModel = model; ! TableSorter sorter = new TableSorter(dataModel); ! dataTable = makeJTable(sorter); ! sorter.setTableHeader(dataTable.getTableHeader()); dataScroll = new JScrollPane(dataTable); *************** *** 140,143 **** --- 138,157 ---- void extras() {} + /** + * Hook to allow sub-typing of JTable created + */ + protected JTable makeJTable(TableSorter sorter) { + return new JTable(sorter) { + public boolean editCellAt(int row, int column, java.util.EventObject e) { + boolean res = super.editCellAt(row, column, e); + java.awt.Component c = this.getEditorComponent(); + if (c instanceof javax.swing.JTextField) { + ( (JTextField) c).selectAll(); + } + return res; + } + }; + } + protected Box getBottomBox() { return bottomBox; } /** Index: ReporterTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/ReporterTableAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ReporterTableAction.java 3 Jun 2009 16:08:24 -0000 1.12 --- ReporterTableAction.java 27 Dec 2009 10:03:24 -0000 1.13 *************** *** 88,92 **** // value column isn't button, so config is null } ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("Report")>=0); --- 88,92 ---- // value column isn't button, so config is null } ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("Report")>=0); Index: BeanTableBundle.properties =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/BeanTableBundle.properties,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** BeanTableBundle.properties 27 Nov 2009 23:15:27 -0000 1.41 --- BeanTableBundle.properties 27 Dec 2009 10:03:24 -0000 1.42 *************** *** 28,31 **** --- 28,32 ---- TitleMemoryTable = Memory Table TitleAudioTable = Audio Table + TitleSignalMastTable = Signal Mast Table ButtonAdd = Add ... *************** *** 58,61 **** --- 59,63 ---- TitleAddAudioSource = Add/Edit Audio Source TitleAddAudioListener = Add/Edit Audio Listener + TitleAddSignalMast = Add Signal Mast ColumnHeadEnabled = Enabled Index: AudioTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/AudioTableAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AudioTableAction.java 15 Sep 2009 17:19:22 -0000 1.4 --- AudioTableAction.java 27 Dec 2009 10:03:24 -0000 1.5 *************** *** 346,359 **** @Override ! void clickOn(NamedBean t) { // Do nothing } @Override ! void configValueColumn(JTable table) { // Do nothing } ! void configEditColumn(JTable table) { // have the edit column hold a button setColumnToHoldButton(table, EDITCOL, --- 346,359 ---- @Override ! protected void clickOn(NamedBean t) { // Do nothing } @Override ! protected void configValueColumn(JTable table) { // Do nothing } ! protected void configEditColumn(JTable table) { // have the edit column hold a button setColumnToHoldButton(table, EDITCOL, Index: SensorTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/SensorTableAction.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** SensorTableAction.java 30 Nov 2009 22:25:32 -0000 1.22 --- SensorTableAction.java 27 Dec 2009 10:03:24 -0000 1.23 *************** *** 55,129 **** */ void createModel() { ! m = new BeanTableDataModel() { ! static public final int INVERTCOL = NUMCOLUMN; ! ! public String getValue(String name) { ! int val = InstanceManager.sensorManagerInstance().getBySystemName(name).getKnownState(); ! switch (val) { ! case Sensor.ACTIVE: return rbean.getString("SensorStateActive"); ! case Sensor.INACTIVE: return rbean.getString("SensorStateInactive"); ! case Sensor.UNKNOWN: return rbean.getString("BeanStateUnknown"); ! case Sensor.INCONSISTENT: return rbean.getString("BeanStateInconsistent"); ! default: return "Unexpected value: "+val; ! } ! } ! public Manager getManager() { return InstanceManager.sensorManagerInstance(); } ! public NamedBean getBySystemName(String name) { return InstanceManager.sensorManagerInstance().getBySystemName(name);} ! public NamedBean getByUserName(String name) { return InstanceManager.sensorManagerInstance().getByUserName(name);} ! public void clickOn(NamedBean t) { ! try { ! int state = ((Sensor)t).getKnownState(); ! if (state==Sensor.INACTIVE) ((Sensor)t).setKnownState(Sensor.ACTIVE); ! else ((Sensor)t).setKnownState(Sensor.INACTIVE); ! } catch (JmriException e) { this.log.warn("Error setting state: "+e); } ! } ! ! public int getColumnCount( ){ ! return NUMCOLUMN+1; ! } ! ! public String getColumnName(int col) { ! if (col==INVERTCOL) return "Inverted"; ! else return super.getColumnName(col); ! } ! public Class<?> getColumnClass(int col) { ! if (col==INVERTCOL) return Boolean.class; ! else return super.getColumnClass(col); ! } ! public int getPreferredWidth(int col) { ! if (col==INVERTCOL) return new JTextField(4).getPreferredSize().width; ! else return super.getPreferredWidth(col); ! } ! public boolean isCellEditable(int row, int col) { ! if (col==INVERTCOL) return true; ! else return super.isCellEditable(row,col); ! } ! ! public Object getValueAt(int row, int col) { ! if (col==INVERTCOL) { ! // some error checking ! if (row >= sysNameList.size()){ ! log.debug("row is greater than name list"); ! return ""; ! } ! String name = sysNameList.get(row); ! boolean val = InstanceManager.sensorManagerInstance().getBySystemName(name).getInverted(); ! return new Boolean(val); ! } else return super.getValueAt(row, col); ! } ! ! public void setValueAt(Object value, int row, int col) { ! if (col==INVERTCOL) { ! String name = sysNameList.get(row); ! boolean b = ((Boolean)value).booleanValue(); ! InstanceManager.sensorManagerInstance().getBySystemName(name).setInverted(b); ! } else super.setValueAt(value, row, col); ! } ! ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { ! if (e.getPropertyName().indexOf("inverted")>=0) return true; ! else return super.matchPropertyName(e); ! } ! }; } --- 55,59 ---- */ void createModel() { ! m = new jmri.jmrit.beantable.sensor.SensorTableDataModel(); } *************** *** 137,191 **** JmriJFrame addFrame = null; ! JTextField sysName = new JTextField(5); ! JTextField userName = new JTextField(5); ! JLabel sysNameLabel = new JLabel(rb.getString("LabelSystemName")); ! JLabel userNameLabel = new JLabel(rb.getString("LabelUserName")); ! void addPressed(ActionEvent e) { if (addFrame==null) { ! addFrame = new JmriJFrame(rb.getString("TitleAddSensor")); ! addFrame.addHelpMenu("package.jmri.jmrit.beantable.SensorAddEdit", true); ! addFrame.getContentPane().setLayout(new BoxLayout(addFrame.getContentPane(), BoxLayout.Y_AXIS)); ! JPanel p; ! p = new JPanel(); ! p.setLayout(new FlowLayout()); ! p.setLayout(new java.awt.GridBagLayout()); ! java.awt.GridBagConstraints c = new java.awt.GridBagConstraints(); ! c.gridwidth = 1; ! c.gridheight = 1; ! c.gridx = 0; ! c.gridy = 0; ! c.anchor = java.awt.GridBagConstraints.EAST; ! p.add(sysNameLabel,c); ! c.gridy = 1; ! p.add(userNameLabel,c); ! c.gridx = 1; ! c.gridy = 0; ! c.anchor = java.awt.GridBagConstraints.WEST; ! c.weightx = 1.0; ! c.fill = java.awt.GridBagConstraints.HORIZONTAL; // text field will expand ! p.add(sysName,c); ! c.gridy = 1; ! p.add(userName,c); ! addFrame.getContentPane().add(p); ! ! JButton ok; ! addFrame.getContentPane().add(ok = new JButton(rb.getString("ButtonOK"))); ! ok.addActionListener(new ActionListener() { ! public void actionPerformed(ActionEvent e) { ! okPressed(e); ! } ! }); } - addFrame.pack(); addFrame.setVisible(true); } - void okPressed(ActionEvent e) { - String user = userName.getText(); - if (user.equals("")) user=null; - InstanceManager.sensorManagerInstance().newSensor(sysName.getText().toUpperCase(), user); - } - static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SensorTableAction.class.getName()); } --- 67,78 ---- JmriJFrame addFrame = null; ! void addPressed(ActionEvent e) { if (addFrame==null) { ! addFrame = new jmri.jmrit.beantable.sensor.AddSensorJFrame(); } addFrame.setVisible(true); } static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SensorTableAction.class.getName()); } Index: SectionTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/SectionTableAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SectionTableAction.java 30 Nov 2009 22:25:32 -0000 1.8 --- SectionTableAction.java 27 Dec 2009 10:03:24 -0000 1.9 *************** *** 191,195 **** } ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("alue")>=0); --- 191,195 ---- } ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("alue")>=0); Index: RouteTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/RouteTableAction.java,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** RouteTableAction.java 30 Nov 2009 22:25:32 -0000 1.52 --- RouteTableAction.java 27 Dec 2009 10:03:24 -0000 1.53 *************** *** 190,194 **** // want to update when enabled parameter changes ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { if (e.getPropertyName().equals("Enabled")) return true; if (e.getPropertyName().equals("Locked")) return true; --- 190,194 ---- // want to update when enabled parameter changes ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { if (e.getPropertyName().equals("Enabled")) return true; if (e.getPropertyName().equals("Locked")) return true; Index: TurnoutTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/TurnoutTableAction.java,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** TurnoutTableAction.java 30 Nov 2009 22:25:32 -0000 1.61 --- TurnoutTableAction.java 27 Dec 2009 10:03:24 -0000 1.62 *************** *** 330,334 **** // update table if turnout lock or feedback changes ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { if (e.getPropertyName().equals("locked")) return true; if (e.getPropertyName().equals("feedbackchange")) return true; --- 330,334 ---- // update table if turnout lock or feedback changes ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { if (e.getPropertyName().equals("locked")) return true; if (e.getPropertyName().equals("feedbackchange")) return true; Index: TransitTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/TransitTableAction.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TransitTableAction.java 30 Nov 2009 22:25:32 -0000 1.13 --- TransitTableAction.java 27 Dec 2009 10:03:24 -0000 1.14 *************** *** 183,187 **** } ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("alue")>=0); --- 183,187 ---- } ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("alue")>=0); Index: LogixTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/LogixTableAction.java,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** LogixTableAction.java 20 Nov 2009 18:21:30 -0000 1.52 --- LogixTableAction.java 27 Dec 2009 10:03:24 -0000 1.53 *************** *** 212,216 **** } ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { if (e.getPropertyName().equals(enabledString)) return true; --- 212,216 ---- } ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { if (e.getPropertyName().equals(enabledString)) return true; --- NEW FILE: SignalMastTableAction.java --- // SignalMastTableAction.java package jmri.jmrit.beantable; import jmri.*; import java.awt.*; import java.awt.event.*; import java.util.*; import javax.swing.*; import javax.swing.table.*; import jmri.util.com.sun.TableSorter; import jmri.util.JmriJFrame; /** * Swing action to create and register a * SignalMastTable GUI. * * @author Bob Jacobsen Copyright (C) 2003 * @version $Revision: 1.1 $ */ public class SignalMastTableAction extends AbstractTableAction { /** * Create an action with a specific title. * <P> * Note that the argument is the Action title, not the title of the * resulting frame. Perhaps this should be changed? * @param actionName */ public SignalMastTableAction(String actionName) { super(actionName); } public SignalMastTableAction() { this("Signal Mast Table");} /** * Create the JTable DataModel, along with the changes * for the specific case of Sensors */ void createModel() { m = new jmri.jmrit.beantable.signalmast.SignalMastTableDataModel(); } void setTitle() { f.setTitle(f.rb.getString("TitleSignalMastTable")); } String helpTarget() { return "package.jmri.jmrit.beantable.SignalMastTable"; } JmriJFrame addFrame = null; // has to agree with number in SignalMastDataModel final static int VALUECOL = BeanTableDataModel.VALUECOL; final static int SYSNAMECOL = BeanTableDataModel.SYSNAMECOL; public void actionPerformed(ActionEvent e) { // create the JTable model, with changes for specific NamedBean createModel(); // create the frame f = new BeanTableFrame(m, helpTarget()){ /** * Include an "add" button */ void extras() { JButton addButton = new JButton(this.rb.getString("ButtonAdd")); addToBottomBox(addButton); addButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { addPressed(e); } }); } protected JTable makeJTable(TableSorter sorter) { return new JTable(sorter) { public boolean editCellAt(int row, int column, java.util.EventObject e) { boolean res = super.editCellAt(row, column, e); java.awt.Component c = this.getEditorComponent(); if (c instanceof javax.swing.JTextField) { ( (JTextField) c).selectAll(); } return res; } public TableCellRenderer getCellRenderer(int row, int column) { if (column == VALUECOL) { return getRenderer(row); } else return super.getCellRenderer(row, column); } public TableCellEditor getCellEditor(int row, int column) { if (column == VALUECOL) { return getEditor(row); } else return super.getCellEditor(row, column); } TableCellRenderer getRenderer(int row) { TableCellRenderer retval = rendererMap.get(m.getValueAt(row,SYSNAMECOL)); if (retval == null) { // create a new one with right aspects retval = new MyComboBoxRenderer(getAspectVector(row)); rendererMap.put(m.getValueAt(row,SYSNAMECOL), retval); } return retval; } Hashtable<Object, TableCellRenderer> rendererMap = new Hashtable<Object, TableCellRenderer>(); TableCellEditor getEditor(int row) { TableCellEditor retval = editorMap.get(m.getValueAt(row,SYSNAMECOL)); if (retval == null) { // create a new one with right aspects retval = new MyComboBoxEditor(getAspectVector(row)); editorMap.put(m.getValueAt(row,SYSNAMECOL), retval); } return retval; } Hashtable<Object, TableCellEditor> editorMap = new Hashtable<Object, TableCellEditor>(); Vector<String> getAspectVector(int row) { Vector<String> retval = boxMap.get(m.getValueAt(row,SYSNAMECOL)); if (retval == null) { // create a new one with right aspects Vector<String> v = InstanceManager.signalMastManagerInstance() .getSignalMast((String)m.getValueAt(row,SYSNAMECOL)).getValidAspects(); retval = v; boxMap.put(m.getValueAt(row,SYSNAMECOL), retval); } return retval; } Hashtable<Object, Vector<String>> boxMap = new Hashtable<Object, Vector<String>>(); }; } }; setTitle(); addToFrame(f); f.pack(); f.setVisible(true); } void addPressed(ActionEvent e) { if (addFrame==null) { addFrame = new jmri.jmrit.beantable.sensor.AddSignalMastJFrame(); } addFrame.setVisible(true); } static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SignalMastTableAction.class.getName()); public class MyComboBoxRenderer extends JComboBox implements TableCellRenderer { public MyComboBoxRenderer(Vector items) { super(items); } public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { if (isSelected) { setForeground(table.getSelectionForeground()); super.setBackground(table.getSelectionBackground()); } else { setForeground(table.getForeground()); setBackground(table.getBackground()); } // Select the current value setSelectedItem(value); return this; } } public class MyComboBoxEditor extends DefaultCellEditor { public MyComboBoxEditor(Vector items) { super(new JComboBox(items)); } } } /* @(#)SignalMastTableAction.java */ Index: LRouteTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/LRouteTableAction.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** LRouteTableAction.java 30 Nov 2009 22:25:32 -0000 1.11 --- LRouteTableAction.java 27 Dec 2009 10:03:24 -0000 1.12 *************** *** 216,220 **** } ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { if (e.getPropertyName().equals(enabledString)) return true; --- 216,220 ---- } ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { if (e.getPropertyName().equals(enabledString)) return true; Index: BeanTableDataModel.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/BeanTableDataModel.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** BeanTableDataModel.java 26 Jul 2009 04:06:16 -0000 1.28 --- BeanTableDataModel.java 27 Dec 2009 10:03:24 -0000 1.29 *************** *** 8,22 **** import jmri.util.table.ButtonEditor; import jmri.util.table.ButtonRenderer; import java.beans.PropertyChangeListener; import java.io.IOException; ! import javax.swing.JButton; ! import javax.swing.JOptionPane; ! import javax.swing.JTextField; ! import javax.swing.JTable; ! import javax.swing.table.TableCellEditor; ! ! import javax.swing.JComboBox; ! import java.awt.Font; import java.util.List; --- 8,18 ---- import jmri.util.table.ButtonEditor; import jmri.util.table.ButtonRenderer; + import java.beans.PropertyChangeListener; import java.io.IOException; ! import javax.swing.table.*; ! import javax.swing.*; ! import java.awt.*; import java.util.List; *************** *** 62,66 **** } ! List<String> sysNameList = null; public void propertyChange(java.beans.PropertyChangeEvent e) { --- 58,62 ---- } ! protected List<String> sysNameList = null; public void propertyChange(java.beans.PropertyChangeEvent e) { *************** *** 86,90 **** * Note that events will come both from the NamedBeans and also from the manager */ ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return (e.getPropertyName().indexOf("State")>=0 || e.getPropertyName().indexOf("Appearance")>=0 || e.getPropertyName().indexOf("Comment")>=0); --- 82,86 ---- * Note that events will come both from the NamedBeans and also from the manager */ ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return (e.getPropertyName().indexOf("State")>=0 || e.getPropertyName().indexOf("Appearance")>=0 || e.getPropertyName().indexOf("Comment")>=0); *************** *** 176,184 **** abstract public String getValue(String systemName); ! abstract Manager getManager(); ! abstract NamedBean getBySystemName(String name); ! abstract NamedBean getByUserName(String name); ! abstract void clickOn(NamedBean t); public void setValueAt(Object value, int row, int col) { --- 172,180 ---- abstract public String getValue(String systemName); ! abstract protected Manager getManager(); ! abstract protected NamedBean getBySystemName(String name); ! abstract protected NamedBean getByUserName(String name); ! abstract protected void clickOn(NamedBean t); public void setValueAt(Object value, int row, int col) { *************** *** 288,292 **** } ! void configValueColumn(JTable table) { // have the value column hold a button setColumnToHoldButton(table, VALUECOL, configureButton()); --- 284,288 ---- } ! protected void configValueColumn(JTable table) { // have the value column hold a button setColumnToHoldButton(table, VALUECOL, configureButton()); Index: BlockTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/BlockTableAction.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** BlockTableAction.java 30 Nov 2009 22:25:32 -0000 1.10 --- BlockTableAction.java 27 Dec 2009 10:03:24 -0000 1.11 *************** *** 197,201 **** } ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("alue")>=0); --- 197,201 ---- } ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("alue")>=0); Index: MemoryTableAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/beantable/MemoryTableAction.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MemoryTableAction.java 3 Jun 2009 16:08:24 -0000 1.13 --- MemoryTableAction.java 27 Dec 2009 10:03:24 -0000 1.14 *************** *** 88,92 **** // value column isn't button, so config is null } ! boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("alue")>=0); --- 88,92 ---- // value column isn't button, so config is null } ! protected boolean matchPropertyName(java.beans.PropertyChangeEvent e) { return true; // return (e.getPropertyName().indexOf("alue")>=0); |