Peppe, 1. the german file is missing strings. do you want me create a proper one?
2. what is the purpopse of the minor fix? why don't you use the proper number formatting? ..ede On 21.03.2017 16:47, jump-pilot-...@lists.sourceforge.net wrote: > Revision: 5392 > http://sourceforge.net/p/jump-pilot/code/5392 > Author: ma15569 > Date: 2017-03-21 15:47:52 +0000 (Tue, 21 Mar 2017) > Log Message: > ----------- > minor fix and added German file language > > Modified Paths: > -------------- > > plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/utils/CoordinateListMetricsUtils.java > > Added Paths: > ----------- > > plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/language/cadtoolbox_de.properties > > Added: > plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/language/cadtoolbox_de.properties > =================================================================== > --- > plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/language/cadtoolbox_de.properties > (rev 0) > +++ > plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/language/cadtoolbox_de.properties > 2017-03-21 15:47:52 UTC (rev 5392) > @@ -0,0 +1,63 @@ > +#cadtoolbox_de.properties > +org.openjump.core.ui.CAD=CAD > +org.openjump.core.ui.CADEnableCheckFactory.exactly-{0}-features-must-be-selected=Genau > {0} Objekte m\\u00FCssen ausgew\\u00E4hlt sein > +org.openjump.core.ui.CADEnableCheckFactory.exactly-a-feature-must-be-selected=Genau > ein Objekt muss ausgew\\u00E4hlt sein > +org.openjump.core.ui.CAD-tools=CAD Werkzeuge > +org.openjump.core.ui.Cancel=Abbrechen > +org.openjump.core.ui.config.CADToolsOptionsPanel=CAD Optionen > +org.openjump.core.ui.Drawn=Gezeichnet > +org.openjump.core.ui.Nearby=Neben > +org.openjump.core.ui.plugins.Arc=Bogen zeichnen > +org.openjump.core.ui.plugins.Circle=Kreis zeichnen > +org.openjump.core.ui.plugins.Circle.by-radius=Kreis nach Radius zeichnen > +org.openjump.core.ui.plugins.Circle.Draw-with-the-mouse=Mit Maus zeichnen > +org.openjump.core.ui.plugins.Circle.End-angle=Endwinkel > +org.openjump.core.ui.plugins.Circle.Point-out-radius-and-position=Radius und > Position bestimmen > +org.openjump.core.ui.plugins.Circle.Radius=Radius > +org.openjump.core.ui.plugins.Circle.Start-angle=Anfangswinkel > +org.openjump.core.ui.plugins.Circle.X=X > +org.openjump.core.ui.plugins.Circle.Y=Y > +org.openjump.core.ui.plugins.ExtendLinePlugIn=Linie ausdehnen > +org.openjump.core.ui.plugins.ExtendLinePlugIn.Extend-options=Ausdehnung - > Optionen > +org.openjump.core.ui.plugins.MirrorPlugin=Symmetrie > +org.openjump.core.ui.plugins.MirrorPlugin.Draw=Zeichnen > +org.openjump.core.ui.plugins.MirrorPlugin.Select=Ausw\\u00E4hlen > +org.openjump.core.ui.plugins.MirrorPlugin.Symmetry-options=Symmetrie - > Optionen > +org.openjump.core.ui.plugins.ShortenLinePlugIn.Shorten-line=Linie > verk\\u00FCrzen > +org.openjump.core.ui.plugins.ShortenLinePlugIn.Shorten-options=Verk\\u00FCrzen > - Optionen > +org.openjump.core.ui.tools.DrawLineStringCommandsTool.commands=Befehle > +org.openjump.core.ui.tools.DrawLineStringCommandsTool.draw-with-commands=Linie > anhand von Befehlen zeichnen > +org.openjump.core.ui.tools.DrawSimpleLine.Draw-simple-line=Einfache Linie > zeichnen > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Absolute=Absolut > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Angle=Winkel > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Close=Abbrechen > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Draw-line=Erzeuge > Linie > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.End=Ende > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Length=L\\u00E4nge > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Length-{0}-angle-with-the-mouse-{1}=L\\u00E4nge > {0} Winkel mit der Maus {1} > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Length-and-angle=L\\u00E4nge > und Winkel > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Length-angle-with-the-mouse=L\\u00E4nge > (Winkel mit der Maus) > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.On-the-map=Auf > der Karte > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Relative=Relativ > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Simple-line=Einfach > Linie > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Start=Anfang > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.X=X > +org.openjump.core.ui.tools.DrawSimpleLine.SimpleLineDialog.Y=Y > +org.openjump.core.ui.tools.ExtendLinesAndCutWhereTheyTouchTool.An-editable-layer-must-exist=Es > muss eine editierbare Ebene existieren. > +org.openjump.core.ui.tools.ExtendLinesAndCutWhereTheyTouchTool.Expand-lines-until-crossing=Ausdehnung > +org.openjump.core.ui.tools.ExtendLinesAndCutWhereTheyTouchTool.Lines-do-not-cross=Die > ausgew\\u00E4hlten Objekte schneiden sich nicht > +org.openjump.core.ui.tools.ExtendRectLineTool.Extend-line=Linie ausdehnen > +org.openjump.core.ui.tools.ExtendRectLineTool.It-is-not-close-enough-to-a-line=Nicht > nah genug an einer Linie > +org.openjump.core.ui.tools.Mirror=Spiegeln > +org.openjump.core.ui.tools.MirrorLineTool.{0}-features={0} Objekte > +org.openjump.core.ui.tools.MirrorLineTool.Mirror=Spiegeln > +org.openjump.core.ui.tools.MirrorLineTool.No-selected-features=Keine > ausgew\\u00E4hlten Objekte > +org.openjump.core.ui.tools.MirrorLineTool.No-selected-features-exists-on-editing-layer=Es > existieren keine ausgew\\u00E4hlten Objekte in der editierbaren Ebene > +org.openjump.core.ui.tools.ParalellLineTool=Paralell > +org.openjump.core.ui.tools.PerpendicularLineTool.Perpendicular=Senkrechte > +org.openjump.core.ui.tools.RotateDialogTool.Rotate-by-given-angle=Nach > angegebenem Winkel drehen > +org.openjump.core.ui.tools.RotateTool.Rotate=Drehen > +org.openjump.core.ui.tools.ShortenLineTool.Does-not-cross-any-line=Kreuzt > keine Linie > +org.openjump.core.ui.tools.ShortenLineTool.Error-while-shortening=Fehler > beim Verk\\u00FCrzen > +org.openjump.core.ui.tools.ShortenLineTool.Operation-result-is-not-valid=Ergebnis > ist ung\\u00FCltig > +org.openjump.core.ui.tools.ShortenLineTool.Shorten-line=Linie verk\\u00FCrzen > > > Property changes on: > plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/language/cadtoolbox_de.properties > ___________________________________________________________________ > Added: svn:mime-type > ## -0,0 +1 ## > +text/plain > \ No newline at end of property > Modified: > plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/utils/CoordinateListMetricsUtils.java > =================================================================== > --- > plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/utils/CoordinateListMetricsUtils.java > 2017-03-20 22:53:10 UTC (rev 5391) > +++ > plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/utils/CoordinateListMetricsUtils.java > 2017-03-21 15:47:52 UTC (rev 5392) > @@ -1,7 +1,5 @@ > package org.openjump.advancedtools.utils; > > -import java.text.DecimalFormat; > - > import org.openjump.advancedtools.language.I18NPlug; > > import com.vividsolutions.jts.geom.Coordinate; > @@ -30,13 +28,18 @@ > public static final String Measure = I18NPlug > > .getI18N("org.openjump.core.ui.utils.CoordinateListMetrics.Measure"); > > - public static DecimalFormat df2 = new DecimalFormat("##0.0##"); > + // public static DecimalFormat df2 = new DecimalFormat("##0.0##"); > > + public static double format(double d) { > + return new Double(new Long(Math.round(d * 100)).doubleValue() / > 100.0D); > + > + } > + > public static String circleString(double a, double b, Coordinate start, > Coordinate target) { > - String all = Coordinates + " [" + Center + start.x + "," + start.y > - + " - " + Target + target.x + "," + target.y + "] " + Radius > - + df2.format(a) + " " + Circum + df2.format(b); > + String all = Coordinates + " [" + Center + start.x + ";" + start.y > + + " - " + Target + target.x + ";" + target.y + "] " + Radius > + + format(a) + " " + Circum + format(b); > return all; > > } > @@ -43,9 +46,9 @@ > > public static void setCircleMessage(double a, double b, Coordinate start, > Coordinate target) { > - String all = Coordinates + " [" + Center + start.x + "," + start.y > - + " - " + Target + target.x + "," + target.y + "] " + Radius > - + df2.format(a) + " " + Circum + df2.format(b); > + String all = Coordinates + " [" + Center + start.x + ";" + start.y > + + " - " + Target + target.x + ";" + target.y + "] " + Radius > + + format(a) + " " + Circum + format(b); > > JUMPWorkbench.getInstance().getFrame().getContext().getLayerViewPanel() > .getContext().setStatusMessage(all); > } > @@ -52,22 +55,19 @@ > > public static void setCircleHTMLFrame(double a, double b, Coordinate > start, > Coordinate target) { > - String all = Coordinates + " [" + Center + start.x + "," + start.y > - + " - " + Target + target.x + "," + target.y + "] " + Radius > - + df2.format(a) + " " + Circum + df2.format(b); > HTMLFrame out = JUMPWorkbench.getInstance().getContext() > .createPlugInContext().getOutputFrame(); > out.createNewDocument(); > out.addHeader(1, Measure); > out.addHeader(2, Circle); > - out.addHeader(3, Coordinates + " [" + Center + start.x + "," + > start.y > - + " - " + Target + target.x + "," + target.y + "] "); > - out.addHeader(3, Radius + df2.format(a)); > - out.addHeader(3, Circum + df2.format(b)); > + out.addHeader(3, Coordinates + " [" + Center + start.x + ";" + > start.y > + + " - " + Target + target.x + ";" + target.y + "] "); > + out.addHeader(3, Radius + format(a)); > + out.addHeader(3, Circum + format(b)); > } > > public static void setMessage(String aString, double a) { > - String all = aString + df2.format(a); > + String all = aString + format(a); > > JUMPWorkbench.getInstance().getFrame().getContext().getLayerViewPanel() > .getContext().setStatusMessage(all); > } > > > ------------------------------------------------------------------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > _______________________________________________ > Jump-pilot-devel mailing list > Jump-pilot-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
