[Jmri-commits] jmri/jmrit/signalling SignallingSourceFrame.java, NONE, 1.1 SignallingAction.java, NONE, 1.1 SignallingBundle.properties, NONE, 1.1 SignallingSourcePanel.java, NONE, 1.1 SignallingSourceAction.java, NONE, 1.1 SignallingFrameAction.java, NONE, 1.1 SignallingPanel.java, NONE, 1.1 SignallingFrame.java, NONE, 1.1

[Kevin D. <kev...@us...>]

Update of /cvsroot/jmri/jmri/jmrit/signalling
In directory vz-cvs-3.sog:/tmp/cvs-serv16270/signalling

Added Files:
	SignallingSourceFrame.java SignallingAction.java 
	SignallingBundle.properties SignallingSourcePanel.java 
	SignallingSourceAction.java SignallingFrameAction.java 
	SignallingPanel.java SignallingFrame.java 
Log Message:
Some of the Front end Gui for SignalMast Logic

--- NEW FILE: SignallingSourceFrame.java ---
// StatusFrame.java

package jmri.jmrit.signalling;

import javax.swing.BoxLayout;
import javax.swing.JButton;
import java.util.ResourceBundle;

/**
 * Frame for ECoS status
 * @author	Bob Jacobsen   Copyright (C) 2008
 * @version $Revision: 1.1 $
*/
public class SignallingSourceFrame extends jmri.util.JmriJFrame {

    static final ResourceBundle rb = ResourceBundle.getBundle("jmri.jmrit.signalling.signallingBundle");

    public SignallingSourceFrame() {
        super(false, true);
    }
    
    JButton sendButton;
    SignallingSourcePanel sigPanel;
    protected boolean reuseFrameSavedSized = false;

    public void initComponents(jmri.SignalMast source) throws Exception {
        // the following code sets the frame's initial state
        if (source==null)
            sigPanel = new SignallingSourcePanel();
        else
            sigPanel = new SignallingSourcePanel(source);
        
        setTitle(rb.getString("SignallingPairs"));
        getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));

        getContentPane().add(sigPanel);

		addHelpMenu("package.jmri.jmrit.signalling.SignallingSourceFrame", true);

        // pack for display
        pack();
    }
}


--- NEW FILE: SignallingPanel.java ---
// StatusPanel.java

package jmri.jmrit.signalling;

import jmri.InstanceManager;
import jmri.Sensor;
import jmri.Block;
import jmri.SignalMast;
import jmri.SignalMastManager;
import jmri.SignalMastLogic;
import jmri.Turnout;
import jmri.util.com.sun.TableSorter;

import java.beans.PropertyChangeListener;

import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

import java.awt.BorderLayout;
[...1817 lines suppressed...]
        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;
        }
    }
    
    static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SignallingPanel.class.getName());
}

/* @(#)StatusPane.java */

--- NEW FILE: SignallingBundle.properties ---
# SignallingBundle.properties
#
# Revision $Revision: 1.1 $
#
# Default properties for the jmri.jmrit.signalling GUI elements

# This file is part of JMRI.
#
# JMRI is free software; you can redistribute it and/or modify it under
# the terms of version 2 of the GNU General Public License as published
# by the Free Software Foundation. See the "COPYING" file for a copy
# of this license.
#
# JMRI is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
# for more details.

SignallingPairs = Signalling Pairs

Turnouts     = Turnouts
Sensors      = Sensors
SignalMasts  = Signal Masts
Blocks       = Blocks

UpdateButtonToolTip = Change this Route and leave Edit mode

Included = Included
TurnoutSensors = Turnouts and Sensors
All = All
Show = Show
SourceMast = Source Mast
DestMast = Destination Mast
UpdateLogic = Update Signal Logic
UseLayoutEditorPaths = Use Layout Ediotr Paths
UseTurnoutDetails = Use Turnout Details From Layout Editor
UseBlockDetails = Use Block Details From Layout Editor
AllowAutomaticSignalMast = Allow The Logic to Automatically Determine Conflicting SignalMasts
LockTurnouts = Lock Turnouts when Signal Mast Logic is active
PathSpeed = Path Speed

