[Jflight-checkins] jflight/app/src/jflight/olc BRecord.java,1.4,1.5 OLCRecord.java,1.1,1.2 IGCWebReader.java,1.2,1.3 HRecord.java,1.1,1.2

[Rüdiger <ru...@us...>]

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("&auml;","\u00e4");
! 		temp  = temp.replaceAll("&uuml;","\u00fc");
! 		temp  = temp.replaceAll("&ouml;","\u00f6");
! 		temp  = temp.replaceAll("&Ouml;","\u00d6");
! 		temp  = temp.replaceAll("&Uuml;","\u00dc");
! 		temp  = temp.replaceAll("&Auml;","\u00c4");
  		return temp;
  	}
--- 27,36 ----
  	private static String replaceUmlaute(String s)
  	{
! 		String temp = s.replaceAll("&auml;","\u00e4"); // jdk118
! 		temp  = temp.replaceAll("&uuml;","\u00fc"); // jdk118
! 		temp  = temp.replaceAll("&ouml;","\u00f6"); // jdk118
! 		temp  = temp.replaceAll("&Ouml;","\u00d6"); // jdk118
! 		temp  = temp.replaceAll("&Uuml;","\u00dc"); // jdk118
! 		temp  = temp.replaceAll("&Auml;","\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;