Menu
▾
▴
[Jflight-checkins] jflight/app/src/jflight/awt SerialPortSetupDialog.java,1.1,1.2 AboutBox.java,1.2,1.3 VarioPanel.java,1.1,1.2 PlaybackInfoFrame.java,1.1,1.2 TrackPlaybackPanel.java,1.1,1.2 AddWptDialog.java,1.1,1.2 PlaybackSetupDialog.java,1.1,1.2 TrackGraphicPanel.java,1.1,1.2 CreatWpt.java,1.1,1.2 CreateRte.java,1.1,1.2 JFlightFrame.java,1.2,1.3 AddLocDialog.java,1.1,1.2 AlertDialog.java,1.1,1.2
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:31
|
Update of /cvsroot/jflight/jflight/app/src/jflight/awt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/awt Modified Files: SerialPortSetupDialog.java AboutBox.java VarioPanel.java PlaybackInfoFrame.java TrackPlaybackPanel.java AddWptDialog.java PlaybackSetupDialog.java TrackGraphicPanel.java CreatWpt.java CreateRte.java JFlightFrame.java AddLocDialog.java AlertDialog.java Log Message: cleanup of unused code ... Index: SerialPortSetupDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/SerialPortSetupDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerialPortSetupDialog.java 25 Mar 2006 11:27:15 -0000 1.1 --- SerialPortSetupDialog.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 29,32 **** --- 29,36 ---- public class SerialPortSetupDialog extends Dialog { + /** + * + */ + private static final long serialVersionUID = 1L; public final static int CONFIG_VARIO = 1; public final static int CONFIG_GPS = 2; Index: TrackPlaybackPanel.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/TrackPlaybackPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrackPlaybackPanel.java 25 Mar 2006 11:27:15 -0000 1.1 --- TrackPlaybackPanel.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 33,38 **** ! private JFlightFrame jf; ! private Graphics g; public final int FOREWARD = 1, BACKWARD = 2, FF = 3, FB = 4, PAUSE = 5, STOP = 6, RESET = 7; --- 33,42 ---- ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! private JFlightFrame jf; ! //private Graphics g; public final int FOREWARD = 1, BACKWARD = 2, FF = 3, FB = 4, PAUSE = 5, STOP = 6, RESET = 7; *************** *** 96,100 **** private Thread tppThread = null; // for the control-panel: ! private int pbSpeed = 50; String pilotNames[] = new String[10]; private Logger log = java.util.logging.Logger.getLogger("global"); --- 100,104 ---- private Thread tppThread = null; // for the control-panel: ! //private int pbSpeed = 50; String pilotNames[] = new String[10]; private Logger log = java.util.logging.Logger.getLogger("global"); *************** *** 108,114 **** public void run() { // show Control-Frame: ! Dimension dlgSize; ! Dimension frmSize; ! Point loc; //piFrame = new PlaybackInfoFrame(this); //show centered dialog --- 112,118 ---- public void run() { // show Control-Frame: ! //Dimension dlgSize; ! //Dimension frmSize; ! //Point loc; //piFrame = new PlaybackInfoFrame(this); //show centered dialog *************** *** 394,398 **** */ public void playback() { ! int i,j; boolean draw = false; --- 398,402 ---- */ public void playback() { ! int j; boolean draw = false; Index: PlaybackInfoFrame.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/PlaybackInfoFrame.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlaybackInfoFrame.java 25 Mar 2006 11:27:15 -0000 1.1 --- PlaybackInfoFrame.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 17,21 **** public class PlaybackInfoFrame extends java.awt.Frame implements Runnable { ! TrackPlaybackPanel tpp; boolean run = true; private Thread pifThread = null; --- 17,25 ---- public class PlaybackInfoFrame extends java.awt.Frame implements Runnable { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! TrackPlaybackPanel tpp; boolean run = true; private Thread pifThread = null; Index: VarioPanel.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/VarioPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** VarioPanel.java 25 Mar 2006 11:27:15 -0000 1.1 --- VarioPanel.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 26,30 **** public class VarioPanel extends Panel{ ! private JFlightFrame jf; protected BaroContainer baroCont = BaroContainer.getInstance(); private Logger log = java.util.logging.Logger.getLogger("global"); --- 26,34 ---- public class VarioPanel extends Panel{ ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! private JFlightFrame jf; protected BaroContainer baroCont = BaroContainer.getInstance(); private Logger log = java.util.logging.Logger.getLogger("global"); *************** *** 46,82 **** if (jf != null){ int num, ! numWpt=0, pixX=0, pixY=0, i=0, ! j=0, trkStartIndex, ! trkEndIndex, ! vStartIndex=0, ! vEndIndex=0, ! vIndex=0; ! long gInterval, ! vInterval=1; ! int scaleX=1, scaleY=1; ! Wpt aWpt; ! VarioData vData, vData2; ! VarioConfig vConfig; ! String str; int x1=0,y1=0, x2,y2; BufferedReader in; File file; - int quot=1; - boolean varioDataAvailable; - int colorMode = jf.sysParams.getColorMode(); - int screenType = jf.sysParams.getScreenType(); - Color textColor = Color.black, - upColor = Color.black, - downColor = Color.black; - String taskname; - Rte curRte; - int rteSize = 0; int minHeight, maxHeight, diffHeight, maxSpeed; ! int stepX, stepY, xCnt, yCnt; Trk aTrk, bTrk; boolean heightDataAvailable; --- 50,67 ---- if (jf != null){ int num, ! //numWpt=0, pixX=0, pixY=0, i=0, ! //j=0, trkStartIndex, ! trkEndIndex; ! int scaleY=1; int x1=0,y1=0, x2,y2; BufferedReader in; File file; int minHeight, maxHeight, diffHeight, maxSpeed; ! int stepX, stepY, xCnt; Trk aTrk, bTrk; boolean heightDataAvailable; Index: CreatWpt.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/CreatWpt.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CreatWpt.java 25 Mar 2006 11:27:15 -0000 1.1 --- CreatWpt.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 21,28 **** public class CreatWpt extends java.awt.Frame { ! java.awt.CheckboxGroup methodCBG = new java.awt.CheckboxGroup(); ! java.awt.CheckboxGroup unitCBG = new java.awt.CheckboxGroup(); ! Gps aGps; ! java.awt.List wptList = new java.awt.List(); /** Creates new form CreatWpt */ --- 21,32 ---- public class CreatWpt extends java.awt.Frame { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! java.awt.CheckboxGroup methodCBG = new java.awt.CheckboxGroup(); ! java.awt.CheckboxGroup unitCBG = new java.awt.CheckboxGroup(); ! Gps aGps; ! java.awt.List wptList = new java.awt.List(); /** Creates new form CreatWpt */ Index: AlertDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/AlertDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AlertDialog.java 25 Mar 2006 11:27:15 -0000 1.1 --- AlertDialog.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 44,47 **** --- 44,52 ---- /** + * + */ + private static final long serialVersionUID = 1L; + + /** Creates a new <code>AlertDialog</code> with three lines of message and a title. Index: TrackGraphicPanel.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/TrackGraphicPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrackGraphicPanel.java 25 Mar 2006 11:27:15 -0000 1.1 --- TrackGraphicPanel.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 30,34 **** public class TrackGraphicPanel extends Panel{ ! private JFlightFrame jf; protected TrackContainer trkCont = TrackContainer.getInstance(); protected RteContainer rteCont = RteContainer.getInstance(); --- 30,38 ---- public class TrackGraphicPanel extends Panel{ ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! private JFlightFrame jf; protected TrackContainer trkCont = TrackContainer.getInstance(); protected RteContainer rteCont = RteContainer.getInstance(); *************** *** 56,69 **** int num, numWpt=0, - pix=0, i=0, j=0, trkStartIndex, ! trkEndIndex, ! vStartIndex=0, ! vEndIndex=0, ! vIndex=0; ! long gInterval, ! vInterval=1; double north=-90.0, south=90.0, west=+180.0, east=-180.0; // extremes double scaleX=1.0, scaleY=1.0; --- 60,67 ---- int num, numWpt=0, i=0, j=0, trkStartIndex, ! trkEndIndex; double north=-90.0, south=90.0, west=+180.0, east=-180.0; // extremes double scaleX=1.0, scaleY=1.0; *************** *** 71,76 **** Trk aTrk; Wpt aWpt; - VarioData vData; - VarioConfig vConfig; String str; int x1=0,y1=0, --- 69,72 ---- *************** *** 81,85 **** newHeight=0, diffHeight=0; - int quot=1; boolean heightDataAvailable; int colorMode = jf.sysParams.getColorMode(); --- 77,80 ---- *************** *** 97,101 **** int shift=20; Date date; - long timestamp; SimpleDateFormat dateFormatter; dateFormatter = new SimpleDateFormat("HH:mm "); --- 92,95 ---- Index: JFlightFrame.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/JFlightFrame.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JFlightFrame.java 24 Apr 2006 19:43:13 -0000 1.2 --- JFlightFrame.java 26 Apr 2006 19:19:16 -0000 1.3 *************** *** 157,161 **** public class JFlightFrame extends Frame implements ActionListener{ ! public final static int THERM_HEIGHT_GAIN = 300; public final static double THERM_MIN_DIST = 1.0; public static boolean oldVersion = false; --- 157,165 ---- public class JFlightFrame extends Frame implements ActionListener{ ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! public final static int THERM_HEIGHT_GAIN = 300; public final static double THERM_MIN_DIST = 1.0; public static boolean oldVersion = false; *************** *** 964,968 **** if ( indexes != null ) { int rteNr = 1; ! for( int i=0, flightNum=0; i<=routeList.getItemCount(); i++ ) { if (routeList.isIndexSelected(i)) { jfGps.sendRte(rteNr++, i); --- 968,972 ---- if ( indexes != null ) { int rteNr = 1; ! for( int i=0; i<=routeList.getItemCount(); i++ ) { if (routeList.isIndexSelected(i)) { jfGps.sendRte(rteNr++, i); *************** *** 1498,1502 **** public void actionPerformed(ActionEvent evt) { ! String arg = evt.getActionCommand(); Object target = evt.getSource(); if (target == waypointList) { --- 1502,1506 ---- public void actionPerformed(ActionEvent evt) { ! //String arg = evt.getActionCommand(); Object target = evt.getSource(); if (target == waypointList) { Index: AboutBox.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/AboutBox.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AboutBox.java 17 Apr 2006 15:03:22 -0000 1.2 --- AboutBox.java 26 Apr 2006 19:19:16 -0000 1.3 *************** *** 27,30 **** --- 27,34 ---- public class AboutBox extends Frame { + /** + * + */ + private static final long serialVersionUID = 1L; private ResourceBundle strRes = null; BorderLayout basisBorderLayout = new BorderLayout(); Index: AddLocDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/AddLocDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddLocDialog.java 25 Mar 2006 11:27:15 -0000 1.1 --- AddLocDialog.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 13,22 **** import java.awt.event.*; import java.util.*; - //import java.awt.*; import jflight.tools.*; import jflight.flightbook.*; import jflight.model.*; - //import jflight.tools.*; /** --- 13,20 ---- *************** *** 33,37 **** public class AddLocDialog extends Dialog { ! private ResourceBundle strRes = null; // added: private FlightBook fbk; --- 31,39 ---- public class AddLocDialog extends Dialog { ! /** ! * ! */ ! private static final long serialVersionUID = -8247616224857865154L; ! private ResourceBundle strRes = null; // added: private FlightBook fbk; *************** *** 63,67 **** try { jbInit(); ! Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); // setLocation(screenSize.width/4,screenSize.height/4); setVisible(false); --- 65,69 ---- try { jbInit(); ! //Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); // setLocation(screenSize.width/4,screenSize.height/4); setVisible(false); Index: PlaybackSetupDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/PlaybackSetupDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlaybackSetupDialog.java 25 Mar 2006 11:27:15 -0000 1.1 --- PlaybackSetupDialog.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 15,19 **** public class PlaybackSetupDialog extends java.awt.Dialog { ! java.awt.CheckboxGroup methodCBG = new java.awt.CheckboxGroup(); private boolean ok = false; --- 15,23 ---- public class PlaybackSetupDialog extends java.awt.Dialog { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! java.awt.CheckboxGroup methodCBG = new java.awt.CheckboxGroup(); private boolean ok = false; *************** *** 123,130 **** }//GEN-LAST:event_cancelButtonActionPerformed - private void button2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_button2ActionPerformed - // Add your handling code here: - }//GEN-LAST:event_button2ActionPerformed - private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed // Add your handling code here: --- 127,130 ---- *************** *** 133,141 **** }//GEN-LAST:event_okButtonActionPerformed - private void button1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_button1ActionPerformed - // Add your handling code here: - }//GEN-LAST:event_button1ActionPerformed - - // Variables declaration - do not modify//GEN-BEGIN:variables private java.awt.Panel panel1; --- 133,136 ---- Index: CreateRte.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/CreateRte.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CreateRte.java 25 Mar 2006 11:27:15 -0000 1.1 --- CreateRte.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 17,21 **** public class CreateRte extends java.awt.Dialog { ! private boolean ok = true; // exit state /** Creates new form CreateRte */ --- 17,25 ---- public class CreateRte extends java.awt.Dialog { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! private boolean ok = true; // exit state /** Creates new form CreateRte */ Index: AddWptDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/AddWptDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddWptDialog.java 25 Mar 2006 11:27:15 -0000 1.1 --- AddWptDialog.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 20,24 **** public class AddWptDialog extends java.awt.Dialog { ! // results: public boolean ok = true; public boolean brk = false; --- 20,28 ---- public class AddWptDialog extends java.awt.Dialog { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! // results: public boolean ok = true; public boolean brk = false; *************** *** 324,329 **** // Add your handling code here: ok = true; - Double d = new Double(0); - double dd; if( nameTf.getText().length() > 6 ) { name = nameTf.getText().substring(0,6); --- 328,331 ---- |
