Menu
▾
▴
jflight-checkins — Mailinglist for CVS check-ins
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(60) |
Jun
(92) |
Jul
(63) |
Aug
(12) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(6) |
Feb
(26) |
Mar
(20) |
Apr
(14) |
May
(50) |
Jun
(18) |
Jul
(8) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(23) |
| 2005 |
Jan
(15) |
Feb
(4) |
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(18) |
Sep
|
Oct
|
Nov
|
Dec
(10) |
| 2006 |
Jan
(4) |
Feb
(1) |
Mar
(106) |
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rüdiger <ru...@us...> - 2006-04-29 06:33:58
|
Update of /cvsroot/jflight/jflight/app/src/jflight/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6008/app/src/jflight/main Modified Files: StringRes_de.properties StringRes.properties Log Message: update version number to 0.94 for final release Index: StringRes_de.properties =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/main/StringRes_de.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StringRes_de.properties 25 Mar 2006 11:27:18 -0000 1.1 --- StringRes_de.properties 29 Apr 2006 06:33:54 -0000 1.2 *************** *** 1,4 **** JFlight=OLC-JFlight 2005-2006 ! Version=Version 0.93 About_JFlight=\u00DCber OLC-JFlight... Add=Hinzufügen --- 1,4 ---- JFlight=OLC-JFlight 2005-2006 ! Version=Version 0.94 About_JFlight=\u00DCber OLC-JFlight... Add=Hinzufügen Index: StringRes.properties =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/main/StringRes.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StringRes.properties 25 Mar 2006 11:27:18 -0000 1.1 --- StringRes.properties 29 Apr 2006 06:33:54 -0000 1.2 *************** *** 1,4 **** JFlight=OLC-JFlight 2005-2006 ! Version=Version\ 0.93 About_JFlight=About OLC-JFlight... Add=Add --- 1,4 ---- JFlight=OLC-JFlight 2005-2006 ! Version=Version\ 0.94 About_JFlight=About OLC-JFlight... Add=Add |
|
From: Rüdiger <ru...@us...> - 2006-04-29 06:33:58
|
Update of /cvsroot/jflight/jflight/app/src/jflight/olc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6008/app/src/jflight/olc Modified Files: LRecord.java Log Message: update version number to 0.94 for final release Index: LRecord.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/LRecord.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LRecord.java 25 Mar 2006 11:27:15 -0000 1.1 --- LRecord.java 29 Apr 2006 06:33:53 -0000 1.2 *************** *** 22,26 **** else { ! StringBuffer toStr = new StringBuffer("LXXX OLC-JFLIGHT VERSION >=0.93"); toStr.append("\r\n"); return toStr.toString(); --- 22,26 ---- else { ! StringBuffer toStr = new StringBuffer("LXXX OLC-JFLIGHT VERSION >=0.94"); toStr.append("\r\n"); return toStr.toString(); |
|
From: Rüdiger <ru...@us...> - 2006-04-27 19:49:47
|
Update of /cvsroot/jflight/jflight/app/src/jflight/gps/mlr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10790/app/src/jflight/gps/mlr Modified Files: MLRWayPoint.java Log Message: commented jdk 1.1.8 incompatibilities Index: MLRWayPoint.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/gps/mlr/MLRWayPoint.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MLRWayPoint.java 25 Mar 2006 11:27:15 -0000 1.1 --- MLRWayPoint.java 27 Apr 2006 19:49:39 -0000 1.2 *************** *** 81,85 **** } } ! name = nameBuf.substring(0,6).toString(); return "$GPWPL,"+this.latitudeAsDegreeMinutes(wp)+",N,"+ this.longitudeAsDegreeMinutes(wp)+",E,"+name +"2" + comment + "\r\n"; --- 81,85 ---- } } ! name = nameBuf.substring(0,6).toString(); // jdk118 return "$GPWPL,"+this.latitudeAsDegreeMinutes(wp)+",N,"+ this.longitudeAsDegreeMinutes(wp)+",E,"+name +"2" + comment + "\r\n"; |
|
From: Rüdiger <ru...@us...> - 2006-04-27 19:49:47
|
Update of /cvsroot/jflight/jflight/app/src/jflight/olc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10790/app/src/jflight/olc Modified Files: BRecord.java OLCRecord.java IGCWebReader.java HRecord.java Log Message: commented jdk 1.1.8 incompatibilities Index: BRecord.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/BRecord.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BRecord.java 26 Apr 2006 19:19:15 -0000 1.4 --- BRecord.java 27 Apr 2006 19:49:39 -0000 1.5 *************** *** 233,237 **** String strLatDeg = strLat.substring(0, 2); String strLatMin = strLat.substring(2, 7); ! lat = Double.parseDouble(strLatDeg + "." + strLatMin); if (lat < 0 || lat > 90) { throw new NumberFormatException(); --- 233,237 ---- String strLatDeg = strLat.substring(0, 2); String strLatMin = strLat.substring(2, 7); ! lat = Double.parseDouble(strLatDeg + "." + strLatMin); // jdk118 if (lat < 0 || lat > 90) { throw new NumberFormatException(); *************** *** 255,259 **** String strLonDeg = strLon.substring(0, 3); String strLonMin = strLon.substring(3, 8); ! lon = Double.parseDouble(strLonDeg + "." + strLonMin); if (lon < 0 || lon > 180) { throw new NumberFormatException(); --- 255,259 ---- String strLonDeg = strLon.substring(0, 3); String strLonMin = strLon.substring(3, 8); ! lon = Double.parseDouble(strLonDeg + "." + strLonMin); // jdk118 if (lon < 0 || lon > 180) { throw new NumberFormatException(); Index: HRecord.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/HRecord.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HRecord.java 25 Mar 2006 11:27:15 -0000 1.1 --- HRecord.java 27 Apr 2006 19:49:39 -0000 1.2 *************** *** 17,21 **** private String value = null; private String source = null; ! private static Map TLC = new HashMap(); static { --- 17,21 ---- private String value = null; private String source = null; ! private static Map TLC = new HashMap(); // jdk118 static { Index: OLCRecord.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/OLCRecord.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OLCRecord.java 25 Mar 2006 11:27:15 -0000 1.1 --- OLCRecord.java 27 Apr 2006 19:49:39 -0000 1.2 *************** *** 257,271 **** result = result.replaceAll("\u00d6","Oe"); */ ! result = result.replaceAll("\u00e4","%e4"); ! result = result.replaceAll("\u00fc","%fc"); ! result = result.replaceAll("\u00f6","%f6"); ! result = result.replaceAll("\u00c4","%c4"); ! result = result.replaceAll("\u00dc","%dc"); ! result = result.replaceAll("\u00d6","%d6"); ! result = result.replaceAll(" ","%20"); ! result = result.replaceAll(":","%3A"); ! result = result.replaceAll("\\.","%2E"); ! result = result.replaceAll("-","%2D"); } else { result = replaceAll(result, "\u00e4","%e4"); --- 257,271 ---- result = result.replaceAll("\u00d6","Oe"); */ ! result = result.replaceAll("\u00e4","%e4"); // jdk118 ! result = result.replaceAll("\u00fc","%fc"); // jdk118 ! result = result.replaceAll("\u00f6","%f6"); // jdk118 ! result = result.replaceAll("\u00c4","%c4"); // jdk118 ! result = result.replaceAll("\u00dc","%dc"); // jdk118 ! result = result.replaceAll("\u00d6","%d6"); // jdk118 ! result = result.replaceAll(" ","%20"); // jdk118 ! result = result.replaceAll(":","%3A"); // jdk118 ! result = result.replaceAll("\\.","%2E"); // jdk118 ! result = result.replaceAll("-","%2D"); // jdk118 } else { result = replaceAll(result, "\u00e4","%e4"); Index: IGCWebReader.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/IGCWebReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IGCWebReader.java 26 Apr 2006 19:19:15 -0000 1.2 --- IGCWebReader.java 27 Apr 2006 19:49:39 -0000 1.3 *************** *** 17,22 **** import java.util.logging.Level; import java.util.logging.Logger; ! import java.util.regex.Matcher; ! import java.util.regex.Pattern; public class IGCWebReader { --- 17,22 ---- import java.util.logging.Level; import java.util.logging.Logger; ! import java.util.regex.Matcher; // jdk118 ! import java.util.regex.Pattern; // jdk118 public class IGCWebReader { *************** *** 27,36 **** private static String replaceUmlaute(String s) { ! String temp = s.replaceAll("ä","\u00e4"); ! temp = temp.replaceAll("ü","\u00fc"); ! temp = temp.replaceAll("ö","\u00f6"); ! temp = temp.replaceAll("Ö","\u00d6"); ! temp = temp.replaceAll("Ü","\u00dc"); ! temp = temp.replaceAll("Ä","\u00c4"); return temp; } --- 27,36 ---- private static String replaceUmlaute(String s) { ! String temp = s.replaceAll("ä","\u00e4"); // jdk118 ! temp = temp.replaceAll("ü","\u00fc"); // jdk118 ! temp = temp.replaceAll("ö","\u00f6"); // jdk118 ! temp = temp.replaceAll("Ö","\u00d6"); // jdk118 ! temp = temp.replaceAll("Ü","\u00dc"); // jdk118 ! temp = temp.replaceAll("Ä","\u00c4"); // jdk118 return temp; } *************** *** 49,54 **** String ptnIGCFileName = ">("+prefixIgc+"[\\w]*.igc)<"; ! Pattern linePattern = Pattern.compile( ptnIGCFileName); ! Matcher lineMatcher = null; int count =0; while((line=br.readLine())!=null) --- 49,54 ---- String ptnIGCFileName = ">("+prefixIgc+"[\\w]*.igc)<"; ! Pattern linePattern = Pattern.compile( ptnIGCFileName); // jdk118 ! Matcher lineMatcher = null; // jdk118 int count =0; while((line=br.readLine())!=null) *************** *** 88,92 **** for(int i=0;i< data.size();i++) { ! details.add(readOlcDetails(IGCWebReader.URL_SEGELFLUGSZENE_OLC + "igc",(String)data.elementAt(i))); } return details; --- 88,92 ---- for(int i=0;i< data.size();i++) { ! details.add(readOlcDetails(IGCWebReader.URL_SEGELFLUGSZENE_OLC + "igc",(String)data.elementAt(i))); // jdk118 } return details; |
|
From: Rüdiger <ru...@us...> - 2006-04-27 19:49:45
|
Update of /cvsroot/jflight/jflight/app/src/jflight/top50 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10790/app/src/jflight/top50 Modified Files: TOP50Writer.java Log Message: commented jdk 1.1.8 incompatibilities Index: TOP50Writer.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/top50/TOP50Writer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TOP50Writer.java 26 Apr 2006 19:19:16 -0000 1.2 --- TOP50Writer.java 27 Apr 2006 19:49:39 -0000 1.3 *************** *** 74,79 **** StringBuffer buf = new StringBuffer(200); String counter = new Integer(index).toString(); ! xparam.replace(6,7+counter.length(),counter); ! yparam.replace(6,7+counter.length(),counter); buf.append(xparam); buf.append("="+track.getDlon()).append("\n"); --- 74,79 ---- StringBuffer buf = new StringBuffer(200); String counter = new Integer(index).toString(); ! xparam.replace(6,7+counter.length(),counter); // jdk118 ! yparam.replace(6,7+counter.length(),counter); // jdk118 buf.append(xparam); buf.append("="+track.getDlon()).append("\n"); |
|
From: Rüdiger <ru...@us...> - 2006-04-27 19:49:45
|
Update of /cvsroot/jflight/jflight/app/src/jflight/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10790/app/src/jflight/swing Modified Files: IGCFileTable.java Log Message: commented jdk 1.1.8 incompatibilities Index: IGCFileTable.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/IGCFileTable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IGCFileTable.java 26 Apr 2006 19:19:16 -0000 1.2 --- IGCFileTable.java 27 Apr 2006 19:49:39 -0000 1.3 *************** *** 89,93 **** public void actionPerformed(ActionEvent e) { ! pBar.setIndeterminate(true); downloadButton.setEnabled(false); pBar.setVisible(true); --- 89,93 ---- public void actionPerformed(ActionEvent e) { ! pBar.setIndeterminate(true); // jdk118 downloadButton.setEnabled(false); pBar.setVisible(true); *************** *** 192,196 **** this.fileTable.setModel(tm); this.rowSelected = false; ! pBar.setIndeterminate(false); downloadButton.setEnabled(true); pBar.setVisible(false); --- 192,196 ---- this.fileTable.setModel(tm); this.rowSelected = false; ! pBar.setIndeterminate(false); // jdk118 downloadButton.setEnabled(true); pBar.setVisible(false); |
|
From: Rüdiger <ru...@us...> - 2006-04-27 18:43:46
|
Update of /cvsroot/jflight/jflight/app/src/jflight/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16267/app/src/jflight/swing Modified Files: JFlightBookDialog.java Log Message: YAB Index: JFlightBookDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/JFlightBookDialog.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JFlightBookDialog.java 27 Apr 2006 18:17:58 -0000 1.6 --- JFlightBookDialog.java 27 Apr 2006 18:43:42 -0000 1.7 *************** *** 389,393 **** setVisible(false); Vector v = new Vector(); ! v.addElement((Object) new String("no tracks loaded")); trackList.setListData(v); } --- 389,393 ---- setVisible(false); Vector v = new Vector(); ! v.addElement((Object) new String(java.util.ResourceBundle.getBundle("jflight/main/StringRes").getString("no_tracks_loaded"))); trackList.setListData(v); } |
|
From: Rüdiger <ru...@us...> - 2006-04-27 18:18:13
|
Update of /cvsroot/jflight/jflight/app/src/jflight/awt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24660/app/src/jflight/awt Modified Files: JFlightFrame.java Log Message: YAB (yet another bugfix) Index: JFlightFrame.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/JFlightFrame.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JFlightFrame.java 26 Apr 2006 19:19:16 -0000 1.3 --- JFlightFrame.java 27 Apr 2006 18:17:57 -0000 1.4 *************** *** 1414,1420 **** int offs; offs = infos.indexOf(0); // any 0-chars? ! if( offs != -1 ) infos = infos.substring(offs-1); // yes: cut string before :-( ! ARecord aRecord = new ARecord(manuID,"000",infos); LRecord lRecord = new LRecord(strRes.getString("Version")); Flight flight = (Flight)fbk.getFlightBuf().elementAt(flightList.getSelectedIndex()); --- 1414,1420 ---- int offs; offs = infos.indexOf(0); // any 0-chars? ! if( offs != -1 ) infos = infos.substring(0,offs-1); // yes: cut string before :-( ! ARecord aRecord = new ARecord(manuID,"001",infos); LRecord lRecord = new LRecord(strRes.getString("Version")); Flight flight = (Flight)fbk.getFlightBuf().elementAt(flightList.getSelectedIndex()); |
|
From: Rüdiger <ru...@us...> - 2006-04-27 18:18:11
|
Update of /cvsroot/jflight/jflight/app/src/jflight/olc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24660/app/src/jflight/olc Modified Files: IGCWriter.java Log Message: YAB (yet another bugfix) Index: IGCWriter.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/IGCWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IGCWriter.java 22 Apr 2006 21:01:25 -0000 1.2 --- IGCWriter.java 27 Apr 2006 18:17:57 -0000 1.3 *************** *** 324,328 **** res = res * 31 + (int) s.charAt(i); } ! System.out.println("hashcode von " + s + " = " + res + "\n"); return res; } --- 324,328 ---- res = res * 31 + (int) s.charAt(i); } ! //System.out.println("hashcode von " + s + " = " + res + "\n"); return res; } |
|
From: Rüdiger <ru...@us...> - 2006-04-27 18:18:07
|
Update of /cvsroot/jflight/jflight/app/src/jflight/gps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24660/app/src/jflight/gps Modified Files: Gps.java Log Message: YAB (yet another bugfix) Index: Gps.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/gps/Gps.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Gps.java 26 Apr 2006 19:19:15 -0000 1.2 --- Gps.java 27 Apr 2006 18:17:57 -0000 1.3 *************** *** 153,157 **** public String getShortInfo() { ! return this.prodDescr + " " + this.swVersion + " "+ this.gpsId; } --- 153,157 ---- public String getShortInfo() { ! return " " + this.prodDescr + " " + this.swVersion + " "+ this.gpsId; } |
|
From: Rüdiger <ru...@us...> - 2006-04-27 18:18:07
|
Update of /cvsroot/jflight/jflight/app/src/jflight/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24660/app/src/jflight/swing Modified Files: JFlightBookDialog.java Log Message: YAB (yet another bugfix) Index: JFlightBookDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/JFlightBookDialog.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JFlightBookDialog.java 26 Apr 2006 19:19:16 -0000 1.5 --- JFlightBookDialog.java 27 Apr 2006 18:17:58 -0000 1.6 *************** *** 338,343 **** String infos = gps.getShortInfo(); ! ARecord aRecord = new ARecord(manuID,"000",infos); LRecord lRecord = new LRecord(java.util.ResourceBundle.getBundle("jflight/main/StringRes").getString("Version")); igcWriter.writeAllRecords(out3, --- 338,348 ---- String infos = gps.getShortInfo(); + // java 1.1.8 compatible bugfix to eleminate 0-chars that + // cannot be used in C-programs (vali!) + int offs; + offs = infos.indexOf(0); // any 0-chars? + if( offs != -1 ) infos = infos.substring(0, offs); // yes: cut string before :-( ! ARecord aRecord = new ARecord(manuID,"001",infos); LRecord lRecord = new LRecord(java.util.ResourceBundle.getBundle("jflight/main/StringRes").getString("Version")); igcWriter.writeAllRecords(out3, |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:33
|
Update of /cvsroot/jflight/jflight/app/src/jflight/vario In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/vario Modified Files: BrVario.java Vario.java Log Message: cleanup of unused code ... Index: Vario.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/vario/Vario.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Vario.java 25 Mar 2006 11:27:18 -0000 1.1 --- Vario.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 85,92 **** protected InputStream is; ! private int pid; ! private int bufSize; ! private VarioData curVarioData; ! protected BaroContainer baroCont = null; /** --- 85,89 ---- protected InputStream is; ! protected BaroContainer baroCont = null; /** Index: BrVario.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/vario/BrVario.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BrVario.java 25 Mar 2006 11:27:18 -0000 1.1 --- BrVario.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 37,49 **** extends Vario { - //private OutputStream os; - //private InputStream is; - - private int pid; - private int bufSize; - private int varioCnt; - private Date today; - private byte msg[]; - private final int RX_TIMEOUT = 10000; // # of ms //private final int MAX_INT = 2147483647; --- 37,40 ---- *************** *** 93,102 **** speed, interval=1; ! int i, ! oldSpeed=0, ! newSpeed = 0, ! speedCnt=0; ! boolean speedDataAvail = false; ! Date d; Calendar calTime = new GregorianCalendar(); Calendar calDate = new GregorianCalendar(); --- 84,88 ---- speed, interval=1; ! int speedCnt=0; Calendar calTime = new GregorianCalendar(); Calendar calDate = new GregorianCalendar(); *************** *** 209,213 **** calTime.clear(); calTime.set(startYear,month-1,day,hour,min,0); ! d = calTime.getTime(); // printMessage("Barogram starts at (UTC) " + d.toString() ); state = 23; --- 195,199 ---- calTime.clear(); calTime.set(startYear,month-1,day,hour,min,0); ! //d = calTime.getTime(); // printMessage("Barogram starts at (UTC) " + d.toString() ); state = 23; *************** *** 297,301 **** speedCnt++; if( (speedCnt > 1) && (speed != 45) ) { - speedDataAvail = true; } if( numBytes > 0 ) state = 40; --- 283,286 ---- |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:33
|
Update of /cvsroot/jflight/jflight/app/src/jflight/flightbook In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/flightbook Modified Files: PilotDAO.java FlightBook.java Log Message: cleanup of unused code ... Index: FlightBook.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/flightbook/FlightBook.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FlightBook.java 25 Mar 2006 11:27:18 -0000 1.1 --- FlightBook.java 26 Apr 2006 19:19:15 -0000 1.2 *************** *** 11,15 **** import java.util.*; ! import java.util.logging.*; import java.io.*; //import java.lang.*; --- 11,15 ---- import java.util.*; ! //import java.util.logging.*; import java.io.*; //import java.lang.*; *************** *** 36,40 **** private Vector gliderBuf; ! private Logger log = java.util.logging.Logger.getLogger("global"); private boolean dataHasChanged; --- 36,40 ---- private Vector gliderBuf; ! //private Logger log = java.util.logging.Logger.getLogger("global"); private boolean dataHasChanged; Index: PilotDAO.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/flightbook/PilotDAO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PilotDAO.java 25 Mar 2006 11:27:18 -0000 1.1 --- PilotDAO.java 26 Apr 2006 19:19:15 -0000 1.2 *************** *** 111,115 **** { PilotDAO pdao = PilotDAO.getInstance(); - Pilot p = (Pilot)pdao.findDOAByKey(1); Pilot ingo = null; ingo =pdao.findPilot("ingo","koerber"); --- 111,114 ---- |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:33
|
Update of /cvsroot/jflight/jflight/app/src/jflight/olc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/olc Modified Files: IGCTableModel.java BRecord.java IGCReader.java IGCWebReader.java OLCOptimizer.java Log Message: cleanup of unused code ... Index: OLCOptimizer.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/OLCOptimizer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OLCOptimizer.java 25 Mar 2006 11:27:15 -0000 1.1 --- OLCOptimizer.java 26 Apr 2006 19:19:15 -0000 1.2 *************** *** 74,80 **** int j, dist, cmp; - // System.out.println("initializing cos/sin/rad..\n"); - Trk temp = null; - dmval = new int[pnts][pnts]; --- 74,77 ---- *************** *** 224,228 **** public int optimize(Vector data, double removeDistKm) { ! int i1, i3, i4, i5; int i, a, b, c, d, e, u, w, tmp, aplusb, c25, d5; --- 221,225 ---- public int optimize(Vector data, double removeDistKm) { ! int i1, i3, i4; int i, a, b, c, d, e, u, w, tmp, aplusb, c25, d5; Index: IGCTableModel.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/IGCTableModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IGCTableModel.java 25 Mar 2006 11:27:15 -0000 1.1 --- IGCTableModel.java 26 Apr 2006 19:19:15 -0000 1.2 *************** *** 12,16 **** public class IGCTableModel extends AbstractTableModel { ! private int nrOfIGCFiles = 0; private Vector data = null; --- 12,19 ---- public class IGCTableModel extends AbstractTableModel { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; private Vector data = null; Index: IGCWebReader.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/IGCWebReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IGCWebReader.java 25 Mar 2006 11:27:15 -0000 1.1 --- IGCWebReader.java 26 Apr 2006 19:19:15 -0000 1.2 *************** *** 145,152 **** } ! public static void main(String[] args) ! { ! Vector data = readOlcList(IGCWebReader.URL_SEGELFLUGSZENE_OLC + "igc","341", 20); ! } } --- 145,152 ---- } ! // public static void main(String[] args) ! // { ! // Vector data = readOlcList(IGCWebReader.URL_SEGELFLUGSZENE_OLC + "igc","341", 20); ! // } } Index: IGCReader.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/IGCReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IGCReader.java 25 Mar 2006 11:27:15 -0000 1.1 --- IGCReader.java 26 Apr 2006 19:19:15 -0000 1.2 *************** *** 36,40 **** sysTypePda = (new SysParams().getScreenType() == SysParams.PDA ); signatureValue = 0; - int tmp; signatureIsOk = false; //XXX --- 36,39 ---- *************** *** 43,48 **** String line = null; IGCRecord currentRecord = null; - long timeOffset = 0L; - int lineNr = 0; --- 42,45 ---- Index: BRecord.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/olc/BRecord.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BRecord.java 22 Apr 2006 21:01:25 -0000 1.3 --- BRecord.java 26 Apr 2006 19:19:15 -0000 1.4 *************** *** 8,12 **** import jflight.model.Trk; - import jflight.tools.JfStringBuffer; /** --- 8,11 ---- |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:31
|
Update of /cvsroot/jflight/jflight/app/src/jflight/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/tools Modified Files: SerialConnectionException.java SerialAccess.java SysParams.java Log Message: cleanup of unused code ... Index: SerialAccess.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/tools/SerialAccess.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerialAccess.java 25 Mar 2006 11:27:15 -0000 1.1 --- SerialAccess.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 37,42 **** public void serialEvent(SerialPortEvent e) { - // Create a StringBuffer and int to receive input data. - int newData = 0; // System.out.println("ser port event\n"); // Determine type of event. --- 37,40 ---- *************** *** 119,123 **** int oldStopbits = sPort.getStopBits(); int oldParity = sPort.getParity(); - int oldFlowControl = sPort.getFlowControlMode(); // Set connection parameters, if set fails return parameters object // to original state. --- 117,120 ---- Index: SerialConnectionException.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/tools/SerialConnectionException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerialConnectionException.java 25 Mar 2006 11:27:15 -0000 1.1 --- SerialConnectionException.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 35,38 **** --- 35,43 ---- /** + * + */ + private static final long serialVersionUID = 1L; + + /** * Constructs a <code>SerialConnectionException</code> * with the specified detail message. Index: SysParams.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/tools/SysParams.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SysParams.java 25 Mar 2006 11:27:15 -0000 1.1 --- SysParams.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 35,39 **** private int screenType; private int orientation; - private Dimension frameSize; private Dimension frameLocation; private Dimension screenSize; --- 35,38 ---- *************** *** 47,51 **** screenType = DESKTOP; colorMode = COLOR; - Frame frame; Properties props = System.getProperties(); // get list of properties for (Enumeration en = props.propertyNames(); en.hasMoreElements();) { --- 46,49 ---- |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:31
|
Update of /cvsroot/jflight/jflight/app/src/jflight/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/model Modified Files: Wpt.java BaroContainer.java ThermalContainer.java TrackContainer.java Log Message: cleanup of unused code ... Index: ThermalContainer.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/model/ThermalContainer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ThermalContainer.java 25 Mar 2006 11:27:16 -0000 1.1 --- ThermalContainer.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 9,13 **** import java.util.*; //import java.text.*; ! import java.util.logging.Logger; //import jflight.tools.*; --- 9,13 ---- import java.util.*; //import java.text.*; ! //import java.util.logging.Logger; //import jflight.tools.*; *************** *** 19,23 **** public class ThermalContainer extends DataContainer { - private Logger log = Logger.getLogger("global"); private Vector thermBuf; private static ThermalContainer thermContainer = null; --- 19,22 ---- Index: TrackContainer.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/model/TrackContainer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrackContainer.java 23 Apr 2006 10:35:06 -0000 1.3 --- TrackContainer.java 26 Apr 2006 19:19:16 -0000 1.4 *************** *** 100,107 **** * */ ! private void setTrk(int trkNum, Vector trackData) { ! this.dataHasChanged = true; ! trkBuf[trkNum] = trackData; ! } /** --- 100,107 ---- * */ ! // private void setTrk(int trkNum, Vector trackData) { ! // this.dataHasChanged = true; ! // trkBuf[trkNum] = trackData; ! // } /** *************** *** 152,157 **** diff = 0; int i, size; ! Trk initTrk, ! curTrk=null; boolean foundStart = false; --- 152,156 ---- diff = 0; int i, size; ! Trk curTrk=null; boolean foundStart = false; *************** *** 424,429 **** endTime = 0; int i; ! Trk initTrk, ! curTrk; boolean foundStart = false; --- 423,427 ---- endTime = 0; int i; ! Trk curTrk; boolean foundStart = false; *************** *** 506,511 **** public void removeNonFlights(int trkNum, double minDistance ) { int i, ! size, ! num; int startIndex, endIndex; --- 504,508 ---- public void removeNonFlights(int trkNum, double minDistance ) { int i, ! size; int startIndex, endIndex; *************** *** 564,569 **** private int getSegLengths(int trkNum) { int size,i; ! int startIndex, ! endIndex, length; Trk curTrk; --- 561,565 ---- private int getSegLengths(int trkNum) { int size,i; ! int length; Trk curTrk; *************** *** 575,579 **** printMessage("get track info: " + size); - startIndex = endIndex = 0; length = 1; for( i=1; i<size; i++ ) { --- 571,574 ---- *************** *** 601,606 **** Trk curTrk; int i, ! size, ! length; Date date = new Date(); Date date2 = new Date(); --- 596,600 ---- Trk curTrk; int i, ! size; Date date = new Date(); Date date2 = new Date(); *************** *** 645,650 **** */ public void removeThisTrack(int trkNum, int trackToRemove ) { ! int i,j, ! size; int startIndex; Integer len; --- 639,643 ---- */ public void removeThisTrack(int trkNum, int trackToRemove ) { ! int i,j; int startIndex; Integer len; *************** *** 742,747 **** int i, size; ! Trk fromTrk, newTrk, ! toTrk; size = trkBuf[trkNumFrom].size(); --- 735,739 ---- int i, size; ! Trk fromTrk, newTrk; size = trkBuf[trkNumFrom].size(); *************** *** 779,783 **** */ public void searchLocalMinMax(int flightNum, int interval, double minDist) { ! int i,j,size,cnt=0; int min=10000, max=0; --- 771,775 ---- */ public void searchLocalMinMax(int flightNum, int interval, double minDist) { ! int i,j,cnt=0; int min=10000, max=0; *************** *** 786,797 **** long startTime, timestamp; int curHeight, h; ! boolean found = false, ! finished; ! double dist; int[] filter = new int[FILTER_SIZE]; startIndex = getStartIndex(flightNum); endIndex = getEndIndex(flightNum); ! size = getTrkSize(flightNum); min = 10000; --- 778,787 ---- long startTime, timestamp; int curHeight, h; ! boolean found = false; int[] filter = new int[FILTER_SIZE]; startIndex = getStartIndex(flightNum); endIndex = getEndIndex(flightNum); ! //size = getTrkSize(flightNum); min = 10000; *************** *** 856,861 **** } } - // pass2: - finished = false; lastMinMax = (Trk) trkBuf[flightNum].elementAt(i-1); do { --- 846,849 ---- *************** *** 877,881 **** for( i=startIndex; i<=endIndex; i++ ) { aTrk = (Trk) trkBuf[flightNum].elementAt(i); ! if( (!aTrk.isChecked()) && aTrk.isLocalMin() && ((dist=aTrk.dist(lastMinMax)) < minDist) ) { aTrk.setLocalMin(false); } --- 865,869 ---- for( i=startIndex; i<=endIndex; i++ ) { aTrk = (Trk) trkBuf[flightNum].elementAt(i); ! if( (!aTrk.isChecked()) && aTrk.isLocalMin() && ((aTrk.dist(lastMinMax)) < minDist) ) { aTrk.setLocalMin(false); } *************** *** 923,928 **** } } - // pass2: - finished = false; do { max = 0; --- 911,914 ---- *************** *** 943,947 **** for( i=startIndex; i<=endIndex; i++ ) { aTrk = (Trk) trkBuf[flightNum].elementAt(i); ! if( (!aTrk.isChecked()) && aTrk.isLocalMax() && ((dist=aTrk.dist(lastMinMax)) < minDist) ) { aTrk.setLocalMax(false); } --- 929,933 ---- for( i=startIndex; i<=endIndex; i++ ) { aTrk = (Trk) trkBuf[flightNum].elementAt(i); ! if( (!aTrk.isChecked()) && aTrk.isLocalMax() && ((aTrk.dist(lastMinMax)) < minDist) ) { aTrk.setLocalMax(false); } *************** *** 953,971 **** public int searchMaxTimeInterval(int flightNum) { ! int i,size; ! int min=10000; long max=0,delta=0; Trk aTrk, prvTrk; int startIndex, endIndex; - long startTime, timestamp; - int curHeight, h; - boolean found = false, - finished; - double dist; - int[] filter = new int[FILTER_SIZE]; - startIndex = getStartIndex(flightNum); endIndex = getEndIndex(flightNum); ! size = getTrkSize(flightNum); prvTrk = (Trk) trkBuf[flightNum].elementAt(startIndex); --- 939,949 ---- public int searchMaxTimeInterval(int flightNum) { ! int i; long max=0,delta=0; Trk aTrk, prvTrk; int startIndex, endIndex; startIndex = getStartIndex(flightNum); endIndex = getEndIndex(flightNum); ! //size = getTrkSize(flightNum); prvTrk = (Trk) trkBuf[flightNum].elementAt(startIndex); *************** *** 1002,1007 **** long lengthTrack, lengthBaro, diff; boolean merge = false; ! int t, numTrk, startIndex, endIndex; ! long startTime, curTime; int timeDiff; int height; --- 980,985 ---- long lengthTrack, lengthBaro, diff; boolean merge = false; ! int t, startIndex, endIndex; ! long startTime; int timeDiff; int height; *************** *** 1035,1039 **** startIndex = this.getStartIndex(trkNum); endIndex = this.getEndIndex(trkNum); - numTrk = endIndex - startIndex; aTrk = (Trk) trkBuf[trkNum].elementAt(startIndex); startTime = aTrk.getTimeStamp()/1000; --- 1013,1016 ---- *************** *** 1113,1126 **** */ public void searchThermals(int flightNum, int minHeightDiff, double minDist, boolean mode) { ! int i,j,k,size,cnt=0; int min=10000, max=0; ! Trk aTrk, nextTrk, prvTrk, lastMinMax; int startIndex, endIndex; ! long startTime, timestamp; ! int curHeight, h; ! boolean found = false, ! finished; ! double dist; int[] filter = new int[FILTER_SIZE]; int minH=100000, maxH=0, limit; --- 1090,1100 ---- */ public void searchThermals(int flightNum, int minHeightDiff, double minDist, boolean mode) { ! int i,j,k; int min=10000, max=0; ! Trk aTrk, nextTrk; int startIndex, endIndex; ! long timestamp; ! int h; int[] filter = new int[FILTER_SIZE]; int minH=100000, maxH=0, limit; *************** *** 1128,1132 **** startIndex = getStartIndex(flightNum); endIndex = getEndIndex(flightNum); ! size = getTrkSize(flightNum); min = 10000; --- 1102,1106 ---- startIndex = getStartIndex(flightNum); endIndex = getEndIndex(flightNum); ! //size = getTrkSize(flightNum); min = 10000; Index: BaroContainer.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/model/BaroContainer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaroContainer.java 25 Mar 2006 11:27:16 -0000 1.1 --- BaroContainer.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 66,72 **** public int getSize(int flightNum) { - int i; - VarioData vData; - return varioBuf[flightNum].size(); } --- 66,69 ---- *************** *** 222,227 **** int i; VarioData vData; - VarioConfig vConfig = (VarioConfig) varioBuf[flightNum].elementAt(0); - for( i=1; i<varioBuf[flightNum].size()-1; i++ ) { vData = (VarioData) varioBuf[flightNum].elementAt(i); --- 219,222 ---- Index: Wpt.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/model/Wpt.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Wpt.java 25 Mar 2006 11:27:16 -0000 1.1 --- Wpt.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 19,23 **** @since JDK1.1.x ! @author Rüdiger Bien CVS-section: --- 19,23 ---- @since JDK1.1.x ! @author Rüdiger Bien CVS-section: *************** *** 164,169 **** double d, dst, tc = 0.0, // tc == true course ! dlat, dlon, offsAngle = 0.0, tmp, ! refLat, refLon; Wpt newWpt; --- 164,168 ---- double d, dst, tc = 0.0, // tc == true course ! dlat, dlon, offsAngle = 0.0, refLat, refLon; Wpt newWpt; |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:31
|
Update of /cvsroot/jflight/jflight/app/src/jflight/gps/mlr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/gps/mlr Modified Files: MLRTrackData.java MLRWayPointData.java MLRFastRecordReceiver.java Log Message: cleanup of unused code ... Index: MLRFastRecordReceiver.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/gps/mlr/MLRFastRecordReceiver.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MLRFastRecordReceiver.java 25 Mar 2006 11:27:15 -0000 1.1 --- MLRFastRecordReceiver.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 95,104 **** { byte[] buffer = null; - byte[] debutBuffer = null; if(dataReceived == true) return; - int byteRed = 0; - int sum = 0; - debutBuffer = this.findDebutRecord(); if(debutFound == true) --- 95,100 ---- Index: MLRWayPointData.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/gps/mlr/MLRWayPointData.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MLRWayPointData.java 25 Mar 2006 11:27:15 -0000 1.1 --- MLRWayPointData.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 14,23 **** { private Vector wpData = null; ! private Gps gps = null; public MLRWayPointData(Vector wpData, Gps aGps) { super(); ! this.gps = aGps; this.wpData = wpData; } --- 14,23 ---- { private Vector wpData = null; ! //private Gps gps = null; public MLRWayPointData(Vector wpData, Gps aGps) { super(); ! //this.gps = aGps; this.wpData = wpData; } *************** *** 72,77 **** curWpt.name = nameBuf.toString(); - byte[] time = {wayPoints[6+offset], wayPoints[7+offset], wayPoints[8+offset], wayPoints[9+offset]}; - byte[] latti = {wayPoints[10+offset], wayPoints[11+offset], wayPoints[12+offset], wayPoints[13+offset]}; double lattiFloat = this.getPosition(latti); --- 72,75 ---- *************** *** 82,87 **** curWpt.setDlon(longiFloat); - byte[] altitude = {wayPoints[18+offset], wayPoints[19+offset], wayPoints[20+offset]}; - int altitudeInt = Integer.parseInt(hexString(altitude,3),16); offset +=recordLength; this.wpData.addElement(curWpt); --- 80,83 ---- Index: MLRTrackData.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/gps/mlr/MLRTrackData.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MLRTrackData.java 25 Mar 2006 11:27:15 -0000 1.1 --- MLRTrackData.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 72,77 **** Trk currentTrk = new Trk(); - byte[] nr = {tracks[0+offset], tracks[1+offset]}; - int nrInt = Integer.parseInt(hexString(nr,2),16); byte[] time = {tracks[2+offset], tracks[3+offset], tracks[4+offset], tracks[5+offset]}; --- 72,75 ---- |
|
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 ---- |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:30
|
Update of /cvsroot/jflight/jflight/app/src/jflight/gps/garmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/gps/garmin Modified Files: GarminGps.java Log Message: cleanup of unused code ... Index: GarminGps.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/gps/garmin/GarminGps.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GarminGps.java 25 Mar 2006 11:27:19 -0000 1.1 --- GarminGps.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 57,72 **** private final int PID_RTE_LNK = 98; private final int PID_TRK_HDR = 99; ! private final int PID_PROD_REQ = 254; private final int PID_PROD_DATA = 255; // A010 - device command protocol 1 ! private final int CMD_START_PVT_DATA = 49; ! private final int CMD_STOP_PVT_DATA = 50; private final int CMD_TRANSFER_WPT = 7; private final int CMD_TRANSFER_TRK = 6; ! private final int CMD_TRANSFER_TIME = 5; private final int CMD_TRANSFER_RTE = 4; ! private final int CMD_TRANSFER_PRX = 3; ! private final int CMD_TRANSFER_POS = 2; private final int DLE = 16; --- 57,72 ---- private final int PID_RTE_LNK = 98; private final int PID_TRK_HDR = 99; ! //private final int PID_PROD_REQ = 254; private final int PID_PROD_DATA = 255; // A010 - device command protocol 1 ! //private final int CMD_START_PVT_DATA = 49; ! //private final int CMD_STOP_PVT_DATA = 50; private final int CMD_TRANSFER_WPT = 7; private final int CMD_TRANSFER_TRK = 6; ! //private final int CMD_TRANSFER_TIME = 5; private final int CMD_TRANSFER_RTE = 4; ! // private final int CMD_TRANSFER_PRX = 3; ! // private final int CMD_TRANSFER_POS = 2; private final int DLE = 16; *************** *** 74,83 **** private final int RX_TIMEOUT = 2000; // # of ms private final int TX_RETRY = 10; ! private final String Delim = ",|"; private final int WPT_MODE = 0; private final int RTE_MODE = 1; ! private final int BUG_WORKAROUND = 60*60*1000; private final int MAX_INT = 2147483647; --- 74,83 ---- private final int RX_TIMEOUT = 2000; // # of ms private final int TX_RETRY = 10; ! // private final String Delim = ",|"; private final int WPT_MODE = 0; private final int RTE_MODE = 1; ! // private final int BUG_WORKAROUND = 60*60*1000; private final int MAX_INT = 2147483647; |
Update of /cvsroot/jflight/jflight/app/src/jflight/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/swing Modified Files: JFlightBookDialog.java IGCFileTable.java OLCOptiDialog.java FlightListPanel.java EditPilot.java MapSelectionDialog.java Log Message: cleanup of unused code ... Index: MapSelectionDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/MapSelectionDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapSelectionDialog.java 25 Mar 2006 11:27:17 -0000 1.1 --- MapSelectionDialog.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 23,26 **** --- 23,30 ---- public class MapSelectionDialog extends JDialog { + /** + * + */ + private static final long serialVersionUID = 1L; public String mapName = ""; JComboBox comboBx = null; Index: FlightListPanel.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/FlightListPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FlightListPanel.java 25 Mar 2006 11:27:17 -0000 1.1 --- FlightListPanel.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 20,24 **** public class FlightListPanel extends JPanel { ! JTable flightList = new JTable(); FlightListTableModel fltm =null; JFlightBookDialog fbkDialog = new JFlightBookDialog(); --- 20,28 ---- public class FlightListPanel extends JPanel { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! JTable flightList = new JTable(); FlightListTableModel fltm =null; JFlightBookDialog fbkDialog = new JFlightBookDialog(); *************** *** 78,82 **** class FlightListTableModel extends AbstractTableModel { ! FlightBook fbk = null; int screenType; String[] names; --- 82,90 ---- class FlightListTableModel extends AbstractTableModel { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! FlightBook fbk = null; int screenType; String[] names; Index: IGCFileTable.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/IGCFileTable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IGCFileTable.java 25 Mar 2006 11:27:17 -0000 1.1 --- IGCFileTable.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 30,33 **** --- 30,39 ---- { /** + * + */ + private static final long serialVersionUID = 1L; + + + /** * Initializes the dialog. */ Index: JFlightBookDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/JFlightBookDialog.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JFlightBookDialog.java 24 Apr 2006 19:57:04 -0000 1.4 --- JFlightBookDialog.java 26 Apr 2006 19:19:16 -0000 1.5 *************** *** 14,18 **** import java.awt.BorderLayout; - import java.awt.Color; import java.awt.Dimension; import java.awt.FileDialog; --- 14,17 ---- *************** *** 47,51 **** public class JFlightBookDialog extends JFrame { ! //private ResourceBundle strRes = null; private JPanel topPanel = new JPanel(); // tbd: Removing of the following line, waste of resources --- 46,54 ---- public class JFlightBookDialog extends JFrame { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! //private ResourceBundle strRes = null; private JPanel topPanel = new JPanel(); // tbd: Removing of the following line, waste of resources *************** *** 83,87 **** private boolean addNewFile; private String fileName; - private JLabel label1 = new JLabel(); private JPanel buttonPanel = new JPanel(); private GridLayout buttonGridLayout = new GridLayout(); --- 86,89 ---- *************** *** 469,475 **** } ! private void gpsTestButton_actionPerformed(ActionEvent e) { ! getFlightFromFile(true,""); ! } /** Read a track & barogram from a file already created by JFlight (-> JFlight-dataformat) --- 471,477 ---- } ! // private void gpsTestButton_actionPerformed(ActionEvent e) { ! // getFlightFromFile(true,""); ! // } /** Read a track & barogram from a file already created by JFlight (-> JFlight-dataformat) Index: OLCOptiDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/OLCOptiDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OLCOptiDialog.java 25 Mar 2006 11:27:17 -0000 1.1 --- OLCOptiDialog.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 26,30 **** import java.io.FileInputStream; import java.io.FileWriter; - import java.io.FileReader; import java.io.BufferedReader; import java.io.InputStreamReader; --- 26,29 ---- *************** *** 48,52 **** public class OLCOptiDialog extends JDialog { ! JProgressBar pBar = new JProgressBar(JProgressBar.HORIZONTAL); JButton optiButton = new JButton(); JTextArea resultTA = new JTextArea(20,50); --- 47,55 ---- public class OLCOptiDialog extends JDialog { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! JProgressBar pBar = new JProgressBar(JProgressBar.HORIZONTAL); JButton optiButton = new JButton(); JTextArea resultTA = new JTextArea(20,50); Index: EditPilot.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/EditPilot.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EditPilot.java 25 Mar 2006 11:27:17 -0000 1.1 --- EditPilot.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 11,15 **** import jflight.flightbook.*; - import jflight.model.*; import jflight.tools.*; --- 11,14 ---- *************** *** 20,24 **** public class EditPilot extends javax.swing.JFrame { ! FlightBook fbk; /** Creates new form EditPilot */ --- 19,27 ---- public class EditPilot extends javax.swing.JFrame { ! /** ! * ! */ ! private static final long serialVersionUID = 1L; ! FlightBook fbk; /** Creates new form EditPilot */ *************** *** 161,168 **** public void setData(FlightBook afbk) { - int i; - Wpt wpt; - Glider glider; - this.fbk = afbk; setVisible(true); --- 164,167 ---- |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:30
|
Update of /cvsroot/jflight/jflight/app/src/jflight/io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/io Modified Files: FlightReaderWriter.java Log Message: cleanup of unused code ... Index: FlightReaderWriter.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/io/FlightReaderWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FlightReaderWriter.java 25 Mar 2006 11:27:18 -0000 1.1 --- FlightReaderWriter.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 32,37 **** private int debug; - private boolean stdOutput; - private TextArea dbg, msg; private TrackContainer trkCont = null; private ThermalContainer thermCont = null; --- 32,35 ---- *************** *** 42,49 **** public FlightReaderWriter(TextArea dbg, TextArea msg) { - this.msg = msg; - this.dbg = dbg; debug = 0; - stdOutput = true; trkCont = TrackContainer.getInstance(); thermCont = ThermalContainer.getInstance(); --- 40,44 ---- |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:28
|
Update of /cvsroot/jflight/jflight/app/src/jflight/gps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/gps Modified Files: GpsTimeoutException.java Gps.java Log Message: cleanup of unused code ... Index: Gps.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/gps/Gps.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Gps.java 25 Mar 2006 11:27:19 -0000 1.1 --- Gps.java 26 Apr 2006 19:19:15 -0000 1.2 *************** *** 290,299 **** throws GpsTimeoutException, IOException { - double dist; int size = wptCont.size(); for(int cnt = 0; cnt < size; cnt++ ) { Wpt aWpt = wptCont.wptAt(cnt); if( aWpt.getName().startsWith("X") || aWpt.getName().equals("MOB ") ) continue; ! if( (dist=aWpt.dist(theWpt)) < distance ) { sendWpt(cnt); //System.out.println("ok :" + aWpt.getName() + " <> " + java.lang.Math.floor(dist) + " km"); --- 290,298 ---- throws GpsTimeoutException, IOException { int size = wptCont.size(); for(int cnt = 0; cnt < size; cnt++ ) { Wpt aWpt = wptCont.wptAt(cnt); if( aWpt.getName().startsWith("X") || aWpt.getName().equals("MOB ") ) continue; ! if( (aWpt.dist(theWpt)) < distance ) { sendWpt(cnt); //System.out.println("ok :" + aWpt.getName() + " <> " + java.lang.Math.floor(dist) + " km"); *************** *** 307,311 **** Wpt aWpt = wptCont.wptAt(cnt); if( !aWpt.getName().startsWith("X") ) continue; ! if( (dist=aWpt.dist(theWpt)) < distance ) { sendWpt(cnt); //System.out.println("ok :" + aWpt.getName() + " <> " + java.lang.Math.floor(dist) + " km"); --- 306,310 ---- Wpt aWpt = wptCont.wptAt(cnt); if( !aWpt.getName().startsWith("X") ) continue; ! if( (aWpt.dist(theWpt)) < distance ) { sendWpt(cnt); //System.out.println("ok :" + aWpt.getName() + " <> " + java.lang.Math.floor(dist) + " km"); Index: GpsTimeoutException.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/gps/GpsTimeoutException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GpsTimeoutException.java 25 Mar 2006 11:27:19 -0000 1.1 --- GpsTimeoutException.java 26 Apr 2006 19:19:15 -0000 1.2 *************** *** 20,24 **** @since JDK1.1.x ! @author Rüdiger Bien CVS-section: --- 20,24 ---- @since JDK1.1.x ! @author R�diger Bien CVS-section: *************** *** 29,32 **** --- 29,37 ---- /** + * + */ + private static final long serialVersionUID = 1L; + + /** * Constructs a <code>GpsTimeoutException</code> * with the specified detail message. |
|
From: Rüdiger <ru...@us...> - 2006-04-26 19:19:28
|
Update of /cvsroot/jflight/jflight/app/src/jflight/top50 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4726/app/src/jflight/top50 Modified Files: TOP50Writer.java Log Message: cleanup of unused code ... Index: TOP50Writer.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/top50/TOP50Writer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TOP50Writer.java 25 Mar 2006 11:27:19 -0000 1.1 --- TOP50Writer.java 26 Apr 2006 19:19:16 -0000 1.2 *************** *** 8,16 **** import jflight.model.Trk; - import jflight.tools.*; - import java.io.*; import java.util.Vector; - // import java.util.Iterator; public class TOP50Writer --- 8,13 ---- *************** *** 41,50 **** throws IOException { - int newColor = 0; - int currentColor = 0; - int symbolCount = 0; - boolean altitudeExists = false; - - this.writeSectionHeader(top50file,tracks.size(),1,TOP50_COLOR_BLACK); this.writeKoordinates(top50file,tracks); --- 38,41 ---- *************** *** 138,161 **** } ! private void writeTextSection(FileWriter top50file, ! Trk curTrk, ! int symbol) ! throws IOException ! { ! JfStringBuffer sEnd = new JfStringBuffer(80); ! sEnd.append("[Symbol "+String.valueOf(symbol)).append("]\n"); ! sEnd.append("Typ=2\n"); ! sEnd.append("ObjTyp=16\n"); ! sEnd.append("Col="+ TOP50_COLOR_BLACK).append("\n"); ! sEnd.append("Area=2\n"); ! sEnd.append("Zoom=2\n"); ! sEnd.append("Size=1\n"); ! sEnd.append("Font=1\n"); ! sEnd.append("Dir=1\n"); ! sEnd.append("XKoord="+curTrk.getDlon()).append("\n"); ! sEnd.append("YKoord="+curTrk.getDlat()).append("\n"); ! sEnd.append("Text="+curTrk.height+ "m ").append("\n"); ! top50file.write(sEnd.toString(), 0, sEnd.length()); ! } } --- 129,152 ---- } ! // private void writeTextSection(FileWriter top50file, ! // Trk curTrk, ! // int symbol) ! // throws IOException ! // { ! // JfStringBuffer sEnd = new JfStringBuffer(80); ! // sEnd.append("[Symbol "+String.valueOf(symbol)).append("]\n"); ! // sEnd.append("Typ=2\n"); ! // sEnd.append("ObjTyp=16\n"); ! // sEnd.append("Col="+ TOP50_COLOR_BLACK).append("\n"); ! // sEnd.append("Area=2\n"); ! // sEnd.append("Zoom=2\n"); ! // sEnd.append("Size=1\n"); ! // sEnd.append("Font=1\n"); ! // sEnd.append("Dir=1\n"); ! // sEnd.append("XKoord="+curTrk.getDlon()).append("\n"); ! // sEnd.append("YKoord="+curTrk.getDlat()).append("\n"); ! // sEnd.append("Text="+curTrk.height+ "m ").append("\n"); ! // top50file.write(sEnd.toString(), 0, sEnd.length()); ! // } } |
|
From: Rüdiger <ru...@us...> - 2006-04-24 19:57:16
|
Update of /cvsroot/jflight/jflight/app/src/jflight/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22909/app/src/jflight/swing Modified Files: JFlightBookDialog.java Log Message: corrected area list default selection for new flights Index: JFlightBookDialog.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/swing/JFlightBookDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JFlightBookDialog.java 22 Apr 2006 21:00:59 -0000 1.3 --- JFlightBookDialog.java 24 Apr 2006 19:57:04 -0000 1.4 *************** *** 427,431 **** } areaCBox.setModel(new DefaultComboBoxModel(modelData)); ! areaCBox.setSelectedItem(aFlight.getLocation().getLocationName()); size = fbk.getPilotBuf().size(); --- 427,432 ---- } areaCBox.setModel(new DefaultComboBoxModel(modelData)); ! // ! if(!addNewFile) areaCBox.setSelectedItem(aFlight.getLocation().getLocationName()); size = fbk.getPilotBuf().size(); |
|
From: Rüdiger <ru...@us...> - 2006-04-24 19:43:19
|
Update of /cvsroot/jflight/jflight/app/src/jflight/awt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13117/app/src/jflight/awt Modified Files: JFlightFrame.java Log Message: workaround for 0-char in A-record Index: JFlightFrame.java =================================================================== RCS file: /cvsroot/jflight/jflight/app/src/jflight/awt/JFlightFrame.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JFlightFrame.java 25 Mar 2006 11:27:15 -0000 1.1 --- JFlightFrame.java 24 Apr 2006 19:43:13 -0000 1.2 *************** *** 1406,1409 **** --- 1406,1414 ---- // save GPS-Info in ARecord String infos = jfGps.getShortInfo(); + // java 1.1.8 compatible bugfix to eleminate 0-chars that + // cannot be used in C-programs (vali!) + int offs; + offs = infos.indexOf(0); // any 0-chars? + if( offs != -1 ) infos = infos.substring(offs-1); // yes: cut string before :-( ARecord aRecord = new ARecord(manuID,"000",infos); |