ErrorUnReachableDestination = The Destination Mast is not directly reachable from the source Mast
WarningUnabletoValidate = It has not been possible to validate the path between the two SignalMasts

EnableLayoutBlockRouting = Layout block routing is not enabled\n Do you want to enable it?
LayoutBlockRoutingEnabled = Layout Block routing has been enabled.\n Please close and reopen this window for the changes to take effect.

UnOccupied = UnOccupied
Occupied = Occupied
AnyState = Any State

SensorActive = Active
SensorInactive = InActive

ColumnSystemName = System Name
ColumnUserName = User Name
ColumnState = State
ColumnInclude = Include
ColumnSpeed = Speed
ColumnPermissive = Permissive
ColumnAspect = Aspect
ColumnEdit = Edit
ColumnEnabled = Enabled
ColumnActive = Active

ButtonDiscover = Discover

--- NEW FILE: SignallingFrame.java ---
// StatusFrame.java

package jmri.jmrit.signalling;

import javax.swing.BoxLayout;
import javax.swing.JButton;
import java.util.ResourceBundle;

/**
 * Frame for ECoS status
 * @author	Bob Jacobsen   Copyright (C) 2008
 * @version $Revision: 1.1 $
*/
public class SignallingFrame extends jmri.util.JmriJFrame {

    static final ResourceBundle rb = ResourceBundle.getBundle("jmri.jmrit.signalling.signallingBundle");

    public SignallingFrame() {
        super(false, true);
    }
    
    JButton sendButton;
    SignallingPanel sigPanel;
    protected boolean reuseFrameSavedSized = false;

    public void initComponents(jmri.SignalMast source, jmri.SignalMast dest) throws Exception {
        // the following code sets the frame's initial state
        if ((source==null) ||  (dest==null))
            sigPanel = new SignallingPanel(this);
        else
            sigPanel = new SignallingPanel(source, dest, this);
        
        setTitle(rb.getString("SignallingPairs"));
        getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));

        getContentPane().add(sigPanel);

		addHelpMenu("package.jmri.jmrit.signalling.SignallingFrame", true);

        // pack for display
        pack();
    }
}


--- NEW FILE: SignallingSourceAction.java ---
// SignallingSourceAction.java

package jmri.jmrit.signalling;

import javax.swing.AbstractAction;
import java.awt.event.ActionEvent;
import java.util.ResourceBundle;

/**
 * Swing action to create and register a 
 *       			SignallingFrame object
 *
 * @author	    Bob Jacobsen    Copyright (C) 2008
 * @version		$Revision: 1.1 $	
 */

public class SignallingSourceAction extends AbstractAction {

    static final ResourceBundle rb = ResourceBundle.getBundle("jmri.jmrit.signalling.signallingBundle");

	public SignallingSourceAction(String s) {
        super(s);
    }
    
    public SignallingSourceAction(String s, jmri.SignalMast source) {
        super(s);
        this.source=source;
    }
    
    public SignallingSourceAction() {
        super(rb.getString("SignallingPairs"));
    }

    public void setMast(jmri.SignalMast source){
        this.source = source;
    }

    jmri.SignalMast source = null;

    public void actionPerformed(ActionEvent e) {
		SignallingSourceFrame f = new SignallingSourceFrame();
		try {
			f.initComponents(source);
			}
		catch (Exception ex) {
			log.error("Exception: "+ex.toString());
			ex.printStackTrace();
			}
		f.setVisible(true);	
	}
   static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SignallingSourceAction.class.getName());
}


/* @(#)SignallingSourceAction.java */

--- NEW FILE: SignallingSourcePanel.java ---
package jmri.jmrit.signalling;


import jmri.SignalMast;
import jmri.SignalMastLogic;
import jmri.jmrit.display.layoutEditor.LayoutEditor;
import javax.swing.table.*;
import java.util.ArrayList;
import java.beans.PropertyChangeListener;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

import jmri.util.table.ButtonEditor;
import jmri.util.table.ButtonRenderer;

