# HG changeset patch # User Tim Englich # Date 1262960869 0 # Node ID 3ddc22aab7648e7a013e67e8ce281083690ff70d # Parent bdbca6022cf5d74d1de65c53aed8a3e3cb77b5cd Removed Encodingerrors from listed Files. All Files are now UTF-8 compliant. ISSUE137 gnv-artifacts/trunk@515 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r bdbca6022cf5 -r 3ddc22aab764 gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Fri Jan 08 13:04:29 2010 +0000 +++ b/gnv-artifacts/ChangeLog Fri Jan 08 14:27:49 2010 +0000 @@ -1,5 +1,15 @@ 2010-01-08 Tim Englich + * src/main/java/de/intevation/gnv/utils/InputValidator.java (getPointValue), + src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java (key), + src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java (getStatisticsGenerator), + src/main/java/de/intevation/gnv/state/StateBase.java (extractKVP), + src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java (prepareInputData4RegionDBQuery), + src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java (advance): + Removed Encodingerrors from listed Files. All Files are now UTF-8 compliant. + ISSUE 137 + +2010-01-08 Tim Englich * src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestSuite.java (suite): Added a Testsuit for executing all Testcases at once. @@ -781,7 +791,7 @@ 2009-12-17 Hans Plum - Issue 129: Release 0.2: Verbesserung der Übersetzungen + Issue 129: Release 0.2: Verbesserung der �bersetzungen * src/main/resources/lang/artifactMessages_de_DE.properties, src/main/resources/lang/artifactMessages_de.properties: diff -r bdbca6022cf5 -r 3ddc22aab764 gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Fri Jan 08 13:04:29 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Fri Jan 08 14:27:49 2010 +0000 @@ -110,15 +110,15 @@ try { State nextStep = this.states .get(stateName); - // 1.Ergebnisse Berechnen + // 1.Calculate Results this.current.advance(super.identifier, context.getMeta()); - // 2. Ergebnisse Übergeben + // 2. Transfer Results nextStep.putInputData(this.current.getInputData(), super.identifier); - // 3. Umschalten auf neue Transistion + // 3. Switch to next State this.current = nextStep; - // 4. Initialisieren des nächsten Schrittes == Laden der Daten + // 4. Initialize next Step this.current.initialize(super.identifier, context.getMeta()); result = new ArtifactXMLUtilities() @@ -132,13 +132,13 @@ .newDocument()); } } else { - String msg = "Transitionsübergang wird nicht unterstützt."; + String msg = "Statetransition is not supported"; log.error(msg); result = new ArtifactXMLUtilities().createExceptionReport( msg, XMLUtils.newDocument()); } } else { - String msg = "Kein State aktiviert."; + String msg = "No State activated."; log.error(msg); result = new ArtifactXMLUtilities().createExceptionReport(msg, XMLUtils.newDocument()); diff -r bdbca6022cf5 -r 3ddc22aab764 gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Fri Jan 08 13:04:29 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Fri Jan 08 14:27:49 2010 +0000 @@ -68,7 +68,7 @@ int segments = 97; int meshid = new Integer(meshIDValue); if (meshid == 3 || meshid == 5){ // TODO nicht hier festbrennen. - distance = 0.15; //nord-ostsee 6nm // 97 Stützpunkte + distance = 0.15; //nord-ostsee 6nm // 97 Stützpunkte }else if (meshid == 1 || meshid == 4){ distance = 0.03; //Kuestenmodell 1 nm }else if (meshid == 2 || meshid == 321){ @@ -102,7 +102,7 @@ while (rit.hasNext()) { Result resultValue = rit.next(); String key = resultValue.getString(keyid); - if(prevKey == null || !prevKey.equals(key)){ // müssen wir so machen, da die sde kein select distinct auf layern zulässt. + if(prevKey == null || !prevKey.equals(key)){ // TODO: FIXME: We have to do that because the arcsde does not support a distinct Query on Layers String geomString = this.convert2DisplayCoordinate(resultValue.getString(valueid)); String value = geomString; if (resultValue.getResultDescriptor().getColumnIndex("VALUE") > 0){ @@ -127,7 +127,7 @@ String ost="E"; if (lat <0 ){nord="S"; lat=-lat;} if (lon <0 ){ost="W"; lon=-lon;} - formattedCoordinate = String.format("%1$02d°%2$1S %3$05.2f' %4$03d°%5$1S %6$05.2f'", + formattedCoordinate = String.format("%1$02d°%2$1S %3$05.2f' %4$03d°%5$1S %6$05.2f'", (int)lat, nord,60.*(lat-((int)lat)),(int)lon,ost,60.*(lon-((int)lon))); } catch (ParseException e) { log.error(e,e); diff -r bdbca6022cf5 -r 3ddc22aab764 gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Fri Jan 08 13:04:29 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Fri Jan 08 14:27:49 2010 +0000 @@ -501,7 +501,7 @@ initialized = true; } String tmpKey = resultValue.getString(keyPos); - // TODO: HACK da die ARCSDE kein DISTINCT auf räumlichen Anfragen unterstützt. + // TODO: FIXME: We have to do that because the arcsde does not support a distinct Query on Layers. if (previousKey == null || !tmpKey.equals(previousKey)){ previousKey = tmpKey; keyValueDescibeData.add(new DefaultKeyValueDescribeData(tmpKey, resultValue.getString(valuePos))); diff -r bdbca6022cf5 -r 3ddc22aab764 gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java Fri Jan 08 13:04:29 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java Fri Jan 08 14:27:49 2010 +0000 @@ -111,7 +111,7 @@ */ @Override protected Statistics getStatisticsGenerator() { - return null; //Statistiken werden nicht für diesen Out-Typ unterstützt. + return null; //Statistics are not supported for this kind of OutputState. } /** diff -r bdbca6022cf5 -r 3ddc22aab764 gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Fri Jan 08 13:04:29 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Fri Jan 08 14:27:49 2010 +0000 @@ -15,7 +15,7 @@ private String unit; /** - * The Key of the TimeGap which must be äquivalent to the + * The Key of the TimeGap which must be equivalent to the * Key used in the DWH */ private int key; diff -r bdbca6022cf5 -r 3ddc22aab764 gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Fri Jan 08 13:04:29 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Fri Jan 08 14:27:49 2010 +0000 @@ -121,7 +121,7 @@ log.info("Position :"+value); s = value.split(" "); if (s.length != 2) { - throw new ValidationException("Kein Blank separiert Breite und Länge"); + throw new ValidationException("Kein Blank separiert Breite und Länge"); } p = s[0].split("[nNsS]"); try {