From: Dennis M. <mil...@us...> - 2005-03-28 05:53:09
|
Update of /cvsroot/jmri/jmri/jmrit/display In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15327/src/jmri/jmrit/display Modified Files: PanelEditor.java PanelEditorAction.java Log Message: Update various files to use JmriJFrame instead of JFrame Index: PanelEditor.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/display/PanelEditor.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** PanelEditor.java 24 Jan 2005 04:50:21 -0000 1.45 --- PanelEditor.java 28 Mar 2005 05:52:47 -0000 1.46 *************** *** 5,8 **** --- 5,9 ---- import jmri.Turnout; import jmri.jmrit.catalog.NamedIcon; + import jmri.util.JmriJFrame; import java.awt.*; import java.awt.event.ActionEvent; *************** *** 50,54 **** */ ! public class PanelEditor extends JFrame { final public static Integer BKG = new Integer(1); --- 51,55 ---- */ ! public class PanelEditor extends JmriJFrame { final public static Integer BKG = new Integer(1); *************** *** 710,715 **** * */ ! public JFrame makeFrame(String name) { ! JFrame targetFrame = new JFrame(name); // arrange for scrolling and size services --- 711,716 ---- * */ ! public JmriJFrame makeFrame(String name) { ! JmriJFrame targetFrame = new JmriJFrame(name); // arrange for scrolling and size services Index: PanelEditorAction.java =================================================================== RCS file: /cvsroot/jmri/jmri/jmrit/display/PanelEditorAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PanelEditorAction.java 11 Jan 2005 23:05:05 -0000 1.12 --- PanelEditorAction.java 28 Mar 2005 05:52:47 -0000 1.13 *************** *** 1,8 **** package jmri.jmrit.display; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; - import javax.swing.JFrame; import javax.swing.JLayeredPane; --- 1,8 ---- package jmri.jmrit.display; + import jmri.util.JmriJFrame; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.JLayeredPane; *************** *** 26,30 **** public void actionPerformed(ActionEvent e) { PanelEditor panel = new PanelEditor(); ! JFrame targetFrame = panel.makeFrame("Panel"); targetFrame.setLocation(20,20); --- 26,30 ---- public void actionPerformed(ActionEvent e) { PanelEditor panel = new PanelEditor(); ! JmriJFrame targetFrame = panel.makeFrame("Panel"); targetFrame.setLocation(20,20); |