import java.awt.BorderLayout;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.JTextField;
import java.util.ResourceBundle;

public class SignallingSourcePanel extends jmri.util.swing.JmriPanel {

    static final ResourceBundle rb = ResourceBundle.getBundle("jmri.jmrit.signalling.signallingBundle");

    SignalMastLogic sml;
    SignalMast sourceMast;
    JLabel fixedSourceMastLabel = new JLabel();
    
    public SignallingSourcePanel() {
        this(null);
    }
    
    SignalMastAppearanceModel _AppearanceModel;
    JScrollPane _SignalAppearanceScrollPane;
    
    public SignallingSourcePanel(SignalMast sourceMast){
        super();
        sml = jmri.InstanceManager.signalMastLogicManagerInstance().getSignalMastLogic(sourceMast);

        if (sml!=null){
            this.sourceMast = sml.getSourceMast();
            fixedSourceMastLabel = new JLabel(sourceMast.getDisplayName());
            _signalMastList = sml.getDestinationList();
        }
        
        JPanel containerPanel = new JPanel();
        containerPanel.setLayout(new BorderLayout());
        
        JPanel header = new JPanel();
        header.setLayout(new BoxLayout(header, BoxLayout.Y_AXIS));
        
        JPanel sourcePanel = new JPanel();
        sourcePanel.add(fixedSourceMastLabel);
        header.add(sourcePanel);
        containerPanel.add(header, BorderLayout.NORTH);

        
        JPanel p3xsi = new JPanel();
        JPanel p3xsiSpace = new JPanel();
        p3xsiSpace.setLayout(new BoxLayout(p3xsiSpace, BoxLayout.Y_AXIS));
        p3xsiSpace.add(new JLabel(" "));
        p3xsi.add(p3xsiSpace);
        
        /*JPanel p31si = new JPanel();
        p31si.setLayout(new BoxLayout(p31si, BoxLayout.Y_AXIS));
        p31si.add(new JLabel("Destination."));
        p3xsi.add(p31si);*/
        _AppearanceModel = new SignalMastAppearanceModel();
        JTable SignalAppearanceTable = jmri.util.JTableUtil.sortableDataModel(_AppearanceModel);

        try {
            jmri.util.com.sun.TableSorter tmodel = ((jmri.util.com.sun.TableSorter)SignalAppearanceTable.getModel());
            tmodel.setColumnComparator(String.class, new jmri.util.SystemNameComparator());
            tmodel.setSortingStatus(SignalMastAppearanceModel.SYSNAME_COLUMN, jmri.util.com.sun.TableSorter.ASCENDING);
        } catch (ClassCastException e3) {}  // if not a sortable table model
        
        
        SignalAppearanceTable.setRowSelectionAllowed(false);
        SignalAppearanceTable.setPreferredScrollableViewportSize(new java.awt.Dimension(630,120));
        _AppearanceModel.configureTable(SignalAppearanceTable);
        _SignalAppearanceScrollPane = new JScrollPane(SignalAppearanceTable);
        p3xsi.add(_SignalAppearanceScrollPane,BorderLayout.CENTER);
       // p3.add(p3xsi);
        p3xsi.setVisible(true);
        _AppearanceModel.fireTableDataChanged();
        containerPanel.add(p3xsi, BorderLayout.CENTER);
        
        JPanel footer = new JPanel();
        JButton discoverPairs = new JButton(rb.getString("ButtonDiscover"));
        footer.add(discoverPairs);
        discoverPairs.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent e) {
                discoverPressed(e);
            }
        });
        containerPanel.add(footer, BorderLayout.SOUTH);
        add(containerPanel);
    }
    
    void discoverPressed(ActionEvent e){
        ArrayList<LayoutEditor> layout = jmri.jmrit.display.PanelMenu.instance().getLayoutEditorPanelList();
        for(int i = 0; i<layout.size(); i++){
        try{
            jmri.InstanceManager.signalMastLogicManagerInstance().discoverSignallingDest(sourceMast, layout.get(i));
        } catch (jmri.JmriException ex) {
            JOptionPane.showMessageDialog(null, ex.toString());
        }
        }
    
    }
    
    private ArrayList <SignalMast> _signalMastList;
    
    public class SignalMastAppearanceModel extends AbstractTableModel implements PropertyChangeListener
    {
        SignalMastAppearanceModel(){
            super();
            if(sml!=null)
                sml.addPropertyChangeListener(this);
        }
        
        public Class<?> getColumnClass(int c) {
            if (c ==ACTIVE_COLUMN)
                return Boolean.class;
            if (c ==ENABLE_COLUMN)
                return Boolean.class;
            if(c==EDIT_COLUMN)
                return JButton.class;
            return String.class;
        }
        
        public void configureTable(JTable table) {
            // allow reordering of the columns
            table.getTableHeader().setReorderingAllowed(true);

            // have to shut off autoResizeMode to get horizontal scroll to work (JavaSwing p 541)
            table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);

            // resize columns as requested
            for (int i=0; i<table.getColumnCount(); i++) {
                int width = getPreferredWidth(i);
                table.getColumnModel().getColumn(i).setPreferredWidth(width);
            }
            table.sizeColumnsToFit(-1);

            //configValueColumn(table);
            configEditColumn(table);
            
        }
        
        public int getPreferredWidth(int col) {
            switch (col) {
            case SYSNAME_COLUMN:
                return new JTextField(20).getPreferredSize().width;
            case ENABLE_COLUMN:
            case ACTIVE_COLUMN:
                return new JTextField(5).getPreferredSize().width;
            case USERNAME_COLUMN:
                return new JTextField(20).getPreferredSize().width;
            case EDIT_COLUMN: // not actually used due to the configureTable, setColumnToHoldButton, configureButton
                return new JTextField(22).getPreferredSize().width;
            default:
                log.warn("Unexpected column in getPreferredWidth: "+col);
                return new JTextField(8).getPreferredSize().width;
            }
        }
        
        public String getColumnName(int col) {
            if (col==USERNAME_COLUMN) return rb.getString("ColumnUserName");
            if (col==SYSNAME_COLUMN) return rb.getString("ColumnSystemName");
            if (col==ACTIVE_COLUMN) return rb.getString("ColumnActive");
            if (col==ENABLE_COLUMN) return rb.getString("ColumnEnabled");
            if (col==EDIT_COLUMN) return rb.getString("ColumnEdit");
            return "";
        }
        
        public void dispose(){
           // jmri.InstanceManager.signalMastManagerInstance().removePropertyChangeListener(this);
        }
        
        public void propertyChange(java.beans.PropertyChangeEvent e) {
            if (e.getPropertyName().equals("length")) {
                // a new NamedBean is available in the manager
                _signalMastList = sml.getDestinationList();
                fireTableDataChanged();
            } else {
                fireTableRowsUpdated(0, _signalMastList.size());
            }
        }
        
        
        protected void configEditColumn(JTable table) {
            // have the delete column hold a button
            /*AbstractTableAction.rb.getString("EditDelete")*/
            setColumnToHoldButton(table, EDIT_COLUMN, 
                    new JButton("EDIT"));
        }
        
        protected void setColumnToHoldButton(JTable table, int column, JButton sample) {
            //TableColumnModel tcm = table.getColumnModel();
            // install a button renderer & editor
            ButtonRenderer buttonRenderer = new ButtonRenderer();
            table.setDefaultRenderer(JButton.class,buttonRenderer);
            TableCellEditor buttonEditor = new ButtonEditor(new JButton());
            table.setDefaultEditor(JButton.class,buttonEditor);
            // ensure the table rows, columns have enough room for buttons
            table.setRowHeight(sample.getPreferredSize().height);
            table.getColumnModel().getColumn(column)
                .setPreferredWidth((sample.getPreferredSize().width)+4);
        }

        public int getColumnCount () {return 5;}

        public boolean isCellEditable(int r,int c) {
            if (c==EDIT_COLUMN)
                return true;
            return ( (c==USERNAME_COLUMN) );
        }
        
        protected void editPair(int r){
            sigLog.setMast(sourceMast, _signalMastList.get(r));
            sigLog.actionPerformed(null);        
        }
        
        public static final int SYSNAME_COLUMN = 0;
        public static final int USERNAME_COLUMN = 1;
        public static final int ACTIVE_COLUMN = 2;
        public static final int ENABLE_COLUMN = 3;
        public static final int EDIT_COLUMN = 4;
        
        public void setSetToState(String x){}
        
        public int getRowCount () {
            if (_signalMastList==null)
                return 0;
            return _signalMastList.size();
        }

        public Object getValueAt (int r,int c) {
            // some error checking
            if (r >= _signalMastList.size()){
            	log.debug("row is greater than turnout list size");
            	return null;
            }
            switch (c) {
                case USERNAME_COLUMN:
                    return _signalMastList.get(r).getUserName();
                case SYSNAME_COLUMN:  // slot number
                    return _signalMastList.get(r).getSystemName();
//                    return appearList.get(r).getAppearance();
                case ACTIVE_COLUMN:
                    return sml.isActive(_signalMastList.get(r));
                 case ENABLE_COLUMN:
                    return sml.isEnabled(_signalMastList.get(r));
                case EDIT_COLUMN:
                    return "EDIT";
                default:
                    return null;
            }
        }

        public void setValueAt(Object type,int r,int c) {
            if (c==EDIT_COLUMN)
                editPair(r);
        }
    }
    
    jmri.jmrit.signalling.SignallingAction sigLog = new jmri.jmrit.signalling.SignallingAction();
    
    static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SignallingSourcePanel.class.getName());

}
--- NEW FILE: SignallingAction.java ---
// SignallingAction.java

package jmri.jmrit.signalling;

import javax.swing.AbstractAction;
import java.awt.event.ActionEvent;
import java.util.ResourceBundle;

/**
 * Swing action to create and register a 
 *       			SignallingFrame object
 *
 * @author	    Bob Jacobsen    Copyright (C) 2008
 * @version		$Revision: 1.1 $	
 */

public class SignallingAction extends AbstractAction {

    static final ResourceBundle rb = ResourceBundle.getBundle("jmri.jmrit.signalling.signallingBundle");

	public SignallingAction(String s) {
        super(s);
    }
    
    public SignallingAction() {
        super(rb.getString("SignallingPairs"));
    }

    public void setMast(jmri.SignalMast source, jmri.SignalMast dest){
        this.source = source;
        this.dest=dest;

    }

    jmri.SignalMast source = null;
    jmri.SignalMast dest = null;

    public void actionPerformed(ActionEvent e) {
		SignallingFrame f = new SignallingFrame();
		try {
			f.initComponents(source, dest);
			}
		catch (Exception ex) {
			log.error("Exception: "+ex.toString());
			ex.printStackTrace();
			}
		f.setVisible(true);	
	}
   static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SignallingAction.class.getName());
}


/* @(#)SignallingAction.java */

--- NEW FILE: SignallingFrameAction.java ---
// SignallingFrameAction.java

package jmri.jmrit.signalling;

import javax.swing.AbstractAction;
import java.awt.event.ActionEvent;
import java.util.ResourceBundle;

/**
 * Swing action to create and register a 
 *       			SignallingFrame object
 *
 * @author	    Bob Jacobsen    Copyright (C) 2008
 * @version		$Revision: 1.1 $	
 */

public class SignallingFrameAction extends AbstractAction {

    static final ResourceBundle rb = ResourceBundle.getBundle("jmri.jmrit.signalling.signallingBundle");
    
	public SignallingFrameAction(String s) {
        super(s);
    }
    
    public SignallingFrameAction() {
        super(rb.getString("SignallingPairs"));
    }


    public void actionPerformed(ActionEvent e) {
		SignallingFrame f = new SignallingFrame();
		try {
			f.initComponents();
			}
		catch (Exception ex) {
			log.error("Exception: "+ex.toString());
			ex.printStackTrace();
			}
		f.setVisible(true);	
	}
   static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SignallingFrameAction.class.getName());
}


/* @(#)SignallingFrameAction.java */