[Schmitzm-commits] r1195 - in trunk: src/schmitzm/data/resource/locales src/schmitzm/geotools/feature src/schmitzm/geotools/feature/resource/locales src/schmitzm/geotools/gui src/schmitzm/geotools/gui/resource/locales src/schmitzm/geotools/styling src/schmitzm/jfree/resource/locales src/schmitzm/lang src/schmitzm/lang/resource/locales src/schmitzm/mail src/schmitzm/mail/resource/locales src/schmitzm/swing/resource/locales src/skrueger/db src/skrueger/geotools src/skrueger/geotools/io src_junit/schmitzm/geotools/feature src_junit/schmitzm/lang
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 2 11:33:36 CET 2010
Author: alfonx
Date: 2010-11-02 11:33:32 +0100 (Tue, 02 Nov 2010)
New Revision: 1195
Modified:
trunk/src/schmitzm/data/resource/locales/DataResourceBundle.properties
trunk/src/schmitzm/data/resource/locales/DataResourceBundle_de.properties
trunk/src/schmitzm/data/resource/locales/DataResourceBundle_it.properties
trunk/src/schmitzm/geotools/feature/FeatureUtil.java
trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle.properties
trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle_de.properties
trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle_it.properties
trunk/src/schmitzm/geotools/gui/GeoMapPane.java
trunk/src/schmitzm/geotools/gui/GridPanel.java
trunk/src/schmitzm/geotools/gui/SelectableXMapPane.java
trunk/src/schmitzm/geotools/gui/XMapPane.java
trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties
trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties
trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_it.properties
trunk/src/schmitzm/geotools/styling/StylingUtil.java
trunk/src/schmitzm/jfree/resource/locales/JFreeResourceBundle.properties
trunk/src/schmitzm/jfree/resource/locales/JFreeResourceBundle_de.properties
trunk/src/schmitzm/lang/LangUtil.java
trunk/src/schmitzm/lang/ResourceProvider.java
trunk/src/schmitzm/lang/resource/locales/LangResourceBundle.properties
trunk/src/schmitzm/lang/resource/locales/LangResourceBundle_de.properties
trunk/src/schmitzm/lang/resource/locales/LangResourceBundle_it.properties
trunk/src/schmitzm/mail/MailUtil.java
trunk/src/schmitzm/mail/resource/locales/MailResourceBundle.properties
trunk/src/schmitzm/mail/resource/locales/MailResourceBundle_de.properties
trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties
trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties
trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_it.properties
trunk/src/skrueger/db/PGUtil.java
trunk/src/skrueger/geotools/MapView.java
trunk/src/skrueger/geotools/io/DbServerSettings.java
trunk/src_junit/schmitzm/geotools/feature/FeatureUtilTest.java
trunk/src_junit/schmitzm/lang/LangUtilTest.java
Log:
* Double clicking a layer will set the CRS of the layer for the GeoMapPane
* Added GeometryForm.NONE and GeometryForm.ANY
* More warnings and checks when importing from WFS or DB in AtlasStyler
Modified: trunk/src/schmitzm/data/resource/locales/DataResourceBundle.properties
===================================================================
--- trunk/src/schmitzm/data/resource/locales/DataResourceBundle.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/data/resource/locales/DataResourceBundle.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,86 +1,86 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focussing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# -----------------------------------------------------------
-# ------ Default Translations (english) for components ------
-# ------ in Package schmitzm.data ------
-# -----------------------------------------------------------
-
-DistanceUnit.METERS=meters
-DistanceUnit.KM=kilometers
-DistanceUnit.MILES=miles
-DistanceUnit.YARDS=yards
-DistanceUnit.FEET=feet
-
-DistanceUnit.METERS.Abb=m
-DistanceUnit.KM.Abb=km
-DistanceUnit.MILES.Abb=mi
-DistanceUnit.YARDS.Abb=yt
-DistanceUnit.FEET.Abb=ft
-
-RasterDim.GridWidth=Grid width
-RasterDim.GridHeight=Grid height
-RasterDim.CellWidth=Cell width
-RasterDim.CellHeight=Cell height
-RasterDim.SampleType=Grid sample type
-RasterDim.ErrorMess=${0} of '${1}' is incompatible to '${2}'...
-
-# --- Translations for RasterOperationTree / RasterOperationTreeParser
-RasterOperationTree.AllowedIdx=allowed: 0 to ${0}
-RasterOperationTree.NoneAllowed=none allowed
-RasterOperationTree.err.NonNumericResult=RasterCalculator can only handle numeric results: ${0}
-RasterOperationTree.err.FilterReferenceNotAllowed=Filter can only be applied on a raster reference
-RasterOperationTree.err.InvalidRasterReference=Invalid input raster reference '#${0}' (${1})
-RasterOperationTree.err.InvalidFilterReference=Invalid input filter reference 'F${0}' (${1})
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focussing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# -----------------------------------------------------------
+# ------ Default Translations (english) for components ------
+# ------ in Package schmitzm.data ------
+# -----------------------------------------------------------
+
+DistanceUnit.METERS=meters
+DistanceUnit.KM=kilometers
+DistanceUnit.MILES=miles
+DistanceUnit.YARDS=yards
+DistanceUnit.FEET=feet
+
+DistanceUnit.METERS.Abb=m
+DistanceUnit.KM.Abb=km
+DistanceUnit.MILES.Abb=mi
+DistanceUnit.YARDS.Abb=yt
+DistanceUnit.FEET.Abb=ft
+
+RasterDim.GridWidth=Grid width
+RasterDim.GridHeight=Grid height
+RasterDim.CellWidth=Cell width
+RasterDim.CellHeight=Cell height
+RasterDim.SampleType=Grid sample type
+RasterDim.ErrorMess=${0} of '${1}' is incompatible to '${2}'...
+
+# --- Translations for RasterOperationTree / RasterOperationTreeParser
+RasterOperationTree.AllowedIdx=allowed: 0 to ${0}
+RasterOperationTree.NoneAllowed=none allowed
+RasterOperationTree.err.NonNumericResult=RasterCalculator can only handle numeric results: ${0}
+RasterOperationTree.err.FilterReferenceNotAllowed=Filter can only be applied on a raster reference
+RasterOperationTree.err.InvalidRasterReference=Invalid input raster reference '#${0}' (${1})
+RasterOperationTree.err.InvalidFilterReference=Invalid input filter reference 'F${0}' (${1})
Modified: trunk/src/schmitzm/data/resource/locales/DataResourceBundle_de.properties
===================================================================
--- trunk/src/schmitzm/data/resource/locales/DataResourceBundle_de.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/data/resource/locales/DataResourceBundle_de.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,80 +1,80 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focussing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# ------------------------------------------------
-# ------ German Translations for components ------
-# ------ in Package schmitzm.data ------
-# ------------------------------------------------
-
-DistanceUnit.METERS=Meter
-DistanceUnit.KM=Kilometer
-DistanceUnit.MILES=Meilen
-DistanceUnit.YARDS=Yards
-DistanceUnit.FEET=Feet
-
-RasterDim.GridWidth=Raster-Breite
-RasterDim.GridHeight=Raster-Hoehe
-RasterDim.CellWidth=Zellen-Breite
-RasterDim.CellHeight=Zellen-Hoehe
-RasterDim.SampleType=Raster-Datentyp
-RasterDim.ErrorMess=${0} von '${1}' ist nicht kompatibel zu '${2}'...
-
-# --- Translations for RasterOperationTree / RasterOperationTreeParser
-RasterOperationTree.AllowedIdx=erlaubt: 0 to ${0}
-RasterOperationTree.NoneAllowed=keine erlaubt
-RasterOperationTree.err.NonNumericResult=RasterCalculator kann nur numerische Ergebnisse verarbeiten: ${0}
-RasterOperationTree.err.FilterReferenceNotAllowed=Filter kann nur auf Raster-Referenzen angewandt werden
-RasterOperationTree.err.InvalidRasterReference=Ung\u00fcltige Raster-Referenz '#${0}' (${1})
-RasterOperationTree.err.InvalidFilterReference=Ung\u00fcltige Filter-Referenz 'F${0}' (${1})
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focussing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# ------------------------------------------------
+# ------ German Translations for components ------
+# ------ in Package schmitzm.data ------
+# ------------------------------------------------
+
+DistanceUnit.METERS=Meter
+DistanceUnit.KM=Kilometer
+DistanceUnit.MILES=Meilen
+DistanceUnit.YARDS=Yards
+DistanceUnit.FEET=Feet
+
+RasterDim.GridWidth=Raster-Breite
+RasterDim.GridHeight=Raster-Hoehe
+RasterDim.CellWidth=Zellen-Breite
+RasterDim.CellHeight=Zellen-Hoehe
+RasterDim.SampleType=Raster-Datentyp
+RasterDim.ErrorMess=${0} von '${1}' ist nicht kompatibel zu '${2}'...
+
+# --- Translations for RasterOperationTree / RasterOperationTreeParser
+RasterOperationTree.AllowedIdx=erlaubt: 0 to ${0}
+RasterOperationTree.NoneAllowed=keine erlaubt
+RasterOperationTree.err.NonNumericResult=RasterCalculator kann nur numerische Ergebnisse verarbeiten: ${0}
+RasterOperationTree.err.FilterReferenceNotAllowed=Filter kann nur auf Raster-Referenzen angewandt werden
+RasterOperationTree.err.InvalidRasterReference=Ung\u00fcltige Raster-Referenz '#${0}' (${1})
+RasterOperationTree.err.InvalidFilterReference=Ung\u00fcltige Filter-Referenz 'F${0}' (${1})
Modified: trunk/src/schmitzm/data/resource/locales/DataResourceBundle_it.properties
===================================================================
--- trunk/src/schmitzm/data/resource/locales/DataResourceBundle_it.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/data/resource/locales/DataResourceBundle_it.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,58 +1,58 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Annica Sahlin
-##########
-
-# -------------------------------------------------
-# ------ Italian Translations for components ------
-# ------ in Package schmitzm.data ------
-# -------------------------------------------------
-DistanceUnit.FEET= feet
-DistanceUnit.FEET.Abb= ft
-DistanceUnit.KM= Chilometri
-DistanceUnit.KM.Abb= km
-DistanceUnit.METERS= metri
-DistanceUnit.METERS.Abb= m
-DistanceUnit.MILES= miles
-DistanceUnit.MILES.Abb= mi
-DistanceUnit.YARDS= yards
-DistanceUnit.YARDS.Abb= yt
-RasterDim.CellHeight= Altezza cella
-RasterDim.CellWidth= Larghezza cella
-RasterDim.ErrorMess= ${0} di '${1}' \u00e8 incompatibile a '${2}'...
-RasterDim.GridHeight= Altezza griglia
-RasterDim.GridWidth= Larghezza griglia
-RasterDim.SampleType= Grid sample type
-
-
-# --- Translations for RasterOperationTree / RasterOperationTreeParser
-RasterOperationTree.AllowedIdx= accettato: 0 a ${0}
-RasterOperationTree.NoneAllowed= nessuno accettato
-RasterOperationTree.err.FilterReferenceNotAllowed= Filto pu\u00f2 solo essere applicato a raster reference
-RasterOperationTree.err.InvalidFilterReference= Riferimento filtro di input non valido'F${0}' (${1})
-RasterOperationTree.err.InvalidRasterReference= Riferimento raster di input non valido '#${0}' (${1})
-RasterOperationTree.err.NonNumericResult= RasterCalculator pu\u00f2 solo supportare risultati numerici: ${0}
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Annica Sahlin
+##########
+
+# -------------------------------------------------
+# ------ Italian Translations for components ------
+# ------ in Package schmitzm.data ------
+# -------------------------------------------------
+DistanceUnit.FEET= feet
+DistanceUnit.FEET.Abb= ft
+DistanceUnit.KM= Chilometri
+DistanceUnit.KM.Abb= km
+DistanceUnit.METERS= metri
+DistanceUnit.METERS.Abb= m
+DistanceUnit.MILES= miles
+DistanceUnit.MILES.Abb= mi
+DistanceUnit.YARDS= yards
+DistanceUnit.YARDS.Abb= yt
+RasterDim.CellHeight= Altezza cella
+RasterDim.CellWidth= Larghezza cella
+RasterDim.ErrorMess= ${0} di '${1}' \u00e8 incompatibile a '${2}'...
+RasterDim.GridHeight= Altezza griglia
+RasterDim.GridWidth= Larghezza griglia
+RasterDim.SampleType= Grid sample type
+
+
+# --- Translations for RasterOperationTree / RasterOperationTreeParser
+RasterOperationTree.AllowedIdx= accettato: 0 a ${0}
+RasterOperationTree.NoneAllowed= nessuno accettato
+RasterOperationTree.err.FilterReferenceNotAllowed= Filto pu\u00f2 solo essere applicato a raster reference
+RasterOperationTree.err.InvalidFilterReference= Riferimento filtro di input non valido'F${0}' (${1})
+RasterOperationTree.err.InvalidRasterReference= Riferimento raster di input non valido '#${0}' (${1})
+RasterOperationTree.err.NonNumericResult= RasterCalculator pu\u00f2 solo supportare risultati numerici: ${0}
Modified: trunk/src/schmitzm/geotools/feature/FeatureUtil.java
===================================================================
--- trunk/src/schmitzm/geotools/feature/FeatureUtil.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/feature/FeatureUtil.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -262,8 +262,17 @@
LINE,
/** Polygon */
POLYGON,
- /** Not specified, possible when parsing WFS describe feature type **/
- ANY
+ /**
+ * Not exactly specified (usually Geometry.class), can happen for
+ * example when parsing WFS GML or get describe feature type
+ **/
+ ANY,
+ /**
+ * For example when <code>null</code> is passes as an argument, or a
+ * featuresource (e.g. database table) doesn't containt a Geometry
+ * column.
+ */
+ NONE
}
/**
@@ -279,8 +288,12 @@
* a feature type
*/
public static GeometryForm getGeometryForm(SimpleFeatureType fType) {
+
+ if (fType == null)
+ return GeometryForm.NONE;
+
if (fType.getGeometryDescriptor() == null)
- return null;
+ return GeometryForm.NONE;
GeometryDescriptor geometryType = fType.getGeometryDescriptor();
return getGeometryForm(geometryType);
@@ -290,6 +303,13 @@
* Determines the kind of geometry of a {@link GeometryDescriptor}.
*/
public static GeometryForm getGeometryForm(GeometryDescriptor gDesc) {
+
+ if (gDesc == null)
+ return GeometryForm.NONE;
+
+ if (gDesc.getType() == null)
+ return GeometryForm.NONE;
+
return getGeometryForm(gDesc.getType().getBinding());
}
@@ -302,6 +322,9 @@
public static GeometryForm getGeometryForm(
GeometryAttributeType geometryType) {
+ if (geometryType == null)
+ return GeometryForm.NONE;
+
return getGeometryForm(geometryType.getBinding());
}
@@ -310,6 +333,10 @@
*/
public static GeometryForm getGeometryForm(Class<?> geometryType) {
+ // Return none if there are is no description of any geometry form
+ if (geometryType == null)
+ return GeometryForm.NONE;
+
if (Point.class.isAssignableFrom(geometryType)
|| MultiPoint.class.isAssignableFrom(geometryType))
return GeometryForm.POINT;
@@ -323,7 +350,8 @@
.isAssignableFrom(geometryType)) {
// TODO This happens with some "special" WFS services and has to be
// ahndeletd much nicer
- return GeometryForm.POLYGON;
+ // return GeometryForm.POLYGON;
+ return GeometryForm.ANY;
}
// Aus anderem, doppelem alten code
@@ -354,6 +382,11 @@
*/
public static GeometryForm getGeometryForm(
FeatureCollection<SimpleFeatureType, SimpleFeature> fc) {
+
+ // Return none if there are is no description of any geometry form
+ if (fc == null)
+ return GeometryForm.NONE;
+
return getGeometryForm(fc.getSchema());
}
@@ -365,17 +398,25 @@
*/
public static GeometryForm getGeometryForm(
FeatureSource<SimpleFeatureType, SimpleFeature> fs) {
+ // Return none if there are is no description of any geometry form
+ if (fs == null)
+ return GeometryForm.NONE;
+
return getGeometryForm(fs.getSchema());
}
/**
* Determines the kind of geometry of a {@link MapLayer}.
*
- * @param layer
+ * @param mapLayer
* a map layer
*/
- public static GeometryForm getGeometryForm(MapLayer layer) {
- return getGeometryForm((SimpleFeatureType) layer.getFeatureSource()
+ public static GeometryForm getGeometryForm(MapLayer mapLayer) {
+ // Return none if there are is no description of any geometry form
+ if (mapLayer == null)
+ return GeometryForm.NONE;
+
+ return getGeometryForm((SimpleFeatureType) mapLayer.getFeatureSource()
.getSchema());
}
@@ -445,7 +486,6 @@
* GeometryAttributeType
*/
public static Style createDefaultStyle(GeometryDescriptor geometryAttrib) {
- Style style = null;
GeometryForm geoForm = getGeometryForm(geometryAttrib);
@@ -2243,9 +2283,15 @@
case LINE:
dists.add(((Geometry) f1.getDefaultGeometry()).getLength());
break;
+ case ANY:
case POLYGON:
dists.add(((Geometry) f1.getDefaultGeometry()).getLength());
break;
+
+ case NONE:
+ default:
+
+ // TODO NONE AND ANY
}
}
@@ -2360,8 +2406,11 @@
for (final AttributeDescriptor pd : attributeDescs) {
final Class<?> c = pd.getType().getBinding();
- if (c == Integer.class || c == Double.class || c == Byte.class
- || c == Float.class || c == Short.class || c == Long.class) {
+ if (Number.class.isAssignableFrom(c)) {
+ // if (c == Integer.class || c == Double.class || c ==
+ // Byte.class
+ // || c == BigInteger.class || c == BigDecimal.class
+ // || c == Float.class || c == Short.class || c == Long.class) {
numericalFieldNames.add(pd.getLocalName());
}
}
@@ -2430,15 +2479,7 @@
if (attributeDescriptors.size() == 0) {
LOGGER.warn("The schmema has no attributes!");
}
-
-
-
-
-
-
-
-
// Checking for exact match
for (AttributeDescriptor d : attributeDescriptors) {
if (d.getName().getLocalPart().equals(localName))
@@ -2528,32 +2569,31 @@
* etwas zu finden
*/
for (AttributeDescriptor d : attributeDescriptors) {
-
+
String s2 = Pattern.quote(localName);
- s2 = s2.substring(2,s2.length()-2);
-
- // Matche irgendein nicht ASCII zeichen gegen irgenein nicht ASCII Zeichen
+ s2 = s2.substring(2, s2.length() - 2);
+
+ // Matche irgendein nicht ASCII zeichen gegen irgenein nicht ASCII
+ // Zeichen
String s3 = s2.replaceAll("[^\\w]", "[^\\\\w]");
Pattern compile = Pattern.compile(s3);
Matcher matcher = compile.matcher(d.getLocalName());
- System.out.println("New Matching Debug " +" "+s2+" "+s3+" "+localName+" "
- + d.getLocalName());
-
+ System.out.println("New Matching Debug " + " " + s2 + " " + s3
+ + " " + localName + " " + d.getLocalName());
+
if (matcher.find()) {
Log.info("New Matching Debug " + localName + " zu "
+ d.getLocalName());
-
- System.out.println("New Matching Debug !!! " + localName + " zu "
- + d.getLocalName());
+ System.out.println("New Matching Debug !!! " + localName
+ + " zu " + d.getLocalName());
+
return new NameImpl(d.getName().getNamespaceURI(), d.getName()
.getLocalPart());
}
}
-
-
return null;
}
Modified: trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle.properties
===================================================================
--- trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,71 +1,71 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focussing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# -----------------------------------------------------------
-# ------ Default Translations (english) for components ------
-# ------ in Package schmitzm.geotools.feature ------
-# -----------------------------------------------------------
-
-# --- Restrictions for attribute names ---
-org.geotools.err.attr.name=Attribute name not allowed
-org.geotools.err.attr.name.null=Attribute name must not be NULL\!
-org.geotools.err.attr.name.length=At most 10 characters allowed for attribute name\!
-org.geotools.err.attr.name.start=Attribute name must start with a character (A-Z,a-z)!
-org.geotools.err.attr.name.chars=Only digits (0-9), characters (A-Z,a-z) and '_' allowed for attribute name!
-
-
-# --- Translations for FeatureOperationTree / FeatureOperationTreeParser
-FeatureOperationTree.err.NullAttr=FeatureOperationTree can not evaluate null-Attributes: ${0}
-FeatureOperationTree.err.UnknownAttr=Unknown feature attribute: ${0}
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focussing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# -----------------------------------------------------------
+# ------ Default Translations (english) for components ------
+# ------ in Package schmitzm.geotools.feature ------
+# -----------------------------------------------------------
+
+# --- Restrictions for attribute names ---
+org.geotools.err.attr.name=Attribute name not allowed
+org.geotools.err.attr.name.null=Attribute name must not be NULL\!
+org.geotools.err.attr.name.length=At most 10 characters allowed for attribute name\!
+org.geotools.err.attr.name.start=Attribute name must start with a character (A-Z,a-z)!
+org.geotools.err.attr.name.chars=Only digits (0-9), characters (A-Z,a-z) and '_' allowed for attribute name!
+
+
+# --- Translations for FeatureOperationTree / FeatureOperationTreeParser
+FeatureOperationTree.err.NullAttr=FeatureOperationTree can not evaluate null-Attributes: ${0}
+FeatureOperationTree.err.UnknownAttr=Unknown feature attribute: ${0}
Modified: trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle_de.properties
===================================================================
--- trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle_de.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle_de.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,70 +1,70 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focussing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# --------------------------------------------------
-# ------ German Translations for components ------
-# ------ in Package schmitzm.geotools.feature ------
-# --------------------------------------------------
-
-# --- Restrictions for attribute names ---
-org.geotools.err.attr.name=Attribute-Name nicht zul\u00e4ssig
-org.geotools.err.attr.name.null=Attribute-Name darf nicht NULL sein!
-org.geotools.err.attr.name.length=Attribut-Name darf maximal 10 Zeichen lang sein!
-org.geotools.err.attr.name.start=Attribut-Name muss mit einem Zeichen (A-Z,a-z) beginnen!
-org.geotools.err.attr.name.chars=Attribut-Name darf nur Ziffern (0-9), Zeichen (A-Z,a-z) und '_' beinhalten!
-
-# --- Translations for FeatureOperationTree / FeatureOperationTreeParser
-FeatureOperationTree.err.NullAttr=FeatureOperationTree keine null-Attribute auswerten: ${0}
-FeatureOperationTree.err.UnknownAttr=Unbekanntes Feature-Attribut: ${0}
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focussing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# --------------------------------------------------
+# ------ German Translations for components ------
+# ------ in Package schmitzm.geotools.feature ------
+# --------------------------------------------------
+
+# --- Restrictions for attribute names ---
+org.geotools.err.attr.name=Attribute-Name nicht zul\u00e4ssig
+org.geotools.err.attr.name.null=Attribute-Name darf nicht NULL sein!
+org.geotools.err.attr.name.length=Attribut-Name darf maximal 10 Zeichen lang sein!
+org.geotools.err.attr.name.start=Attribut-Name muss mit einem Zeichen (A-Z,a-z) beginnen!
+org.geotools.err.attr.name.chars=Attribut-Name darf nur Ziffern (0-9), Zeichen (A-Z,a-z) und '_' beinhalten!
+
+# --- Translations for FeatureOperationTree / FeatureOperationTreeParser
+FeatureOperationTree.err.NullAttr=FeatureOperationTree keine null-Attribute auswerten: ${0}
+FeatureOperationTree.err.UnknownAttr=Unbekanntes Feature-Attribut: ${0}
Modified: trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle_it.properties
===================================================================
--- trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle_it.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/feature/resource/locales/FeatureResourceBundle_it.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,45 +1,45 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Annica Sahlin
-##########
-
-# --------------------------------------------------
-# ------ Italian Translations for components ------
-# ------ in Package schmitzm.geotools.feature ------
-# --------------------------------------------------
-
-# --- Restrictions for attribute names ---
-org.geotools.err.attr.name= Nome di attributo non accettato
-org.geotools.err.attr.name.chars= Solo digits (0-9), caratteri (A-Z,a-z) e '_' sono accettati per il nome di attributo!
-org.geotools.err.attr.name.length= Max 10 caratteri per nome di attributo!
-org.geotools.err.attr.name.null= Il nome di attributo non pu\u00f2 essere NULL!
-org.geotools.err.attr.name.start= Il nome di attributo deve iniziare con un carattere (A-Z,a-z)!
-
-# --- Translations for FeatureOperationTree / FeatureOperationTreeParser
-FeatureOperationTree.err.NullAttr= FeatureOperationTree can not evaluate null-Attributes: ${0}
-FeatureOperationTree.err.UnknownAttr= Attributo oggetto sconosciuto: ${0}
-
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Annica Sahlin
+##########
+
+# --------------------------------------------------
+# ------ Italian Translations for components ------
+# ------ in Package schmitzm.geotools.feature ------
+# --------------------------------------------------
+
+# --- Restrictions for attribute names ---
+org.geotools.err.attr.name= Nome di attributo non accettato
+org.geotools.err.attr.name.chars= Solo digits (0-9), caratteri (A-Z,a-z) e '_' sono accettati per il nome di attributo!
+org.geotools.err.attr.name.length= Max 10 caratteri per nome di attributo!
+org.geotools.err.attr.name.null= Il nome di attributo non pu\u00f2 essere NULL!
+org.geotools.err.attr.name.start= Il nome di attributo deve iniziare con un carattere (A-Z,a-z)!
+
+# --- Translations for FeatureOperationTree / FeatureOperationTreeParser
+FeatureOperationTree.err.NullAttr= FeatureOperationTree can not evaluate null-Attributes: ${0}
+FeatureOperationTree.err.UnknownAttr= Attributo oggetto sconosciuto: ${0}
+
Modified: trunk/src/schmitzm/geotools/gui/GeoMapPane.java
===================================================================
--- trunk/src/schmitzm/geotools/gui/GeoMapPane.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/gui/GeoMapPane.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -42,13 +42,16 @@
import org.geotools.renderer.lite.StreamingRenderer;
import org.geotools.renderer.shape.ShapefileRenderer;
import org.geotools.resources.CRSUtilities;
+import org.opengis.referencing.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.operation.TransformException;
import schmitzm.geotools.GTUtil;
import schmitzm.geotools.map.event.JMapPaneListener;
import schmitzm.geotools.map.event.MapAreaChangedEvent;
import schmitzm.geotools.map.event.ScaleChangedEvent;
+import schmitzm.swing.ExceptionDialog;
import schmitzm.swing.JPanel;
import schmitzm.swing.SwingUtil;
@@ -127,7 +130,41 @@
*/
private boolean disposed = false;
+ private CoordinateReferenceSystem forceCrs;
+
/**
+ * Allows to set a CRS that should be used for the {@link MapContext}, no
+ * matter which CRS the bottom layer has.
+ */
+ public void setForceCrs(CoordinateReferenceSystem crs) {
+ forceCrs = crs;
+
+ try {
+ getMapContext().setCoordinateReferenceSystem(
+ forceCrs);
+ } catch (TransformException e) {
+ ExceptionDialog.show(this, e);
+ } catch (FactoryException e) {
+ ExceptionDialog.show(this, e);
+ }
+ }
+
+ /**
+ * Allows to set a CRS that should be used for the {@link MapContext}, no
+ * matter which CRS the bottom layer has.
+ */
+ public CoordinateReferenceSystem getForceCrs() {
+ return forceCrs;
+ }
+
+ /**
+ * <code>true</code> if a forceCrs has been defined.
+ */
+ public boolean isForceCrs() {
+ return forceCrs == null;
+ }
+
+ /**
* Erzeugt ein neues {@code GeoMapPane}.
*/
public GeoMapPane() {
Modified: trunk/src/schmitzm/geotools/gui/GridPanel.java
===================================================================
--- trunk/src/schmitzm/geotools/gui/GridPanel.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/gui/GridPanel.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -349,7 +349,7 @@
gridToMap.transform(grid_GCRS, 0, grid_MCRS, 0, 1);
mapToWin.inverseTransform(grid_MCRS,0,grid_WINDOW,0,1);
} catch (Throwable err) {
- LOGGER.warn("Error ignored during paint of coordinate grid: "+err);
+ LOGGER.warn("Error ignored during paint of coordinate grid: ",err);
continue;
}
Modified: trunk/src/schmitzm/geotools/gui/SelectableXMapPane.java
===================================================================
--- trunk/src/schmitzm/geotools/gui/SelectableXMapPane.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/gui/SelectableXMapPane.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -206,12 +206,15 @@
return 0.0;
// double scale = getMapArea().getWidth() / getWidth();
- //
// LOGGER.debug("Scale in XMapPane = "+scale);
- double scale2 = 1. / getWorldToScreenTransform().getScaleX();
-// LOGGER.debug("Alternativ = " + scale2);
+ AffineTransform worldToScreenTransform = getWorldToScreenTransform();
+ if (worldToScreenTransform == null)
+ return 0.0;
+ double scale2 = 1. / worldToScreenTransform.getScaleX();
+ // LOGGER.debug("Alternativ = " + scale2);
+
return scale2;
}
@@ -286,8 +289,7 @@
*
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a>
* (University of Bonn/Germany)
- * @author <a href="mailto:skpublic at wikisquare.de">Stefan Alfons
- * Tzeggai</a>
+ * @author <a href="mailto:skpublic at wikisquare.de">Stefan Alfons Tzeggai</a>
*/
public boolean findGridCoverageValuesAndFireEvents(Point2D point, int mode) {
Hashtable<MapLayer, double[]> result = findGridCoverageValues(point,
@@ -320,8 +322,7 @@
*
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a>
* (University of Bonn/Germany)
- * @author <a href="mailto:skpublic at wikisquare.de">Stefan Alfons
- * Tzeggai</a>
+ * @author <a href="mailto:skpublic at wikisquare.de">Stefan Alfons Tzeggai</a>
*/
@Override
public boolean setMapArea(ReferencedEnvelope newMapArea) {
@@ -333,9 +334,9 @@
if (getScale() > 0) {
// If the JPane has not been set yet, there is
// no scale
-// if (oldScale != getScale())
- fireMapPaneEvent(new ScaleChangedEvent(this, oldScale,
- getScale()));
+ // if (oldScale != getScale())
+ fireMapPaneEvent(new ScaleChangedEvent(this, oldScale,
+ getScale()));
}
fireMapPaneEvent(new MapAreaChangedEvent(this, oldMapArea,
getMapArea()));
@@ -351,8 +352,8 @@
* rendering has been triggered.
*/
public boolean zoomTo(SimpleFeature feature) {
- final MemoryFeatureCollection mfc = new MemoryFeatureCollection(feature
- .getFeatureType());
+ final MemoryFeatureCollection mfc = new MemoryFeatureCollection(
+ feature.getFeatureType());
mfc.add(feature);
return zoomTo(mfc);
}
@@ -479,8 +480,7 @@
*
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a>
* (University of Bonn/Germany)
- * @author <a href="mailto:skpublic at wikisquare.de">Stefan Alfons
- * Tzeggai</a>
+ * @author <a href="mailto:skpublic at wikisquare.de">Stefan Alfons Tzeggai</a>
*/
protected Hashtable<MapLayer, double[]> findGridCoverageValues(
Point2D point, int mode) {
@@ -786,8 +786,8 @@
// This should never happen, because the check should be performed
// earlier already
if (!isMapLayerSelectable(layer)) {
-// LOGGER.debug("Ignoring layer " + layer.getTitle()
-// + " because it is not declared as selectable!");
+ // LOGGER.debug("Ignoring layer " + layer.getTitle()
+ // + " because it is not declared as selectable!");
continue;
}
Modified: trunk/src/schmitzm/geotools/gui/XMapPane.java
===================================================================
--- trunk/src/schmitzm/geotools/gui/XMapPane.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/gui/XMapPane.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1428,10 +1428,16 @@
return new AffineTransform(screenToWorld);
}
+ /**
+ * Returns null
+ */
public AffineTransform getWorldToScreenTransform() {
if (worldToScreen == null) {
resetTransforms();
}
+ if (worldToScreen == null) {
+ return null;
+ }
// nur Kopie der Transformation zurueckgeben!
return new AffineTransform(worldToScreen);
}
Modified: trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties
===================================================================
--- trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,180 +1,180 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Kr\ufffdger - additional utility classes
-##########
-
-# ---------------------------------------------------------------
-# ------ Default Translations (english) for GUI components ------
-# ------ in Package schmitz.geotools.gui ------
-# ---------------------------------------------------------------
-
-Attribute=Attribute
-Attributes=Attributes
-
-org.geotools.styling.StyleBuilder.MARK_ARROW=Arrow
-org.geotools.styling.StyleBuilder.MARK_CIRCLE=Circle
-org.geotools.styling.StyleBuilder.MARK_CROSS=Cross
-org.geotools.styling.StyleBuilder.MARK_SQUARE=Square
-org.geotools.styling.StyleBuilder.MARK_STAR=Star
-org.geotools.styling.StyleBuilder.MARK_TRIANGLE=Triangle
-org.geotools.styling.StyleBuilder.MARK_X=X
-
-org.geotools.styling.ColorMap.TYPE_RAMP=Color interpolation
-org.geotools.styling.ColorMap.TYPE_VALUES=Classifying values
-org.geotools.styling.ColorMap.TYPE_INTERVALS=Classifying intervals
-
-schmitzm.geotools.feature.FeatureTableModel.AttrName=Attribute
-schmitzm.geotools.feature.FeatureTableModel.AttrType=Type
-schmitzm.geotools.feature.FeatureTableModel.AttrValue=Value
-
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestButton=Test filter
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsButton=?
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsToolTip=Show error details...
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.ResultsBorderTitle=Filter result:
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.FilterDefinitionBorderTitle=Define filter:
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.PreviewMapPaneToolTip=Red features are included by the filter,\ngray features are not.
-
-schmitzm.geotools.gui.FeatureTablePane.PreviewMapPaneToolTip=Red features are selected,\ngray features are not.
-
-schmitzm.geotools.gui.FeatureLayerFilterDialog.TITLE = Feature-Filter
-
-schmitzm.geotools.gui.MapActionControlPane.INFO=Info
-schmitzm.geotools.gui.MapActionControlPane.ZOOM_IN=Zoom in
-schmitzm.geotools.gui.MapActionControlPane.ZOOM_OUT=Zoom out
-schmitzm.geotools.gui.MapActionControlPane.SELECT_TOP=Select from top layer
-schmitzm.geotools.gui.MapActionControlPane.SELECT_ALL=Select from all layers
-schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_UP=Move layer UP
-schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_DOWN=Move layer DOWN
-schmitzm.geotools.gui.MapContextControlPane.Menu.ZOOM_TO=Zoom to layer
-schmitzm.geotools.gui.MapContextControlPane.Menu.FILTER=Filter layer...
-schmitzm.geotools.gui.MapContextControlPane.Menu.RECOLOR=Recolor layer
-schmitzm.geotools.gui.MapContextControlPane.Menu.REMOVE=Remove layer
-schmitzm.geotools.gui.MapContextControlPane.Menu.SHOWALL=Show all layers
-schmitzm.geotools.gui.MapContextControlPane.Menu.HIDEALL=Hide all layers
-schmitzm.geotools.gui.MapContextControlPane.Menu.INVERTALL=Invert all layers
-schmitzm.geotools.gui.MapContextControlPane.Menu.CUSTOMIZE=Customize...
-schmitzm.geotools.gui.MapContextControlPane.ColorMapDialog.TITLE=Color map
-schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.TITLE=New color map
-schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.QUESTION=Enter a name for the new color map...
-schmitzm.geotools.gui.ColorMapTable.Header.QUANTITY=Quantity
-schmitzm.geotools.gui.ColorMapTable.Header.COLOR=Color
-schmitzm.geotools.gui.ColorMapTable.Header.LABEL=Label
-schmitzm.geotools.gui.ColorMapTable.Header.OPACITY=Transparent
-schmitzm.geotools.gui.RasterPositionLabel.LABEL_PREFIX=Raster value
-schmitzm.geotools.gui.GeotoolsGUIUtil.Load=Load
-schmitzm.geotools.gui.GeotoolsGUIUtil.LoadRaster=Load raster
-schmitzm.geotools.gui.GeotoolsGUIUtil.LoadFeature=Load vector
-schmitzm.geotools.gui.GeotoolsGUIUtil.Save=Save
-schmitzm.geotools.gui.GeotoolsGUIUtil.SaveRaster=Save raster
-schmitzm.geotools.gui.GeotoolsGUIUtil.SaveFeature=Save vector
-schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH=North
-schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH=South
-schmitzm.geotools.gui.GeotoolsGUIUtil.WEST=West
-schmitzm.geotools.gui.GeotoolsGUIUtil.EAST=East
-schmitzm.geotools.gui.GeotoolsGUIUtil.North=Nord
-schmitzm.geotools.gui.GeotoolsGUIUtil.South=South
-schmitzm.geotools.gui.GeotoolsGUIUtil.West=West
-schmitzm.geotools.gui.GeotoolsGUIUtil.East=East
-schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH.Abb=N
-schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH.Abb=S
-schmitzm.geotools.gui.GeotoolsGUIUtil.WEST.Abb=W
-schmitzm.geotools.gui.GeotoolsGUIUtil.EAST.Abb=E
-schmitzm.geotools.gui.CRSSelectionDialog.init.crs.title=CRS database
-schmitzm.geotools.gui.CRSSelectionDialog.init.crs.mess=Initialize CRS database. Please wait...
-schmitzm.geotools.gui.CRSSelectionDialog.title=Choose a coordinate reference system (CRS)
-schmitzm.geotools.gui.CRSSelectionDialog.mandatory=CRS must be specified!
-schmitzm.geotools.gui.CRSSelectionDialog.button.wgs84=WGS-84 CRS
-schmitzm.geotools.gui.CRSSelectionDialog.button.default=Default CRS (${0})
-schmitzm.geotools.gui.CRSSelectionDialog.button.predefined=Predefined
-schmitzm.geotools.gui.CRSSelectionDialog.button.userDefined=User defined:
-schmitzm.geotools.gui.JMapEditorPane.Err.MissingMap=First a layer must be displayed (to define CRS and geo-position).
-schmitzm.geotools.gui.JMapEditorPane.Err.Line.LessPoints=For a line feature at least 2 points must be specified!
-schmitzm.geotools.gui.JMapEditorPane.Err.Polygon.LessPoints=For a polygon feature at least 3 points must be specified!
-schmitzm.geotools.gui.JMapEditorToolBar.button.layer.new=Create new layer
-schmitzm.geotools.gui.JMapEditorToolBar.button.layer.save=Finish layer
-schmitzm.geotools.gui.JMapEditorToolBar.button.layer.cancel=Abort layer
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.undo=Undo last editing operation
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.redo=Redo last undone editing operation
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.clear=Undo all editing operation
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.finish=Start new feature
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.dialog.title=Create new layer...
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title=Layer title
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title.default=New Layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type=Layer type
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.point=Point layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.line=Line layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.polygon=Polygon layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.ftype.title=Non-Geometric attributes
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.GeomAttr=Attribute name '${0}' reserverd for default geometry.
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.AutoVal=Auto value not supported for attribut type '${0}'.
-schmitzm.geotools.gui.JMapEditorToolBar.NewFeature.title=New feature attributes
-schmitzm.geotools.gui.StyleToolBar.FillColor=Fill
-schmitzm.geotools.gui.StyleToolBar.BorderColor=Border
-schmitzm.geotools.gui.StyleToolBar.BorderWidth=Border width
-schmitzm.geotools.gui.StyleToolBar.PointMark=Point style
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrName=Name
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrType=Type
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.Nillable=Nillable
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AutoValue=Auto
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.DefValue=Default
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.NewAttr=ATTR_${0}
-
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.clearSelection.tt=Clear selection
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.selectionToTop.tt=Move selected to the top of the table
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.invertSelection.tt=Invert selection
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.zoomToSelection.tt=Zoom to selected features
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus=${0} of ${1} ${2} selected.
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.polygons=polygons
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.points=points
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.lines=lines
-
-schmitzm.geotools.gui.GridPanelFormatter_DHDN.title=1,234,567 (H|R)
-schmitzm.geotools.gui.GridPanelFormatter_LatLon1.title=deegree\u00B0 minute' (N|E|S|W)
-schmitzm.geotools.gui.GridPanelFormatter.ToolTipTemplate=${0} in unit ${1}
-
-schmitzm.geotools.gui.GeoPositionLabel.LABEL_PREFIX=Mouse coordinate\:
-
-MapPaneButtons.Pan.TT=Move the visible map extend
-MapPaneButtons.Info.TT=Get information about objects
-MapPaneButtons.ZoomIn.TT=Zoom nearer to the map
-MapPaneButtons.ZoomOut.TT=Zoom away from the map
-MapPaneButtons.LastZoom.TT=Go to last map extend
-MapPaneButtons.NextZoom.TT=Go to next map extend
-
-MapPaneButtons.Selection.SetSelection.TT=Select objects to be selected
-MapPaneButtons.Selection.AddSelection.TT=Add objects to current selection
-MapPaneButtons.Selection.RemoveSelection.TT=Remove objects from current selection
-MapPaneButtons.Selection.ClearSelection.TT=Clear all selections
-
-SearchMapDialog.Results.Column.Layer=found in
-SearchMapDialog.Results.Column.Name=name
-SearchMapDialog.resultsTable.tt=Click on a result to show it.
-SearchMapDialog.searchString.Label=Enter search string:
-SearchMapDialog.searchString.tt=Enter text and press [Enter or Return].
-SearchMapDialog.title=Search labels in map\: ${0}
-SearchMapDialog.Explanation=<html>Here you can search all of the map's <b>labels</b>.</html>
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Kr\ufffdger - additional utility classes
+##########
+
+# ---------------------------------------------------------------
+# ------ Default Translations (english) for GUI components ------
+# ------ in Package schmitz.geotools.gui ------
+# ---------------------------------------------------------------
+
+Attribute=Attribute
+Attributes=Attributes
+
+org.geotools.styling.StyleBuilder.MARK_ARROW=Arrow
+org.geotools.styling.StyleBuilder.MARK_CIRCLE=Circle
+org.geotools.styling.StyleBuilder.MARK_CROSS=Cross
+org.geotools.styling.StyleBuilder.MARK_SQUARE=Square
+org.geotools.styling.StyleBuilder.MARK_STAR=Star
+org.geotools.styling.StyleBuilder.MARK_TRIANGLE=Triangle
+org.geotools.styling.StyleBuilder.MARK_X=X
+
+org.geotools.styling.ColorMap.TYPE_RAMP=Color interpolation
+org.geotools.styling.ColorMap.TYPE_VALUES=Classifying values
+org.geotools.styling.ColorMap.TYPE_INTERVALS=Classifying intervals
+
+schmitzm.geotools.feature.FeatureTableModel.AttrName=Attribute
+schmitzm.geotools.feature.FeatureTableModel.AttrType=Type
+schmitzm.geotools.feature.FeatureTableModel.AttrValue=Value
+
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestButton=Test filter
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsButton=?
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsToolTip=Show error details...
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.ResultsBorderTitle=Filter result:
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.FilterDefinitionBorderTitle=Define filter:
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.PreviewMapPaneToolTip=Red features are included by the filter,\ngray features are not.
+
+schmitzm.geotools.gui.FeatureTablePane.PreviewMapPaneToolTip=Red features are selected,\ngray features are not.
+
+schmitzm.geotools.gui.FeatureLayerFilterDialog.TITLE = Feature-Filter
+
+schmitzm.geotools.gui.MapActionControlPane.INFO=Info
+schmitzm.geotools.gui.MapActionControlPane.ZOOM_IN=Zoom in
+schmitzm.geotools.gui.MapActionControlPane.ZOOM_OUT=Zoom out
+schmitzm.geotools.gui.MapActionControlPane.SELECT_TOP=Select from top layer
+schmitzm.geotools.gui.MapActionControlPane.SELECT_ALL=Select from all layers
+schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_UP=Move layer UP
+schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_DOWN=Move layer DOWN
+schmitzm.geotools.gui.MapContextControlPane.Menu.ZOOM_TO=Zoom to layer
+schmitzm.geotools.gui.MapContextControlPane.Menu.FILTER=Filter layer...
+schmitzm.geotools.gui.MapContextControlPane.Menu.RECOLOR=Recolor layer
+schmitzm.geotools.gui.MapContextControlPane.Menu.REMOVE=Remove layer
+schmitzm.geotools.gui.MapContextControlPane.Menu.SHOWALL=Show all layers
+schmitzm.geotools.gui.MapContextControlPane.Menu.HIDEALL=Hide all layers
+schmitzm.geotools.gui.MapContextControlPane.Menu.INVERTALL=Invert all layers
+schmitzm.geotools.gui.MapContextControlPane.Menu.CUSTOMIZE=Customize...
+schmitzm.geotools.gui.MapContextControlPane.ColorMapDialog.TITLE=Color map
+schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.TITLE=New color map
+schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.QUESTION=Enter a name for the new color map...
+schmitzm.geotools.gui.ColorMapTable.Header.QUANTITY=Quantity
+schmitzm.geotools.gui.ColorMapTable.Header.COLOR=Color
+schmitzm.geotools.gui.ColorMapTable.Header.LABEL=Label
+schmitzm.geotools.gui.ColorMapTable.Header.OPACITY=Transparent
+schmitzm.geotools.gui.RasterPositionLabel.LABEL_PREFIX=Raster value
+schmitzm.geotools.gui.GeotoolsGUIUtil.Load=Load
+schmitzm.geotools.gui.GeotoolsGUIUtil.LoadRaster=Load raster
+schmitzm.geotools.gui.GeotoolsGUIUtil.LoadFeature=Load vector
+schmitzm.geotools.gui.GeotoolsGUIUtil.Save=Save
+schmitzm.geotools.gui.GeotoolsGUIUtil.SaveRaster=Save raster
+schmitzm.geotools.gui.GeotoolsGUIUtil.SaveFeature=Save vector
+schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH=North
+schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH=South
+schmitzm.geotools.gui.GeotoolsGUIUtil.WEST=West
+schmitzm.geotools.gui.GeotoolsGUIUtil.EAST=East
+schmitzm.geotools.gui.GeotoolsGUIUtil.North=Nord
+schmitzm.geotools.gui.GeotoolsGUIUtil.South=South
+schmitzm.geotools.gui.GeotoolsGUIUtil.West=West
+schmitzm.geotools.gui.GeotoolsGUIUtil.East=East
+schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH.Abb=N
+schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH.Abb=S
+schmitzm.geotools.gui.GeotoolsGUIUtil.WEST.Abb=W
+schmitzm.geotools.gui.GeotoolsGUIUtil.EAST.Abb=E
+schmitzm.geotools.gui.CRSSelectionDialog.init.crs.title=CRS database
+schmitzm.geotools.gui.CRSSelectionDialog.init.crs.mess=Initialize CRS database. Please wait...
+schmitzm.geotools.gui.CRSSelectionDialog.title=Choose a coordinate reference system (CRS)
+schmitzm.geotools.gui.CRSSelectionDialog.mandatory=CRS must be specified!
+schmitzm.geotools.gui.CRSSelectionDialog.button.wgs84=WGS-84 CRS
+schmitzm.geotools.gui.CRSSelectionDialog.button.default=Default CRS (${0})
+schmitzm.geotools.gui.CRSSelectionDialog.button.predefined=Predefined
+schmitzm.geotools.gui.CRSSelectionDialog.button.userDefined=User defined:
+schmitzm.geotools.gui.JMapEditorPane.Err.MissingMap=First a layer must be displayed (to define CRS and geo-position).
+schmitzm.geotools.gui.JMapEditorPane.Err.Line.LessPoints=For a line feature at least 2 points must be specified!
+schmitzm.geotools.gui.JMapEditorPane.Err.Polygon.LessPoints=For a polygon feature at least 3 points must be specified!
+schmitzm.geotools.gui.JMapEditorToolBar.button.layer.new=Create new layer
+schmitzm.geotools.gui.JMapEditorToolBar.button.layer.save=Finish layer
+schmitzm.geotools.gui.JMapEditorToolBar.button.layer.cancel=Abort layer
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.undo=Undo last editing operation
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.redo=Redo last undone editing operation
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.clear=Undo all editing operation
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.finish=Start new feature
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.dialog.title=Create new layer...
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title=Layer title
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title.default=New Layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type=Layer type
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.point=Point layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.line=Line layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.polygon=Polygon layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.ftype.title=Non-Geometric attributes
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.GeomAttr=Attribute name '${0}' reserverd for default geometry.
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.AutoVal=Auto value not supported for attribut type '${0}'.
+schmitzm.geotools.gui.JMapEditorToolBar.NewFeature.title=New feature attributes
+schmitzm.geotools.gui.StyleToolBar.FillColor=Fill
+schmitzm.geotools.gui.StyleToolBar.BorderColor=Border
+schmitzm.geotools.gui.StyleToolBar.BorderWidth=Border width
+schmitzm.geotools.gui.StyleToolBar.PointMark=Point style
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrName=Name
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrType=Type
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.Nillable=Nillable
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AutoValue=Auto
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.DefValue=Default
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.NewAttr=ATTR_${0}
+
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.clearSelection.tt=Clear selection
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.selectionToTop.tt=Move selected to the top of the table
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.invertSelection.tt=Invert selection
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.zoomToSelection.tt=Zoom to selected features
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus=${0} of ${1} ${2} selected.
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.polygons=polygons
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.points=points
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.lines=lines
+
+schmitzm.geotools.gui.GridPanelFormatter_DHDN.title=1,234,567 (H|R)
+schmitzm.geotools.gui.GridPanelFormatter_LatLon1.title=deegree\u00B0 minute' (N|E|S|W)
+schmitzm.geotools.gui.GridPanelFormatter.ToolTipTemplate=${0} in unit ${1}
+
+schmitzm.geotools.gui.GeoPositionLabel.LABEL_PREFIX=Mouse coordinate\:
+
+MapPaneButtons.Pan.TT=Move the visible map extend
+MapPaneButtons.Info.TT=Get information about objects
+MapPaneButtons.ZoomIn.TT=Zoom nearer to the map
+MapPaneButtons.ZoomOut.TT=Zoom away from the map
+MapPaneButtons.LastZoom.TT=Go to last map extend
+MapPaneButtons.NextZoom.TT=Go to next map extend
+
+MapPaneButtons.Selection.SetSelection.TT=Select objects to be selected
+MapPaneButtons.Selection.AddSelection.TT=Add objects to current selection
+MapPaneButtons.Selection.RemoveSelection.TT=Remove objects from current selection
+MapPaneButtons.Selection.ClearSelection.TT=Clear all selections
+
+SearchMapDialog.Results.Column.Layer=found in
+SearchMapDialog.Results.Column.Name=name
+SearchMapDialog.resultsTable.tt=Click on a result to show it.
+SearchMapDialog.searchString.Label=Enter search string:
+SearchMapDialog.searchString.tt=Enter text and press [Enter or Return].
+SearchMapDialog.title=Search labels in map\: ${0}
+SearchMapDialog.Explanation=<html>Here you can search all of the map's <b>labels</b>.</html>
Modified: trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties
===================================================================
--- trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,184 +1,184 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# ----------------------------------------------------
-# ------ German Translations for GUI components ------
-# ------ in Package schmitz.geotools.gui ------
-# ----------------------------------------------------
-
-Attribute=Attribut
-Attributes=Attribute
-
-org.geotools.styling.StyleBuilder.MARK_ARROW=Pfeil
-org.geotools.styling.StyleBuilder.MARK_CIRCLE=Kreis
-org.geotools.styling.StyleBuilder.MARK_CROSS=Kreuz
-org.geotools.styling.StyleBuilder.MARK_SQUARE=Quadrat
-org.geotools.styling.StyleBuilder.MARK_STAR=Stern
-org.geotools.styling.StyleBuilder.MARK_TRIANGLE=Dreieck
-org.geotools.styling.StyleBuilder.MARK_X=X
-
-org.geotools.styling.ColorMap.TYPE_RAMP=Farb-Interpolation
-org.geotools.styling.ColorMap.TYPE_VALUES=Farb-Klassifizierung
-org.geotools.styling.ColorMap.TYPE_INTERVALS=Farb-Intervalle
-
-schmitzm.geotools.feature.FeatureTableModel.AttrName=Attribut
-schmitzm.geotools.feature.FeatureTableModel.AttrType=Typ
-schmitzm.geotools.feature.FeatureTableModel.AttrValue=Wert
-
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestButton=Filter testen
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsButton=?
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsToolTip=Fehler-Details anzeigen...
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.ResultsBorderTitle=Ergebnis des Filters:
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.FilterDefinitionBorderTitle=Filter definieren:
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.PreviewMapPaneToolTip=Rote Objekte treffen auf den Filter zu, graue Objekte nicht.
-
-schmitzm.geotools.gui.FeatureTablePane.PreviewMapPaneToolTip=Rote Objekte sind selektiert, graue Objekte nicht.
-
-schmitzm.geotools.gui.FeatureLayerFilterDialog.TITLE = Feature-Filter
-
-schmitzm.geotools.gui.MapActionControlPane.INFO=Info
-schmitzm.geotools.gui.MapActionControlPane.ZOOM_IN=Heran zoomen
-schmitzm.geotools.gui.MapActionControlPane.ZOOM_OUT=Heraus zoomen
-schmitzm.geotools.gui.MapActionControlPane.SELECT_TOP=Ausw\u00E4hlen aus oberstem Layer
-schmitzm.geotools.gui.MapActionControlPane.SELECT_ALL=Ausw\u00E4hlen aus allen Layern
-schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_UP=Nach OBEN schieben
-schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_DOWN=Nach UNTEN schieben
-schmitzm.geotools.gui.MapContextControlPane.Menu.ZOOM_TO=Zu Layer zoomen
-schmitzm.geotools.gui.MapContextControlPane.Menu.FILTER=Layer filtern...
-schmitzm.geotools.gui.MapContextControlPane.Menu.RECOLOR=F\u00E4rbung \u00E4ndern
-schmitzm.geotools.gui.MapContextControlPane.Menu.REMOVE=Layer entfernen
-schmitzm.geotools.gui.MapContextControlPane.Menu.SHOWALL=Alle Layer anzeigen
-schmitzm.geotools.gui.MapContextControlPane.Menu.HIDEALL=Alle Layer verbergen
-schmitzm.geotools.gui.MapContextControlPane.Menu.INVERTALL=Alle Layer invertieren
-schmitzm.geotools.gui.MapContextControlPane.Menu.CUSTOMIZE=Anpassen...
-schmitzm.geotools.gui.MapContextControlPane.ColorMapDialog.TITLE=Farbpalette
-schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.TITLE=Farbpalette speichern
-schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.QUESTION=Name f\u00FCr neue Farbpalette...
-schmitzm.geotools.gui.ColorMapTable.Header.QUANTITY=Raster-Wert
-schmitzm.geotools.gui.ColorMapTable.Header.COLOR=Farbe
-schmitzm.geotools.gui.ColorMapTable.Header.LABEL=Label
-schmitzm.geotools.gui.ColorMapTable.Header.OPACITY=Transparent
-schmitzm.geotools.gui.RasterPositionLabel.LABEL_PREFIX=Raster-Wert
-schmitzm.geotools.gui.GeotoolsGUIUtil.Load=Laden
-schmitzm.geotools.gui.GeotoolsGUIUtil.LoadRaster=Raster laden
-schmitzm.geotools.gui.GeotoolsGUIUtil.LoadFeature=Shape laden
-schmitzm.geotools.gui.GeotoolsGUIUtil.Save=Speichern
-schmitzm.geotools.gui.GeotoolsGUIUtil.SaveRaster=Raster speichern
-schmitzm.geotools.gui.GeotoolsGUIUtil.SaveFeature=Shape speichern
-schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH=Nord
-schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH=S\u00FCd
-schmitzm.geotools.gui.GeotoolsGUIUtil.WEST=West
-schmitzm.geotools.gui.GeotoolsGUIUtil.EAST=Ost
-schmitzm.geotools.gui.GeotoolsGUIUtil.North=Norden
-schmitzm.geotools.gui.GeotoolsGUIUtil.South=S\u00FCden
-schmitzm.geotools.gui.GeotoolsGUIUtil.West=Westen
-schmitzm.geotools.gui.GeotoolsGUIUtil.East=Osten
-schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH.Abb=N
-schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH.Abb=S
-schmitzm.geotools.gui.GeotoolsGUIUtil.WEST.Abb=W
-schmitzm.geotools.gui.GeotoolsGUIUtil.EAST.Abb=O
-schmitzm.geotools.gui.CRSSelectionDialog.init.crs.title=CRS datenbank
-schmitzm.geotools.gui.CRSSelectionDialog.init.crs.mess=CRS-Datenbank wird initialisiert. Bitte warten...
-schmitzm.geotools.gui.CRSSelectionDialog.title=Koordinaten-System (CRS) ausw\u00E4hlen
-schmitzm.geotools.gui.CRSSelectionDialog.mandatory=CRS must be specified!
-schmitzm.geotools.gui.CRSSelectionDialog.button.wgs84=WGS-84 CRS
-schmitzm.geotools.gui.CRSSelectionDialog.button.default=Standard CRS (${0})
-schmitzm.geotools.gui.CRSSelectionDialog.button.predefined=Vordefiniert
-schmitzm.geotools.gui.CRSSelectionDialog.button.userDefined=Benutzerdefiniert:
-schmitzm.geotools.gui.JMapEditorPane.Err.MissingMap=Bevor ein neues Layer erstellt werden kann, muss ein Layer angezeigt werden (um CRS und geogr. Lage zu definieren).
-schmitzm.geotools.gui.JMapEditorPane.Err.Line.LessPoints=F\u00FCr ein Line-Feature m\u00FCssen mind. 2 Punkte definiert werden\!
-schmitzm.geotools.gui.JMapEditorPane.Err.Polygon.LessPoints=F\u00FCr ein Polygon-Feature m\u00FCssen mind. 3 Punkte definiert werden\!
-schmitzm.geotools.gui.JMapEditorToolBar.button.layer.new=Neues Layer erstellen
-schmitzm.geotools.gui.JMapEditorToolBar.button.layer.save=Layer abschliessen
-schmitzm.geotools.gui.JMapEditorToolBar.button.layer.cancel=Layer abbrechen
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.undo=Letzte Operation zur\u00FCcknehmen
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.redo=Letzte zur\u00FCckgenommene Operation wiederholen
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.clear=Layer leeren
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.finish=Neues Feature starten
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.dialog.title=Neues Layer erzeugen
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title=Layer-Bezeichnung
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title.default=Neues Layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type=Layer-Art
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.point=Punkt-Layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.line=Linien-Layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.polygon=Polygon-Layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.ftype.title=Weitere Attribute
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.GeomAttr=Attribut-Name '${0}' reserviert f\u00FCr das Default-Geometrie-Attribut.
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.AutoVal=Auto-Wert f\u00FCr Attribut-Typ '${0}' nicht m\u00F6glich.
-schmitzm.geotools.gui.JMapEditorToolBar.NewFeature.title=Neues Feature
-schmitzm.geotools.gui.StyleToolBar.FillColor=F\u00FCllfarbe
-schmitzm.geotools.gui.StyleToolBar.BorderColor=Randfarbe
-schmitzm.geotools.gui.StyleToolBar.BorderWidth=Randbreite
-schmitzm.geotools.gui.StyleToolBar.PointMark=Punkt-Style
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrName=Name
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrType=Typ
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.Nillable=Nullable
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AutoValue=Auto-Wert
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.DefValue=Default
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.NewAttr=ATTR_${0}
-
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.clearSelection.tt=Auswahl aufheben
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.selectionToTop.tt=Ausgew\u00E4hlte Zeilen in der Tabelle nach oben verschieben
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.invertSelection.tt=Auswahl umkehren
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.zoomToSelection.tt=Zoomt zu den ausgew\u00E4hlten Geoobjekten
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus=${0} von ${1} ${2} selektiert.
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.polygons=Polygonen
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.points=Punkten
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.lines=Linien
-
-
-schmitzm.geotools.gui.GridPanelFormatter_DHDN.title=DHDN - 1,234,567 (H|R)
-schmitzm.geotools.gui.GridPanelFormatter_LatLon1.title=Grad\u00B0 Minute' (N|O|S|W)
-#nice to have: schmitzm.geotools.gui.GridPanelFormatter_LatLon2.title=Grad\u00b0 Minute' Sek.'' (N|O|S|W)
-#nice to have: schmitzm.geotools.gui.GridPanelFormatter_LatLon3.title=Grad\u00b0 Minute' Hundertstel (N|O|S|W)
-
-schmitzm.geotools.gui.GridPanelFormatter.ToolTipTemplate=${0} in Einheit ${1}
-
-schmitzm.geotools.gui.GeoPositionLabel.LABEL_PREFIX=Maus-Koordinate\:
-
-MapPaneButtons.Pan.TT=Karte verschieben
-MapPaneButtons.Info.TT=Informationen zu Objekten abfragen
-MapPaneButtons.ZoomIn.TT=Auf einen Auschnitt zoomen
-MapPaneButtons.ZoomOut.TT=Aus der Karte herauszoomen
-MapPaneButtons.LastZoom.TT=Letzten Kartenausschnitt wiederherstellen
-MapPaneButtons.NextZoom.TT=N\u00E4chsten Kartenausschnitt wiederherstellen
-
-MapPaneButtons.Selection.AddSelection.TT=F\u00FCgt Objekte zur Selektion hinzu
-MapPaneButtons.Selection.RemoveSelection.TT=Entfernt Objekte aus der Selektion
-MapPaneButtons.Selection.SetSelection.TT=Setzt die Selektion auf die ausgew\u00E4hlten Objekte
-MapPaneButtons.Selection.ClearSelection.TT=Hebt alle Selektionen auf
-
-SearchMapDialog.Results.Column.Layer=Gefunden in
-SearchMapDialog.Results.Column.Name=Name
-SearchMapDialog.resultsTable.tt=Klicken Sie auf ein Ergebnis um es anzuzeigen.
-SearchMapDialog.searchString.Label=Suchbegriff eingeben:
-SearchMapDialog.searchString.tt=Geben Sie den Suchbegriff ein und dr\u00FCcken Sie [Enter]
-SearchMapDialog.title=Durchsuche Karte: ${0}
-SearchMapDialog.Explanation=<html>Es werden alle <b>Beschriftungen</b> dieser Karte durchsucht.</html>
-
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# ----------------------------------------------------
+# ------ German Translations for GUI components ------
+# ------ in Package schmitz.geotools.gui ------
+# ----------------------------------------------------
+
+Attribute=Attribut
+Attributes=Attribute
+
+org.geotools.styling.StyleBuilder.MARK_ARROW=Pfeil
+org.geotools.styling.StyleBuilder.MARK_CIRCLE=Kreis
+org.geotools.styling.StyleBuilder.MARK_CROSS=Kreuz
+org.geotools.styling.StyleBuilder.MARK_SQUARE=Quadrat
+org.geotools.styling.StyleBuilder.MARK_STAR=Stern
+org.geotools.styling.StyleBuilder.MARK_TRIANGLE=Dreieck
+org.geotools.styling.StyleBuilder.MARK_X=X
+
+org.geotools.styling.ColorMap.TYPE_RAMP=Farb-Interpolation
+org.geotools.styling.ColorMap.TYPE_VALUES=Farb-Klassifizierung
+org.geotools.styling.ColorMap.TYPE_INTERVALS=Farb-Intervalle
+
+schmitzm.geotools.feature.FeatureTableModel.AttrName=Attribut
+schmitzm.geotools.feature.FeatureTableModel.AttrType=Typ
+schmitzm.geotools.feature.FeatureTableModel.AttrValue=Wert
+
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestButton=Filter testen
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsButton=?
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsToolTip=Fehler-Details anzeigen...
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.ResultsBorderTitle=Ergebnis des Filters:
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.FilterDefinitionBorderTitle=Filter definieren:
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.PreviewMapPaneToolTip=Rote Objekte treffen auf den Filter zu, graue Objekte nicht.
+
+schmitzm.geotools.gui.FeatureTablePane.PreviewMapPaneToolTip=Rote Objekte sind selektiert, graue Objekte nicht.
+
+schmitzm.geotools.gui.FeatureLayerFilterDialog.TITLE = Feature-Filter
+
+schmitzm.geotools.gui.MapActionControlPane.INFO=Info
+schmitzm.geotools.gui.MapActionControlPane.ZOOM_IN=Heran zoomen
+schmitzm.geotools.gui.MapActionControlPane.ZOOM_OUT=Heraus zoomen
+schmitzm.geotools.gui.MapActionControlPane.SELECT_TOP=Ausw\u00E4hlen aus oberstem Layer
+schmitzm.geotools.gui.MapActionControlPane.SELECT_ALL=Ausw\u00E4hlen aus allen Layern
+schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_UP=Nach OBEN schieben
+schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_DOWN=Nach UNTEN schieben
+schmitzm.geotools.gui.MapContextControlPane.Menu.ZOOM_TO=Zu Layer zoomen
+schmitzm.geotools.gui.MapContextControlPane.Menu.FILTER=Layer filtern...
+schmitzm.geotools.gui.MapContextControlPane.Menu.RECOLOR=F\u00E4rbung \u00E4ndern
+schmitzm.geotools.gui.MapContextControlPane.Menu.REMOVE=Layer entfernen
+schmitzm.geotools.gui.MapContextControlPane.Menu.SHOWALL=Alle Layer anzeigen
+schmitzm.geotools.gui.MapContextControlPane.Menu.HIDEALL=Alle Layer verbergen
+schmitzm.geotools.gui.MapContextControlPane.Menu.INVERTALL=Alle Layer invertieren
+schmitzm.geotools.gui.MapContextControlPane.Menu.CUSTOMIZE=Anpassen...
+schmitzm.geotools.gui.MapContextControlPane.ColorMapDialog.TITLE=Farbpalette
+schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.TITLE=Farbpalette speichern
+schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.QUESTION=Name f\u00FCr neue Farbpalette...
+schmitzm.geotools.gui.ColorMapTable.Header.QUANTITY=Raster-Wert
+schmitzm.geotools.gui.ColorMapTable.Header.COLOR=Farbe
+schmitzm.geotools.gui.ColorMapTable.Header.LABEL=Label
+schmitzm.geotools.gui.ColorMapTable.Header.OPACITY=Transparent
+schmitzm.geotools.gui.RasterPositionLabel.LABEL_PREFIX=Raster-Wert
+schmitzm.geotools.gui.GeotoolsGUIUtil.Load=Laden
+schmitzm.geotools.gui.GeotoolsGUIUtil.LoadRaster=Raster laden
+schmitzm.geotools.gui.GeotoolsGUIUtil.LoadFeature=Shape laden
+schmitzm.geotools.gui.GeotoolsGUIUtil.Save=Speichern
+schmitzm.geotools.gui.GeotoolsGUIUtil.SaveRaster=Raster speichern
+schmitzm.geotools.gui.GeotoolsGUIUtil.SaveFeature=Shape speichern
+schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH=Nord
+schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH=S\u00FCd
+schmitzm.geotools.gui.GeotoolsGUIUtil.WEST=West
+schmitzm.geotools.gui.GeotoolsGUIUtil.EAST=Ost
+schmitzm.geotools.gui.GeotoolsGUIUtil.North=Norden
+schmitzm.geotools.gui.GeotoolsGUIUtil.South=S\u00FCden
+schmitzm.geotools.gui.GeotoolsGUIUtil.West=Westen
+schmitzm.geotools.gui.GeotoolsGUIUtil.East=Osten
+schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH.Abb=N
+schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH.Abb=S
+schmitzm.geotools.gui.GeotoolsGUIUtil.WEST.Abb=W
+schmitzm.geotools.gui.GeotoolsGUIUtil.EAST.Abb=O
+schmitzm.geotools.gui.CRSSelectionDialog.init.crs.title=CRS datenbank
+schmitzm.geotools.gui.CRSSelectionDialog.init.crs.mess=CRS-Datenbank wird initialisiert. Bitte warten...
+schmitzm.geotools.gui.CRSSelectionDialog.title=Koordinaten-System (CRS) ausw\u00E4hlen
+schmitzm.geotools.gui.CRSSelectionDialog.mandatory=CRS must be specified!
+schmitzm.geotools.gui.CRSSelectionDialog.button.wgs84=WGS-84 CRS
+schmitzm.geotools.gui.CRSSelectionDialog.button.default=Standard CRS (${0})
+schmitzm.geotools.gui.CRSSelectionDialog.button.predefined=Vordefiniert
+schmitzm.geotools.gui.CRSSelectionDialog.button.userDefined=Benutzerdefiniert:
+schmitzm.geotools.gui.JMapEditorPane.Err.MissingMap=Bevor ein neues Layer erstellt werden kann, muss ein Layer angezeigt werden (um CRS und geogr. Lage zu definieren).
+schmitzm.geotools.gui.JMapEditorPane.Err.Line.LessPoints=F\u00FCr ein Line-Feature m\u00FCssen mind. 2 Punkte definiert werden\!
+schmitzm.geotools.gui.JMapEditorPane.Err.Polygon.LessPoints=F\u00FCr ein Polygon-Feature m\u00FCssen mind. 3 Punkte definiert werden\!
+schmitzm.geotools.gui.JMapEditorToolBar.button.layer.new=Neues Layer erstellen
+schmitzm.geotools.gui.JMapEditorToolBar.button.layer.save=Layer abschliessen
+schmitzm.geotools.gui.JMapEditorToolBar.button.layer.cancel=Layer abbrechen
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.undo=Letzte Operation zur\u00FCcknehmen
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.redo=Letzte zur\u00FCckgenommene Operation wiederholen
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.clear=Layer leeren
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.finish=Neues Feature starten
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.dialog.title=Neues Layer erzeugen
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title=Layer-Bezeichnung
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title.default=Neues Layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type=Layer-Art
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.point=Punkt-Layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.line=Linien-Layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.polygon=Polygon-Layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.ftype.title=Weitere Attribute
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.GeomAttr=Attribut-Name '${0}' reserviert f\u00FCr das Default-Geometrie-Attribut.
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.AutoVal=Auto-Wert f\u00FCr Attribut-Typ '${0}' nicht m\u00F6glich.
+schmitzm.geotools.gui.JMapEditorToolBar.NewFeature.title=Neues Feature
+schmitzm.geotools.gui.StyleToolBar.FillColor=F\u00FCllfarbe
+schmitzm.geotools.gui.StyleToolBar.BorderColor=Randfarbe
+schmitzm.geotools.gui.StyleToolBar.BorderWidth=Randbreite
+schmitzm.geotools.gui.StyleToolBar.PointMark=Punkt-Style
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrName=Name
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrType=Typ
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.Nillable=Nullable
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AutoValue=Auto-Wert
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.DefValue=Default
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.NewAttr=ATTR_${0}
+
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.clearSelection.tt=Auswahl aufheben
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.selectionToTop.tt=Ausgew\u00E4hlte Zeilen in der Tabelle nach oben verschieben
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.invertSelection.tt=Auswahl umkehren
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.zoomToSelection.tt=Zoomt zu den ausgew\u00E4hlten Geoobjekten
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus=${0} von ${1} ${2} selektiert.
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.polygons=Polygonen
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.points=Punkten
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.lines=Linien
+
+
+schmitzm.geotools.gui.GridPanelFormatter_DHDN.title=DHDN - 1,234,567 (H|R)
+schmitzm.geotools.gui.GridPanelFormatter_LatLon1.title=Grad\u00B0 Minute' (N|O|S|W)
+#nice to have: schmitzm.geotools.gui.GridPanelFormatter_LatLon2.title=Grad\u00b0 Minute' Sek.'' (N|O|S|W)
+#nice to have: schmitzm.geotools.gui.GridPanelFormatter_LatLon3.title=Grad\u00b0 Minute' Hundertstel (N|O|S|W)
+
+schmitzm.geotools.gui.GridPanelFormatter.ToolTipTemplate=${0} in Einheit ${1}
+
+schmitzm.geotools.gui.GeoPositionLabel.LABEL_PREFIX=Maus-Koordinate\:
+
+MapPaneButtons.Pan.TT=Karte verschieben
+MapPaneButtons.Info.TT=Informationen zu Objekten abfragen
+MapPaneButtons.ZoomIn.TT=Auf einen Auschnitt zoomen
+MapPaneButtons.ZoomOut.TT=Aus der Karte herauszoomen
+MapPaneButtons.LastZoom.TT=Letzten Kartenausschnitt wiederherstellen
+MapPaneButtons.NextZoom.TT=N\u00E4chsten Kartenausschnitt wiederherstellen
+
+MapPaneButtons.Selection.AddSelection.TT=F\u00FCgt Objekte zur Selektion hinzu
+MapPaneButtons.Selection.RemoveSelection.TT=Entfernt Objekte aus der Selektion
+MapPaneButtons.Selection.SetSelection.TT=Setzt die Selektion auf die ausgew\u00E4hlten Objekte
+MapPaneButtons.Selection.ClearSelection.TT=Hebt alle Selektionen auf
+
+SearchMapDialog.Results.Column.Layer=Gefunden in
+SearchMapDialog.Results.Column.Name=Name
+SearchMapDialog.resultsTable.tt=Klicken Sie auf ein Ergebnis um es anzuzeigen.
+SearchMapDialog.searchString.Label=Suchbegriff eingeben:
+SearchMapDialog.searchString.tt=Geben Sie den Suchbegriff ein und dr\u00FCcken Sie [Enter]
+SearchMapDialog.title=Durchsuche Karte: ${0}
+SearchMapDialog.Explanation=<html>Es werden alle <b>Beschriftungen</b> dieser Karte durchsucht.</html>
+
Modified: trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_it.properties
===================================================================
--- trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_it.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_it.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,165 +1,165 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Annica Sahlin
-##########
-# -----------------------------------------------------
-# ------ Italian Translations for GUI components ------
-# ------ in Package schmitz.geotools.gui ------
-# -----------------------------------------------------
-
-Attribute= Attributo
-Attributes= Attributi
-MapPaneButtons.Info.TT= Visualizza informazioni sull'oggetto
-MapPaneButtons.LastZoom.TT= Ritorna al zoom precedente
-MapPaneButtons.NextZoom.TT= Vai al zoom successivo
-MapPaneButtons.Pan.TT= Pan
-MapPaneButtons.Selection.AddSelection.TT= Aggiungi oggetti alla selezione corrente
-MapPaneButtons.Selection.ClearSelection.TT= Rimuovi tutte le selezioni
-MapPaneButtons.Selection.RemoveSelection.TT= Rimuovi oggetti dalla selezione corrente
-MapPaneButtons.Selection.SetSelection.TT= Scelgi oggetti da selezionare
-MapPaneButtons.ZoomIn.TT= Zoom in
-MapPaneButtons.ZoomOut.TT= Zoom out
-SearchMapDialog.Explanation= <html>Qui puoi ricercare un testo nella mappa.</html>
-SearchMapDialog.Results.Column.Layer=trovato in
-SearchMapDialog.Results.Column.Name= Nome
-SearchMapDialog.resultsTable.tt= Clicca su un risultato per visualizzarlo.
-SearchMapDialog.searchString.Label= Inserisci un testo di ricerca:
-SearchMapDialog.searchString.tt= Inserisci testo e premi invio[Enter or Return].
-SearchMapDialog.title= Ricerca testo nella mappa: ${0}
-org.geotools.styling.ColorMap.TYPE_INTERVALS= Classifica intervalli
-org.geotools.styling.ColorMap.TYPE_RAMP=Interpolazione di colore
-org.geotools.styling.ColorMap.TYPE_VALUES= Classifica valori
-org.geotools.styling.StyleBuilder.MARK_ARROW= Freccia
-org.geotools.styling.StyleBuilder.MARK_CIRCLE= Cerchio
-org.geotools.styling.StyleBuilder.MARK_CROSS= Croce
-org.geotools.styling.StyleBuilder.MARK_SQUARE= Quadrato
-org.geotools.styling.StyleBuilder.MARK_STAR= Stella
-org.geotools.styling.StyleBuilder.MARK_TRIANGLE= Triangolo
-org.geotools.styling.StyleBuilder.MARK_X=X
-schmitzm.geotools.feature.FeatureTableModel.AttrName= Attributo
-schmitzm.geotools.feature.FeatureTableModel.AttrType= Tipo
-schmitzm.geotools.feature.FeatureTableModel.AttrValue= Valore
-schmitzm.geotools.gui.CRSSelectionDialog.button.default= CRS di default(${0})
-schmitzm.geotools.gui.CRSSelectionDialog.button.predefined= Predefinito
-schmitzm.geotools.gui.CRSSelectionDialog.button.userDefined= Utente definito:
-schmitzm.geotools.gui.CRSSelectionDialog.button.wgs84= WGS-84 CRS
-schmitzm.geotools.gui.CRSSelectionDialog.init.crs.mess= Initialize CRS database. Attendere prego...
-schmitzm.geotools.gui.CRSSelectionDialog.init.crs.title= CRS database
-schmitzm.geotools.gui.CRSSelectionDialog.mandatory= CRS deve essere specificato!
-schmitzm.geotools.gui.CRSSelectionDialog.title= Seleziona un sistema di riferimento coordinate (CRS)
-schmitzm.geotools.gui.ColorMapTable.Header.COLOR= Colore
-schmitzm.geotools.gui.ColorMapTable.Header.LABEL= Etichetta
-schmitzm.geotools.gui.ColorMapTable.Header.OPACITY= Trasparenza
-schmitzm.geotools.gui.ColorMapTable.Header.QUANTITY= Quantit\u00e0\u00a0
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.FilterDefinitionBorderTitle= Definisci filtro:
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.PreviewMapPaneToolTip= Oggetti rossi sono compresi nel filtro,\noggetti grigi no.
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.ResultsBorderTitle= Risultato filtro:
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestButton= Prova filtro
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsButton=
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsToolTip= Visualizza dettagli di errore...
-schmitzm.geotools.gui.FeatureLayerFilterDialog.TITLE= Filtro di oggetti
-schmitzm.geotools.gui.FeatureTablePane.PreviewMapPaneToolTip= Oggetti rossi sono selezionati,\noggetti grigi no.
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrName= Nome
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrType= Tipo
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AutoValue= Auto
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.DefValue= Default
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.NewAttr= ATTR_${0}
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.Nillable= Nillable
-schmitzm.geotools.gui.GeoPositionLabel.LABEL_PREFIX= Coordinate del mouse:
-schmitzm.geotools.gui.GeotoolsGUIUtil.EAST= EST
-schmitzm.geotools.gui.GeotoolsGUIUtil.EAST.Abb= E
-schmitzm.geotools.gui.GeotoolsGUIUtil.East= EST
-schmitzm.geotools.gui.GeotoolsGUIUtil.Load= Carica
-schmitzm.geotools.gui.GeotoolsGUIUtil.LoadFeature= Carica vector
-schmitzm.geotools.gui.GeotoolsGUIUtil.LoadRaster= Carica raster
-schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH= NORD
-schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH.Abb=N
-schmitzm.geotools.gui.GeotoolsGUIUtil.North= NORD
-schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH= SUD
-schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH.Abb= S
-schmitzm.geotools.gui.GeotoolsGUIUtil.Save= Salva
-schmitzm.geotools.gui.GeotoolsGUIUtil.SaveFeature= Salva vettoriale
-schmitzm.geotools.gui.GeotoolsGUIUtil.SaveRaster= Salva raster
-schmitzm.geotools.gui.GeotoolsGUIUtil.South= SUD
-schmitzm.geotools.gui.GeotoolsGUIUtil.WEST= OVEST
-schmitzm.geotools.gui.GeotoolsGUIUtil.WEST.Abb= W
-schmitzm.geotools.gui.GeotoolsGUIUtil.West= OVEST
-schmitzm.geotools.gui.GridPanelFormatter.ToolTipTemplate= ${0} in unit\u00e0\u00a0 ${1}
-schmitzm.geotools.gui.GridPanelFormatter_DHDN.title= 1,234,567 (H|R)
-schmitzm.geotools.gui.GridPanelFormatter_LatLon1.title= gradi\u00b0 minuti' (N|E|S|W)
-schmitzm.geotools.gui.JMapEditorPane.Err.Line.LessPoints= Una geometria lineare richiede almeno 2 punti specificati!
-schmitzm.geotools.gui.JMapEditorPane.Err.MissingMap= Per definire il CRS e la posizione geografica devi prima visualizzare un layer.
-schmitzm.geotools.gui.JMapEditorPane.Err.Polygon.LessPoints= Una geometria areale richiede almeno 3 punti specificati!
-schmitzm.geotools.gui.JMapEditorToolBar.NewFeature.title= Nuovi attributi
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.AutoVal= Valore automatico non supportato per il tipo di attributo '${0}'.
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.GeomAttr= Nome di attributo '${0}' \u00e8 riservato per geometria di default.
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.dialog.title= Crea nuovo layer...
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.ftype.title= Attributi non geometrici
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title= Titolo layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title.default= Nuovo layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type= Tipo di layer
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.line= Layer lineare
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.point= Layer puntuale
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.polygon= Layer areale
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.clear= Elimina tutte le operazioni di editing
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.finish= Inizia nuova geometria
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.redo= Ripristina ultima operazione di editing
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.undo= Elimina ultima operazione di editing
-schmitzm.geotools.gui.JMapEditorToolBar.button.layer.cancel= Elimina layer
-schmitzm.geotools.gui.JMapEditorToolBar.button.layer.new= Crea nuovo layer
-schmitzm.geotools.gui.JMapEditorToolBar.button.layer.save= Finisci layer
-schmitzm.geotools.gui.MapActionControlPane.INFO= Info
-schmitzm.geotools.gui.MapActionControlPane.SELECT_ALL= Seleziona da tutti i layers
-schmitzm.geotools.gui.MapActionControlPane.SELECT_TOP= Seleziona dal layer in alto
-schmitzm.geotools.gui.MapActionControlPane.ZOOM_IN= Zoom in
-schmitzm.geotools.gui.MapActionControlPane.ZOOM_OUT= Zoom out
-schmitzm.geotools.gui.MapContextControlPane.ColorMapDialog.TITLE= Mappa di colore
-schmitzm.geotools.gui.MapContextControlPane.Menu.CUSTOMIZE= Customize...
-schmitzm.geotools.gui.MapContextControlPane.Menu.FILTER= Filtra layer...
-schmitzm.geotools.gui.MapContextControlPane.Menu.HIDEALL=Nascondi tutti i layers
-schmitzm.geotools.gui.MapContextControlPane.Menu.INVERTALL= Inverti tutti i layers
-schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_DOWN= Sposta layer in basso
-schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_UP=Sposta layer in alto
-schmitzm.geotools.gui.MapContextControlPane.Menu.RECOLOR= Ricolora layer
-schmitzm.geotools.gui.MapContextControlPane.Menu.REMOVE= Rimuovi layer
-schmitzm.geotools.gui.MapContextControlPane.Menu.SHOWALL= Visualizza tutti i layers
-schmitzm.geotools.gui.MapContextControlPane.Menu.ZOOM_TO= Zoom all'estensione del layer
-schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.QUESTION= Inserisci un nome per una nuova mappa di colore...
-schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.TITLE= Nuova mappa di colore
-schmitzm.geotools.gui.RasterPositionLabel.LABEL_PREFIX=Valore Raster
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.clearSelection.tt= Elimina selezione
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.invertSelection.tt= Inverti selezione
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.selectionToTop.tt= Sposta selezionati in cima della tabella
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.zoomToSelection.tt= Zoom all'estensione degli oggetti selezionati
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus= ${0} di ${1} ${2} selezionati.
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.lines= linee
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.points= punti
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.polygons= poligoni
-schmitzm.geotools.gui.StyleToolBar.BorderColor= Bordo
-schmitzm.geotools.gui.StyleToolBar.BorderWidth= Larghezza bordo
-schmitzm.geotools.gui.StyleToolBar.FillColor= Riempimento
-schmitzm.geotools.gui.StyleToolBar.PointMark= Stile punto
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Annica Sahlin
+##########
+# -----------------------------------------------------
+# ------ Italian Translations for GUI components ------
+# ------ in Package schmitz.geotools.gui ------
+# -----------------------------------------------------
+
+Attribute= Attributo
+Attributes= Attributi
+MapPaneButtons.Info.TT= Visualizza informazioni sull'oggetto
+MapPaneButtons.LastZoom.TT= Ritorna al zoom precedente
+MapPaneButtons.NextZoom.TT= Vai al zoom successivo
+MapPaneButtons.Pan.TT= Pan
+MapPaneButtons.Selection.AddSelection.TT= Aggiungi oggetti alla selezione corrente
+MapPaneButtons.Selection.ClearSelection.TT= Rimuovi tutte le selezioni
+MapPaneButtons.Selection.RemoveSelection.TT= Rimuovi oggetti dalla selezione corrente
+MapPaneButtons.Selection.SetSelection.TT= Scelgi oggetti da selezionare
+MapPaneButtons.ZoomIn.TT= Zoom in
+MapPaneButtons.ZoomOut.TT= Zoom out
+SearchMapDialog.Explanation= <html>Qui puoi ricercare un testo nella mappa.</html>
+SearchMapDialog.Results.Column.Layer=trovato in
+SearchMapDialog.Results.Column.Name= Nome
+SearchMapDialog.resultsTable.tt= Clicca su un risultato per visualizzarlo.
+SearchMapDialog.searchString.Label= Inserisci un testo di ricerca:
+SearchMapDialog.searchString.tt= Inserisci testo e premi invio[Enter or Return].
+SearchMapDialog.title= Ricerca testo nella mappa: ${0}
+org.geotools.styling.ColorMap.TYPE_INTERVALS= Classifica intervalli
+org.geotools.styling.ColorMap.TYPE_RAMP=Interpolazione di colore
+org.geotools.styling.ColorMap.TYPE_VALUES= Classifica valori
+org.geotools.styling.StyleBuilder.MARK_ARROW= Freccia
+org.geotools.styling.StyleBuilder.MARK_CIRCLE= Cerchio
+org.geotools.styling.StyleBuilder.MARK_CROSS= Croce
+org.geotools.styling.StyleBuilder.MARK_SQUARE= Quadrato
+org.geotools.styling.StyleBuilder.MARK_STAR= Stella
+org.geotools.styling.StyleBuilder.MARK_TRIANGLE= Triangolo
+org.geotools.styling.StyleBuilder.MARK_X=X
+schmitzm.geotools.feature.FeatureTableModel.AttrName= Attributo
+schmitzm.geotools.feature.FeatureTableModel.AttrType= Tipo
+schmitzm.geotools.feature.FeatureTableModel.AttrValue= Valore
+schmitzm.geotools.gui.CRSSelectionDialog.button.default= CRS di default(${0})
+schmitzm.geotools.gui.CRSSelectionDialog.button.predefined= Predefinito
+schmitzm.geotools.gui.CRSSelectionDialog.button.userDefined= Utente definito:
+schmitzm.geotools.gui.CRSSelectionDialog.button.wgs84= WGS-84 CRS
+schmitzm.geotools.gui.CRSSelectionDialog.init.crs.mess= Initialize CRS database. Attendere prego...
+schmitzm.geotools.gui.CRSSelectionDialog.init.crs.title= CRS database
+schmitzm.geotools.gui.CRSSelectionDialog.mandatory= CRS deve essere specificato!
+schmitzm.geotools.gui.CRSSelectionDialog.title= Seleziona un sistema di riferimento coordinate (CRS)
+schmitzm.geotools.gui.ColorMapTable.Header.COLOR= Colore
+schmitzm.geotools.gui.ColorMapTable.Header.LABEL= Etichetta
+schmitzm.geotools.gui.ColorMapTable.Header.OPACITY= Trasparenza
+schmitzm.geotools.gui.ColorMapTable.Header.QUANTITY= Quantit\u00e0\u00a0
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.FilterDefinitionBorderTitle= Definisci filtro:
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.PreviewMapPaneToolTip= Oggetti rossi sono compresi nel filtro,\noggetti grigi no.
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.ResultsBorderTitle= Risultato filtro:
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestButton= Prova filtro
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsButton=
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsToolTip= Visualizza dettagli di errore...
+schmitzm.geotools.gui.FeatureLayerFilterDialog.TITLE= Filtro di oggetti
+schmitzm.geotools.gui.FeatureTablePane.PreviewMapPaneToolTip= Oggetti rossi sono selezionati,\noggetti grigi no.
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrName= Nome
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrType= Tipo
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AutoValue= Auto
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.DefValue= Default
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.NewAttr= ATTR_${0}
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.Nillable= Nillable
+schmitzm.geotools.gui.GeoPositionLabel.LABEL_PREFIX= Coordinate del mouse:
+schmitzm.geotools.gui.GeotoolsGUIUtil.EAST= EST
+schmitzm.geotools.gui.GeotoolsGUIUtil.EAST.Abb= E
+schmitzm.geotools.gui.GeotoolsGUIUtil.East= EST
+schmitzm.geotools.gui.GeotoolsGUIUtil.Load= Carica
+schmitzm.geotools.gui.GeotoolsGUIUtil.LoadFeature= Carica vector
+schmitzm.geotools.gui.GeotoolsGUIUtil.LoadRaster= Carica raster
+schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH= NORD
+schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH.Abb=N
+schmitzm.geotools.gui.GeotoolsGUIUtil.North= NORD
+schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH= SUD
+schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH.Abb= S
+schmitzm.geotools.gui.GeotoolsGUIUtil.Save= Salva
+schmitzm.geotools.gui.GeotoolsGUIUtil.SaveFeature= Salva vettoriale
+schmitzm.geotools.gui.GeotoolsGUIUtil.SaveRaster= Salva raster
+schmitzm.geotools.gui.GeotoolsGUIUtil.South= SUD
+schmitzm.geotools.gui.GeotoolsGUIUtil.WEST= OVEST
+schmitzm.geotools.gui.GeotoolsGUIUtil.WEST.Abb= W
+schmitzm.geotools.gui.GeotoolsGUIUtil.West= OVEST
+schmitzm.geotools.gui.GridPanelFormatter.ToolTipTemplate= ${0} in unit\u00e0\u00a0 ${1}
+schmitzm.geotools.gui.GridPanelFormatter_DHDN.title= 1,234,567 (H|R)
+schmitzm.geotools.gui.GridPanelFormatter_LatLon1.title= gradi\u00b0 minuti' (N|E|S|W)
+schmitzm.geotools.gui.JMapEditorPane.Err.Line.LessPoints= Una geometria lineare richiede almeno 2 punti specificati!
+schmitzm.geotools.gui.JMapEditorPane.Err.MissingMap= Per definire il CRS e la posizione geografica devi prima visualizzare un layer.
+schmitzm.geotools.gui.JMapEditorPane.Err.Polygon.LessPoints= Una geometria areale richiede almeno 3 punti specificati!
+schmitzm.geotools.gui.JMapEditorToolBar.NewFeature.title= Nuovi attributi
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.AutoVal= Valore automatico non supportato per il tipo di attributo '${0}'.
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.GeomAttr= Nome di attributo '${0}' \u00e8 riservato per geometria di default.
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.dialog.title= Crea nuovo layer...
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.ftype.title= Attributi non geometrici
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title= Titolo layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title.default= Nuovo layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type= Tipo di layer
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.line= Layer lineare
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.point= Layer puntuale
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.polygon= Layer areale
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.clear= Elimina tutte le operazioni di editing
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.finish= Inizia nuova geometria
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.redo= Ripristina ultima operazione di editing
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.undo= Elimina ultima operazione di editing
+schmitzm.geotools.gui.JMapEditorToolBar.button.layer.cancel= Elimina layer
+schmitzm.geotools.gui.JMapEditorToolBar.button.layer.new= Crea nuovo layer
+schmitzm.geotools.gui.JMapEditorToolBar.button.layer.save= Finisci layer
+schmitzm.geotools.gui.MapActionControlPane.INFO= Info
+schmitzm.geotools.gui.MapActionControlPane.SELECT_ALL= Seleziona da tutti i layers
+schmitzm.geotools.gui.MapActionControlPane.SELECT_TOP= Seleziona dal layer in alto
+schmitzm.geotools.gui.MapActionControlPane.ZOOM_IN= Zoom in
+schmitzm.geotools.gui.MapActionControlPane.ZOOM_OUT= Zoom out
+schmitzm.geotools.gui.MapContextControlPane.ColorMapDialog.TITLE= Mappa di colore
+schmitzm.geotools.gui.MapContextControlPane.Menu.CUSTOMIZE= Customize...
+schmitzm.geotools.gui.MapContextControlPane.Menu.FILTER= Filtra layer...
+schmitzm.geotools.gui.MapContextControlPane.Menu.HIDEALL=Nascondi tutti i layers
+schmitzm.geotools.gui.MapContextControlPane.Menu.INVERTALL= Inverti tutti i layers
+schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_DOWN= Sposta layer in basso
+schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_UP=Sposta layer in alto
+schmitzm.geotools.gui.MapContextControlPane.Menu.RECOLOR= Ricolora layer
+schmitzm.geotools.gui.MapContextControlPane.Menu.REMOVE= Rimuovi layer
+schmitzm.geotools.gui.MapContextControlPane.Menu.SHOWALL= Visualizza tutti i layers
+schmitzm.geotools.gui.MapContextControlPane.Menu.ZOOM_TO= Zoom all'estensione del layer
+schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.QUESTION= Inserisci un nome per una nuova mappa di colore...
+schmitzm.geotools.gui.MapContextControlPane.SaveColorMapDialog.TITLE= Nuova mappa di colore
+schmitzm.geotools.gui.RasterPositionLabel.LABEL_PREFIX=Valore Raster
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.clearSelection.tt= Elimina selezione
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.invertSelection.tt= Inverti selezione
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.selectionToTop.tt= Sposta selezionati in cima della tabella
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.zoomToSelection.tt= Zoom all'estensione degli oggetti selezionati
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus= ${0} di ${1} ${2} selezionati.
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.lines= linee
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.points= punti
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.polygons= poligoni
+schmitzm.geotools.gui.StyleToolBar.BorderColor= Bordo
+schmitzm.geotools.gui.StyleToolBar.BorderWidth= Larghezza bordo
+schmitzm.geotools.gui.StyleToolBar.FillColor= Riempimento
+schmitzm.geotools.gui.StyleToolBar.PointMark= Stile punto
Modified: trunk/src/schmitzm/geotools/styling/StylingUtil.java
===================================================================
--- trunk/src/schmitzm/geotools/styling/StylingUtil.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/geotools/styling/StylingUtil.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -200,7 +200,7 @@
**/
public static final Pattern GDALINFO_COLORMAP_RGBA = Pattern
.compile("^.*(\\d+): (\\d+),(\\d+),(\\d+),(\\d+).*$");
-
+
static final Literal halfLit = FeatureUtil.FILTER_FACTORY2.literal(.5);
static final Literal size0 = FeatureUtil.FILTER_FACTORY2.literal(26);
static final Literal size1 = FeatureUtil.FILTER_FACTORY2.literal(9);
@@ -244,10 +244,11 @@
* features
**/
public static final String SELECTION_RULE_ID = "SelectionRule";
-//
-// /** transparent color */
-// public static final Color TRANSPARENT_COLOR = new Color(0, 0, 0, 0);
+ //
+ // /** transparent color */
+ // public static final Color TRANSPARENT_COLOR = new Color(0, 0, 0, 0);
+
/**
* Unless {@link ColorMap} is not sorted automatically, this method calls
* {@link #sortColorMap(ColorMap)} after inserting the color map entry.
@@ -347,7 +348,7 @@
if (colorMap == null)
return null;
ColorMapEntry[] entry = colorMap.getColorMapEntries();
-// ColorMap newColorMap = new ColorMapImpl();
+ // ColorMap newColorMap = new ColorMapImpl();
ColorMap newColorMap = STYLE_FACTORY.createColorMap();
newColorMap.setType(colorMap.getType());
for (int i = 0; i < entry.length; i++)
@@ -677,73 +678,93 @@
Symbolizer[] symbolizers = new Symbolizer[0];
- Graphic bg2;
switch (geometryForm) {
+ case POLYGON:
+ symbolizers = createBlinkFeatureTypeStylePolygon(symbolizers);
+ break;
+
+ case LINE:
+ symbolizers = createBlinkFeatureTypeStyleLine(symbolizers);
+ break;
+
case POINT:
+ symbolizers = createBlinkFeatureTypeStylePoint(symbolizers);
+ break;
- Literal size0 = FeatureUtil.FILTER_FACTORY2.literal(26);
- Literal size1 = FeatureUtil.FILTER_FACTORY2.literal(28);
+ case ANY:
+ symbolizers = createBlinkFeatureTypeStylePolygon(symbolizers);
+ symbolizers = createBlinkFeatureTypeStylePoint(symbolizers);
+ break;
- Graphic bg1 = STYLE_FACTORY.createGraphic(new ExternalGraphic[0],
- new Mark[] { STYLE_FACTORY.createMark(
- FeatureUtil.FILTER_FACTORY2.literal("circle"),
- STYLE_BUILDER.createStroke(Color.red, 2.), null,
- size1, halfLit) },
- new org.geotools.styling.Symbol[0],
- FeatureUtil.FILTER_FACTORY2.literal(1), size1, zeroLit);
+ case NONE:
+ default:
+ throw new IllegalArgumentException(
+ "Provide a suitable GeometryForm object, NONE not allowed");
+ }
- PointSymbolizer ps1 = STYLE_FACTORY.createPointSymbolizer();
- ps1.setGraphic(bg1);
- symbolizers = LangUtil.extendArray(symbolizers, ps1);
+ return STYLE_BUILDER.createFeatureTypeStyle(symbolizers, Double.NaN,
+ Double.NaN);
+ }
- bg2 = STYLE_FACTORY.createGraphic(new ExternalGraphic[0],
- new Mark[] { STYLE_FACTORY.createMark(
- FeatureUtil.FILTER_FACTORY2.literal("circle"),
- STYLE_BUILDER.createStroke(Color.black, 2.),
- STYLE_BUILDER.createFill(Color.WHITE, 0.3), size0,
- halfLit) }, new org.geotools.styling.Symbol[0],
- FeatureUtil.FILTER_FACTORY2.literal(1), size0, zeroLit);
+ private static Symbolizer[] createBlinkFeatureTypeStyleLine(
+ Symbolizer[] symbolizers) {
+ LineSymbolizer ls = STYLE_BUILDER.createLineSymbolizer(Color.red, 6.);
+ symbolizers = LangUtil.extendArray(symbolizers, ls);
- PointSymbolizer ps2 = STYLE_FACTORY.createPointSymbolizer();
- ps2.setGraphic(bg2);
+ LineSymbolizer ls2 = STYLE_BUILDER
+ .createLineSymbolizer(Color.black, 4.);
+ symbolizers = LangUtil.extendArray(symbolizers, ls2);
- symbolizers = LangUtil.extendArray(symbolizers, ps2);
- break;
- case POLYGON:
+ LineSymbolizer ls3 = STYLE_BUILDER
+ .createLineSymbolizer(Color.white, 2.);
+ symbolizers = LangUtil.extendArray(symbolizers, ls3);
+ return symbolizers;
+ }
- PolygonSymbolizer pol1 = STYLE_BUILDER.createPolygonSymbolizer(
- STYLE_BUILDER.createStroke(Color.red, 4), null);
- symbolizers = LangUtil.extendArray(symbolizers, pol1);
+ private static Symbolizer[] createBlinkFeatureTypeStylePolygon(
+ Symbolizer[] symbolizers) {
+ PolygonSymbolizer pol1 = STYLE_BUILDER.createPolygonSymbolizer(
+ STYLE_BUILDER.createStroke(Color.red, 4), null);
+ symbolizers = LangUtil.extendArray(symbolizers, pol1);
- PolygonSymbolizer pol2 = STYLE_BUILDER.createPolygonSymbolizer(
- STYLE_BUILDER.createStroke(Color.black, 2),
- STYLE_BUILDER.createFill(Color.WHITE, .5));
- symbolizers = LangUtil.extendArray(symbolizers, pol2);
+ PolygonSymbolizer pol2 = STYLE_BUILDER.createPolygonSymbolizer(
+ STYLE_BUILDER.createStroke(Color.black, 2),
+ STYLE_BUILDER.createFill(Color.WHITE, .5));
+ symbolizers = LangUtil.extendArray(symbolizers, pol2);
+ return symbolizers;
+ }
- break;
+ private static Symbolizer[] createBlinkFeatureTypeStylePoint(
+ Symbolizer[] symbolizers) {
+ Graphic bg2;
+ Literal size0 = FeatureUtil.FILTER_FACTORY2.literal(26);
+ Literal size1 = FeatureUtil.FILTER_FACTORY2.literal(28);
- case LINE:
+ Graphic bg1 = STYLE_FACTORY.createGraphic(new ExternalGraphic[0],
+ new Mark[] { STYLE_FACTORY.createMark(
+ FeatureUtil.FILTER_FACTORY2.literal("circle"),
+ STYLE_BUILDER.createStroke(Color.red, 2.), null, size1,
+ halfLit) }, new org.geotools.styling.Symbol[0],
+ FeatureUtil.FILTER_FACTORY2.literal(1), size1, zeroLit);
- LineSymbolizer ls = STYLE_BUILDER.createLineSymbolizer(Color.red,
- 6.);
- symbolizers = LangUtil.extendArray(symbolizers, ls);
+ PointSymbolizer ps1 = STYLE_FACTORY.createPointSymbolizer();
+ ps1.setGraphic(bg1);
+ symbolizers = LangUtil.extendArray(symbolizers, ps1);
- LineSymbolizer ls2 = STYLE_BUILDER.createLineSymbolizer(
- Color.black, 4.);
- symbolizers = LangUtil.extendArray(symbolizers, ls2);
+ bg2 = STYLE_FACTORY.createGraphic(new ExternalGraphic[0],
+ new Mark[] { STYLE_FACTORY.createMark(
+ FeatureUtil.FILTER_FACTORY2.literal("circle"),
+ STYLE_BUILDER.createStroke(Color.black, 2.),
+ STYLE_BUILDER.createFill(Color.WHITE, 0.3), size0,
+ halfLit) }, new org.geotools.styling.Symbol[0],
+ FeatureUtil.FILTER_FACTORY2.literal(1), size0, zeroLit);
- LineSymbolizer ls3 = STYLE_BUILDER.createLineSymbolizer(
- Color.white, 2.);
- symbolizers = LangUtil.extendArray(symbolizers, ls3);
- break;
+ PointSymbolizer ps2 = STYLE_FACTORY.createPointSymbolizer();
+ ps2.setGraphic(bg2);
- default:
- throw new IllegalArgumentException("Provide a suitable object.");
- }
-
- return STYLE_BUILDER.createFeatureTypeStyle(symbolizers, Double.NaN,
- Double.NaN);
+ symbolizers = LangUtil.extendArray(symbolizers, ps2);
+ return symbolizers;
}
/**
@@ -1114,96 +1135,119 @@
switch (geometryForm) {
case POINT:
- PointSymbolizer ps = STYLE_FACTORY.createPointSymbolizer();
- ps.setGraphic(SELECTION_GRAPHIC1);
- symbolizers = LangUtil.extendArray(symbolizers, ps);
+ symbolizers = addSelectionSymbolizersPoint(symbolizers);
+ break;
- PointSymbolizer ps2 = STYLE_FACTORY.createPointSymbolizer();
- ps2.setGraphic(SELECTION_GRAPHIC2);
- symbolizers = LangUtil.extendArray(symbolizers, ps2);
+ case POLYGON:
+ symbolizers = addSelectionSymbolizersPolygon(type, symbolizers,
+ size);
+ break;
- PointSymbolizer ps3 = STYLE_FACTORY.createPointSymbolizer();
- ps3.setGraphic(SELECTION_GRAPHIC3);
- symbolizers = LangUtil.extendArray(symbolizers, ps3);
+ case LINE:
+ symbolizers = addSelectionSymbolizersLine(symbolizers);
+ break;
+ case ANY:
+ symbolizers = addSelectionSymbolizersPolygon(type, symbolizers,
+ size);
+ symbolizers = addSelectionSymbolizersPoint(symbolizers);
+ // symbolizers = addSelectionSymbolizersLine(symbolizers);
break;
- case POLYGON:
- String markShapeName = "";
- if (type == SelectionStylesTypes.LeftTop2RightBottom_lines
- || type == SelectionStylesTypes.LeftTop2RightBottom_lines_smallgaps
- || type == SelectionStylesTypes.LeftTop2RightBottom_lines_biggaps) {
- markShapeName = "shape://backslash";
- } else if (type == SelectionStylesTypes.RightTop2LeftBottom_lines
- || type == SelectionStylesTypes.RightTop2LeftBottom_lines_smallgaps
- || type == SelectionStylesTypes.RightTop2LeftBottom_lines_biggaps) {
- markShapeName = "shape://slash";
- }
+ case NONE:
+ default:
+ throw new IllegalArgumentException("Provide a suitable object.");
+ }
+ return symbolizers;
+ }
- {
+ private static Symbolizer[] addSelectionSymbolizersLine(
+ Symbolizer[] symbolizers) {
+ LineSymbolizer ls = STYLE_BUILDER.createLineSymbolizer(Color.red, 3.);
+ symbolizers = LangUtil.extendArray(symbolizers, ls);
- Stroke outline = STYLE_BUILDER.createStroke(Color.red, 3);
+ LineSymbolizer ls2 = STYLE_BUILDER
+ .createLineSymbolizer(Color.white, 1.);
+ symbolizers = LangUtil.extendArray(symbolizers, ls2);
+ return symbolizers;
+ }
- Fill fill = null;
- if (type != SelectionStylesTypes.Outline_only) {
+ private static Symbolizer[] addSelectionSymbolizersPolygon(
+ SelectionStylesTypes type, Symbolizer[] symbolizers, double size) {
+ String markShapeName = "";
+ if (type == SelectionStylesTypes.LeftTop2RightBottom_lines
+ || type == SelectionStylesTypes.LeftTop2RightBottom_lines_smallgaps
+ || type == SelectionStylesTypes.LeftTop2RightBottom_lines_biggaps) {
+ markShapeName = "shape://backslash";
+ } else if (type == SelectionStylesTypes.RightTop2LeftBottom_lines
+ || type == SelectionStylesTypes.RightTop2LeftBottom_lines_smallgaps
+ || type == SelectionStylesTypes.RightTop2LeftBottom_lines_biggaps) {
+ markShapeName = "shape://slash";
+ }
- Mark fillMark = STYLE_BUILDER.createMark(markShapeName);
- fillMark.setStroke(STYLE_BUILDER
- .createStroke(Color.red, 3.));
+ {
- Graphic fillGraphic = STYLE_BUILDER.createGraphic(null,
- fillMark, null);
+ Stroke outline = STYLE_BUILDER.createStroke(Color.red, 3);
- fillGraphic.setSize(FILTER_FACTORY.literal(size));
+ Fill fill = null;
+ if (type != SelectionStylesTypes.Outline_only) {
- fill = STYLE_BUILDER.createFill();
- fill.setGraphicFill(fillGraphic);
- }
+ Mark fillMark = STYLE_BUILDER.createMark(markShapeName);
+ fillMark.setStroke(STYLE_BUILDER.createStroke(Color.red, 3.));
- PolygonSymbolizer polS0 = STYLE_BUILDER
- .createPolygonSymbolizer(outline, fill);
+ Graphic fillGraphic = STYLE_BUILDER.createGraphic(null,
+ fillMark, null);
- symbolizers = LangUtil.extendArray(symbolizers, polS0);
+ fillGraphic.setSize(FILTER_FACTORY.literal(size));
+
+ fill = STYLE_BUILDER.createFill();
+ fill.setGraphicFill(fillGraphic);
}
- { // White
- Stroke outline = STYLE_BUILDER.createStroke(
- Color.yellow.brighter(), 1);
+ PolygonSymbolizer polS0 = STYLE_BUILDER.createPolygonSymbolizer(
+ outline, fill);
- Fill fill = null;
+ symbolizers = LangUtil.extendArray(symbolizers, polS0);
+ }
- if (type != SelectionStylesTypes.Outline_only) {
- Mark fillMark = STYLE_BUILDER.createMark(markShapeName);
- fillMark.setStroke(STYLE_BUILDER.createStroke(
- Color.yellow.brighter(), 1.));
- Graphic fillGraphic = STYLE_BUILDER.createGraphic(null,
- fillMark, null);
- fillGraphic.setSize(FILTER_FACTORY.literal(size));
- fill = STYLE_BUILDER.createFill();
- fill.setGraphicFill(fillGraphic);
- }
+ { // White
+ Stroke outline = STYLE_BUILDER.createStroke(
+ Color.yellow.brighter(), 1);
- PolygonSymbolizer polS0 = STYLE_BUILDER
- .createPolygonSymbolizer(outline, fill);
- // polS0.setGeometry(offsetFunction);
- symbolizers = LangUtil.extendArray(symbolizers, polS0);
+ Fill fill = null;
+
+ if (type != SelectionStylesTypes.Outline_only) {
+ Mark fillMark = STYLE_BUILDER.createMark(markShapeName);
+ fillMark.setStroke(STYLE_BUILDER.createStroke(
+ Color.yellow.brighter(), 1.));
+ Graphic fillGraphic = STYLE_BUILDER.createGraphic(null,
+ fillMark, null);
+ fillGraphic.setSize(FILTER_FACTORY.literal(size));
+ fill = STYLE_BUILDER.createFill();
+ fill.setGraphicFill(fillGraphic);
}
- break;
+ PolygonSymbolizer polS0 = STYLE_BUILDER.createPolygonSymbolizer(
+ outline, fill);
+ // polS0.setGeometry(offsetFunction);
+ symbolizers = LangUtil.extendArray(symbolizers, polS0);
+ }
+ return symbolizers;
+ }
- case LINE:
- LineSymbolizer ls = STYLE_BUILDER.createLineSymbolizer(Color.red,
- 3.);
- symbolizers = LangUtil.extendArray(symbolizers, ls);
+ private static Symbolizer[] addSelectionSymbolizersPoint(
+ Symbolizer[] symbolizers) {
+ PointSymbolizer ps = STYLE_FACTORY.createPointSymbolizer();
+ ps.setGraphic(SELECTION_GRAPHIC1);
+ symbolizers = LangUtil.extendArray(symbolizers, ps);
- LineSymbolizer ls2 = STYLE_BUILDER.createLineSymbolizer(
- Color.white, 1.);
- symbolizers = LangUtil.extendArray(symbolizers, ls2);
- break;
+ PointSymbolizer ps2 = STYLE_FACTORY.createPointSymbolizer();
+ ps2.setGraphic(SELECTION_GRAPHIC2);
+ symbolizers = LangUtil.extendArray(symbolizers, ps2);
- default:
- throw new IllegalArgumentException("Provide a suitable object.");
- }
+ PointSymbolizer ps3 = STYLE_FACTORY.createPointSymbolizer();
+ ps3.setGraphic(SELECTION_GRAPHIC3);
+ symbolizers = LangUtil.extendArray(symbolizers, ps3);
return symbolizers;
}
@@ -1344,22 +1388,13 @@
// return selectionStyles.get(geometryForm);
Style style = STYLE_FACTORY.createStyle();
- style.addFeatureTypeStyle(STYLE_FACTORY.createFeatureTypeStyle());
+ style.featureTypeStyles().add(STYLE_FACTORY.createFeatureTypeStyle());
Symbolizer[] symbolizers = new Symbolizer[0];
switch (geometryForm) {
case POINT:
- PointSymbolizer ps = STYLE_BUILDER
- .createPointSymbolizer(STYLE_BUILDER.createGraphic(null,
- STYLE_BUILDER.createMark("circle"), null));
- ps.getGraphic().getMarks()[0].setFill(STYLE_BUILDER.createFill(
- color, 0.5));
- ps.getGraphic().getMarks()[0].setSize(STYLE_BUILDER
- .literalExpression(8.));
- ps.getGraphic().setSize(STYLE_BUILDER.literalExpression(8.));
- ps.getGraphic().getMarks()[0].setStroke(STYLE_BUILDER
- .createStroke(color2));
+ PointSymbolizer ps = createPointSymbolizer(color, color2);
symbolizers = LangUtil.extendArray(symbolizers, ps);
break;
@@ -1375,6 +1410,22 @@
symbolizers = LangUtil.extendArray(symbolizers, ls);
break;
+ case ANY:
+ // In case of ANY, create a Style with polygon and point
+ // symbolizers.
+
+ // ls = STYLE_BUILDER.createLineSymbolizer(STYLE_BUILDER
+ // .createStroke(color));
+ polS = STYLE_BUILDER.createPolygonSymbolizer(
+ STYLE_BUILDER.createStroke(color2),
+ STYLE_BUILDER.createFill(color));
+ ps = createPointSymbolizer(color, color2);
+
+ symbolizers = LangUtil.extendArray(symbolizers, polS);
+ // symbolizers = LangUtil.extendArray(symbolizers, ls);
+ symbolizers = LangUtil.extendArray(symbolizers, ps);
+ break;
+ case NONE:
default:
throw new IllegalArgumentException("Provide a suitable object.");
}
@@ -1387,6 +1438,20 @@
return style;
}
+ private static PointSymbolizer createPointSymbolizer(Color color,
+ Color color2) {
+ PointSymbolizer ps = STYLE_BUILDER.createPointSymbolizer(STYLE_BUILDER
+ .createGraphic(null, STYLE_BUILDER.createMark("circle"), null));
+ ps.getGraphic().getMarks()[0].setFill(STYLE_BUILDER.createFill(color,
+ 0.5));
+ ps.getGraphic().getMarks()[0].setSize(STYLE_BUILDER
+ .literalExpression(8.));
+ ps.getGraphic().setSize(STYLE_BUILDER.literalExpression(8.));
+ ps.getGraphic().getMarks()[0].setStroke(STYLE_BUILDER
+ .createStroke(color2));
+ return ps;
+ }
+
/**
* SLD Rules können die Paramter MinScaleDenominator und MaxScaleDenominator
* enthalten. Dadurch können Elemente für manche Zoom-Stufen deaktiviert
@@ -1880,7 +1945,7 @@
// }
if (form == GeometryForm.LINE) {
FAKTOR = 1;
- } else if (form == GeometryForm.POLYGON) {
+ } else if (form == GeometryForm.POLYGON || form == GeometryForm.ANY) {
FAKTOR = .01;
}
Modified: trunk/src/schmitzm/jfree/resource/locales/JFreeResourceBundle.properties
===================================================================
--- trunk/src/schmitzm/jfree/resource/locales/JFreeResourceBundle.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/jfree/resource/locales/JFreeResourceBundle.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,97 +1,97 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# --------------------------------------------------------------------------
-# ------ Default Translations (english) for JFreeChart GUI components ------
-# ------ in Package schmitz.jfree ------
-# --------------------------------------------------------------------------
-
-# Diagram types
-diagram.points=points
-diagram.lines=lines
-diagram.bars=bars
-diagram.areas=areas
-
-ChartType_BAR.Title=barchart
-ChartType_BAR.Object.Title=bars
-ChartType_SCATTER.Title=scatterplot
-ChartType_SCATTER.Object.Title=points
-ChartType_PIE.Title=piechart
-ChartType_PIE.Object.Title=part
-ChartType_AREA.Title=areachart
-ChartType_AREA.Object.Title=area
-ChartType_LINE.Title=linechart
-ChartType_LINE.Object.Title=line
-ChartType_POINT.Title=pointchart
-ChartType_POINT.Object.Title=points
-
-FeatureChartAxisStyle.normalized=normalized
-
-AggregationFunction.NONE.Title=---
-AggregationFunction.NONE.Desc=<html>If multiple features fall into one category, only the <i>last</i> value is used.</html>
-AggregationFunction.COUNT.Title=Count
-AggregationFunction.COUNT.Desc=Count of features
-AggregationFunction.SUM.Title=Sum
-AggregationFunction.SUM.Desc=Sum of attribute values
-AggregationFunction.SUM_ABS.Title=Absolutes sum
-AggregationFunction.SUM_ABS.Desc=Sum of the absolute attribute values
-AggregationFunction.SUM_WEIGHTED.Title=Weighted sum
-AggregationFunction.SUM_WEIGHTED.Desc=Weighted sum of attribute values
-AggregationFunction.AVG.Title=Average
-AggregationFunction.AVG.Desc=Average attribute value
-AggregationFunction.AVG_WEIGHTED.Title=Weighted average
-AggregationFunction.AVG_WEIGHTED.Desc=Weighted average attribute value
-AggregationFunction.MEDIAN.Title=Median
-AggregationFunction.MEDIAN.Desc=Median attribute value
-AggregationFunction.MIN.Title=Minimum
-AggregationFunction.MIN.Desc=Minimum attribute value
-AggregationFunction.MAX.Title=Maximum
-AggregationFunction.MAX.Desc=Maximum attribute value
-AggregationFunction.VARIANCE.Title=Variance
-AggregationFunction.VARIANCE.Desc=Variance of the attribute values
-AggregationFunction.STND_DEV.Title=Standard Deviation
-AggregationFunction.STND_DEV.Desc=Standard deviation of the attribute values
-
-regressionline=regression line
-regression.none=no relation
-regression.weak=weak relation
-regression.medium=medium relation
-regression.strong=strong relation
-regression.verystrong=very strong relation
-regression.total=perfect relation
-
-regression.weak.neg=weak negative relation
-regression.medium.neg=medium negative relation
-regression.strong.neg=strong negative relation
-regression.verystrong.neg=very strong negative relation
-regression.total.neg=perfect negative relation
-
-regressionline.tooltip=<html><i>r</i> is the product-moment-correlation coefficient and gives information about how strong the variables are related.</html>
-
-Exception.noWeightAttributeDefinedforAWeightedAggregation=A weighted AggregationFunction is selected, but not artribute for weighting is selected.
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# --------------------------------------------------------------------------
+# ------ Default Translations (english) for JFreeChart GUI components ------
+# ------ in Package schmitz.jfree ------
+# --------------------------------------------------------------------------
+
+# Diagram types
+diagram.points=points
+diagram.lines=lines
+diagram.bars=bars
+diagram.areas=areas
+
+ChartType_BAR.Title=barchart
+ChartType_BAR.Object.Title=bars
+ChartType_SCATTER.Title=scatterplot
+ChartType_SCATTER.Object.Title=points
+ChartType_PIE.Title=piechart
+ChartType_PIE.Object.Title=part
+ChartType_AREA.Title=areachart
+ChartType_AREA.Object.Title=area
+ChartType_LINE.Title=linechart
+ChartType_LINE.Object.Title=line
+ChartType_POINT.Title=pointchart
+ChartType_POINT.Object.Title=points
+
+FeatureChartAxisStyle.normalized=normalized
+
+AggregationFunction.NONE.Title=---
+AggregationFunction.NONE.Desc=<html>If multiple features fall into one category, only the <i>last</i> value is used.</html>
+AggregationFunction.COUNT.Title=Count
+AggregationFunction.COUNT.Desc=Count of features
+AggregationFunction.SUM.Title=Sum
+AggregationFunction.SUM.Desc=Sum of attribute values
+AggregationFunction.SUM_ABS.Title=Absolutes sum
+AggregationFunction.SUM_ABS.Desc=Sum of the absolute attribute values
+AggregationFunction.SUM_WEIGHTED.Title=Weighted sum
+AggregationFunction.SUM_WEIGHTED.Desc=Weighted sum of attribute values
+AggregationFunction.AVG.Title=Average
+AggregationFunction.AVG.Desc=Average attribute value
+AggregationFunction.AVG_WEIGHTED.Title=Weighted average
+AggregationFunction.AVG_WEIGHTED.Desc=Weighted average attribute value
+AggregationFunction.MEDIAN.Title=Median
+AggregationFunction.MEDIAN.Desc=Median attribute value
+AggregationFunction.MIN.Title=Minimum
+AggregationFunction.MIN.Desc=Minimum attribute value
+AggregationFunction.MAX.Title=Maximum
+AggregationFunction.MAX.Desc=Maximum attribute value
+AggregationFunction.VARIANCE.Title=Variance
+AggregationFunction.VARIANCE.Desc=Variance of the attribute values
+AggregationFunction.STND_DEV.Title=Standard Deviation
+AggregationFunction.STND_DEV.Desc=Standard deviation of the attribute values
+
+regressionline=regression line
+regression.none=no relation
+regression.weak=weak relation
+regression.medium=medium relation
+regression.strong=strong relation
+regression.verystrong=very strong relation
+regression.total=perfect relation
+
+regression.weak.neg=weak negative relation
+regression.medium.neg=medium negative relation
+regression.strong.neg=strong negative relation
+regression.verystrong.neg=very strong negative relation
+regression.total.neg=perfect negative relation
+
+regressionline.tooltip=<html><i>r</i> is the product-moment-correlation coefficient and gives information about how strong the variables are related.</html>
+
+Exception.noWeightAttributeDefinedforAWeightedAggregation=A weighted AggregationFunction is selected, but not artribute for weighting is selected.
Modified: trunk/src/schmitzm/jfree/resource/locales/JFreeResourceBundle_de.properties
===================================================================
--- trunk/src/schmitzm/jfree/resource/locales/JFreeResourceBundle_de.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/jfree/resource/locales/JFreeResourceBundle_de.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,100 +1,100 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# ---------------------------------------------------------------
-# ------ German Translations for JFreeChart GUI components ------
-# ------ in Package schmitz.jfree ------
-# ---------------------------------------------------------------
-
-# Diagram types
-diagram.points=Punkte
-diagram.lines=Linien
-diagram.bars=Balken
-diagram.areas=Fl\u00E4chen
-
-ChartType_BAR.Title=Balkendiagramm
-ChartType_BAR.Object.Title=Balken
-ChartType_BAR.Desc=Ein Balkendiagramm
-ChartType_SCATTER.Title=Streudiagramm
-ChartType_SCATTER.Object.Title=Punkte
-ChartType_SCATTER.Desc=Ein Streudiagramm visualisiert den Zusammenhang zwischen zwei numerischen Variablen.
-ChartType_PIE.Title=Kreisdiagramm
-ChartType_PIE.Object.Title=Teil
-ChartType_AREA.Title=Fl\u00E4chendiagramm
-ChartType_AREA.Object.Title=Fl\u00E4chen
-ChartType_LINE.Title=Liniendiagramm
-ChartType_LINE.Object.Title=Linie
-ChartType_LINE.Desc=Ein Linendiagramm
-ChartType_POINT.Title=Punktdiagramm
-ChartType_POINT.Object.Title=Punkte
-
-FeatureChartAxisStyle.normalized=normalisiert
-
-AggregationFunction.COUNT.Title=Anzahl
-AggregationFunction.COUNT.Desc=Anzahl der Feature
-AggregationFunction.SUM.Title=Summe
-AggregationFunction.SUM.Desc=Summe der Attribut-Werte
-AggregationFunction.SUM_ABS.Title=Absolut-Summe
-AggregationFunction.SUM_ABS.Desc=Summe der Attribut-Wert-Betr\u00E4ge
-AggregationFunction.SUM_WEIGHTED.Title=Gewichtete Summe
-AggregationFunction.SUM_WEIGHTED.Desc=Gewichtete Summe der Attribute-Werte
-AggregationFunction.AVG.Title=Durschnitt
-AggregationFunction.AVG.Desc=Durchschnittlicher Attribut-Wert
-AggregationFunction.MEDIAN.Title=Median
-AggregationFunction.MEDIAN.Desc=Median der Attribut-Werte
-AggregationFunction.MIN.Title=Minimum
-AggregationFunction.MIN.Desc=Minimaler Attribut-Wert
-AggregationFunction.MAX.Title=Maximum
-AggregationFunction.MAX.Desc=Maximaler Attribut-Wert
-AggregationFunction.VARIANCE.Title=Varianz
-AggregationFunction.VARIANCE.Desc=Varianz der Attribut-Werte
-AggregationFunction.STND_DEV.Title=Standard-Abweichung
-AggregationFunction.STND_DEV.Desc=Standard-Abweichung der Attribut-Werte
-AggregationFunction.AVG_WEIGHTED.Title=Gewichteter Durchschnitt
-AggregationFunction.AVG_WEIGHTED.Desc=Gewichteter Durchschnitt der Attribut-Werte
-AggregationFunction.NONE.Title=---
-AggregationFunction.NONE.Desc=<html>Fallen mehrere Features in die gleiche Kategorie, wird nur der <i>letzte</i> Wert dargestellt.</html>
-
-regressionline=Regressionsgerade
-regression.none=kein Zusammenhang
-regression.weak=schwacher Zusammenhang
-regression.medium=mittlerer Zusammenhang
-regression.strong=starker Zusammenhang
-regression.verystrong=sehr starker Zusammenhang
-regression.total=vollkommener Zusammenhang
-
-regression.weak.neg=schwacher negativer Zusammenhang
-regression.medium.neg=mittlerer negativer Zusammenhang
-regression.strong.neg=starker negativer Zusammenhang
-regression.verystrong.neg=sehr starker negativer Zusammenhang
-regression.total.neg=vollkommener negativer Zusammenhang
-
-regressionline.tooltip=<html><i>r</i> ist der Produktmomentkorrelationskoefizient und sagt aus, wie stark zwei Variablen voneinander abh\u00E4ngen.
-Exception.noWeightAttributeDefinedforAWeightedAggregation=Eine gewichtete Aggregierungsfunktion ist ausgew\u00E4hlt, aber kein Attribut f\u00FCr die Gewichtung.
-
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# ---------------------------------------------------------------
+# ------ German Translations for JFreeChart GUI components ------
+# ------ in Package schmitz.jfree ------
+# ---------------------------------------------------------------
+
+# Diagram types
+diagram.points=Punkte
+diagram.lines=Linien
+diagram.bars=Balken
+diagram.areas=Fl\u00E4chen
+
+ChartType_BAR.Title=Balkendiagramm
+ChartType_BAR.Object.Title=Balken
+ChartType_BAR.Desc=Ein Balkendiagramm
+ChartType_SCATTER.Title=Streudiagramm
+ChartType_SCATTER.Object.Title=Punkte
+ChartType_SCATTER.Desc=Ein Streudiagramm visualisiert den Zusammenhang zwischen zwei numerischen Variablen.
+ChartType_PIE.Title=Kreisdiagramm
+ChartType_PIE.Object.Title=Teil
+ChartType_AREA.Title=Fl\u00E4chendiagramm
+ChartType_AREA.Object.Title=Fl\u00E4chen
+ChartType_LINE.Title=Liniendiagramm
+ChartType_LINE.Object.Title=Linie
+ChartType_LINE.Desc=Ein Linendiagramm
+ChartType_POINT.Title=Punktdiagramm
+ChartType_POINT.Object.Title=Punkte
+
+FeatureChartAxisStyle.normalized=normalisiert
+
+AggregationFunction.COUNT.Title=Anzahl
+AggregationFunction.COUNT.Desc=Anzahl der Feature
+AggregationFunction.SUM.Title=Summe
+AggregationFunction.SUM.Desc=Summe der Attribut-Werte
+AggregationFunction.SUM_ABS.Title=Absolut-Summe
+AggregationFunction.SUM_ABS.Desc=Summe der Attribut-Wert-Betr\u00E4ge
+AggregationFunction.SUM_WEIGHTED.Title=Gewichtete Summe
+AggregationFunction.SUM_WEIGHTED.Desc=Gewichtete Summe der Attribute-Werte
+AggregationFunction.AVG.Title=Durschnitt
+AggregationFunction.AVG.Desc=Durchschnittlicher Attribut-Wert
+AggregationFunction.MEDIAN.Title=Median
+AggregationFunction.MEDIAN.Desc=Median der Attribut-Werte
+AggregationFunction.MIN.Title=Minimum
+AggregationFunction.MIN.Desc=Minimaler Attribut-Wert
+AggregationFunction.MAX.Title=Maximum
+AggregationFunction.MAX.Desc=Maximaler Attribut-Wert
+AggregationFunction.VARIANCE.Title=Varianz
+AggregationFunction.VARIANCE.Desc=Varianz der Attribut-Werte
+AggregationFunction.STND_DEV.Title=Standard-Abweichung
+AggregationFunction.STND_DEV.Desc=Standard-Abweichung der Attribut-Werte
+AggregationFunction.AVG_WEIGHTED.Title=Gewichteter Durchschnitt
+AggregationFunction.AVG_WEIGHTED.Desc=Gewichteter Durchschnitt der Attribut-Werte
+AggregationFunction.NONE.Title=---
+AggregationFunction.NONE.Desc=<html>Fallen mehrere Features in die gleiche Kategorie, wird nur der <i>letzte</i> Wert dargestellt.</html>
+
+regressionline=Regressionsgerade
+regression.none=kein Zusammenhang
+regression.weak=schwacher Zusammenhang
+regression.medium=mittlerer Zusammenhang
+regression.strong=starker Zusammenhang
+regression.verystrong=sehr starker Zusammenhang
+regression.total=vollkommener Zusammenhang
+
+regression.weak.neg=schwacher negativer Zusammenhang
+regression.medium.neg=mittlerer negativer Zusammenhang
+regression.strong.neg=starker negativer Zusammenhang
+regression.verystrong.neg=sehr starker negativer Zusammenhang
+regression.total.neg=vollkommener negativer Zusammenhang
+
+regressionline.tooltip=<html><i>r</i> ist der Produktmomentkorrelationskoefizient und sagt aus, wie stark zwei Variablen voneinander abh\u00E4ngen.
+Exception.noWeightAttributeDefinedforAWeightedAggregation=Eine gewichtete Aggregierungsfunktion ist ausgew\u00E4hlt, aber kein Attribut f\u00FCr die Gewichtung.
+
Modified: trunk/src/schmitzm/lang/LangUtil.java
===================================================================
--- trunk/src/schmitzm/lang/LangUtil.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/lang/LangUtil.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -79,7 +79,8 @@
/**
* Date formatter for "dd.MM.yyyy [HH:mm:ss]".
*/
- public static final DateFormat DEFAULT_DATE_TIME_FORMATTER = new SimpleDateFormat("dd.MM.yyyy [HH:mm:ss]");
+ public static final DateFormat DEFAULT_DATE_TIME_FORMATTER = new SimpleDateFormat(
+ "dd.MM.yyyy [HH:mm:ss]");
/**
* Liefert <code>true</code> wenn der String nur Nullen, Leerzeichen,
@@ -113,34 +114,36 @@
return "null";
return object.getClass().getSimpleName();
}
-
+
/**
* Returns the current time as formatted string.
- * @param format date format as defined in {@link SimpleDateFormat}
- * (if {@code null}, the default format is used)
+ *
+ * @param format
+ * date format as defined in {@link SimpleDateFormat} (if
+ * {@code null}, the default format is used)
* @see #DEFAULT_DATE_TIME_FORMATTER
*/
public static String getCurrentTimeFormatted(String formatPattern) {
- DateFormat formatter = DEFAULT_DATE_TIME_FORMATTER;
- if ( formatPattern != null )
- formatter = new SimpleDateFormat(formatPattern);
- return formatter.format( new Date(System.currentTimeMillis()) );
+ DateFormat formatter = DEFAULT_DATE_TIME_FORMATTER;
+ if (formatPattern != null)
+ formatter = new SimpleDateFormat(formatPattern);
+ return formatter.format(new Date(System.currentTimeMillis()));
}
-
+
/**
* Returns an exception stack as string.
*/
public static String getStackTraceFromException(Throwable err) {
- // convert exception stack to string
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- PrintStream printStream = new PrintStream( outputStream );
- err.printStackTrace(printStream);
-
- String stackTraceStr = outputStream.toString();
- printStream.close();
- IOUtil.closeOutputStream(outputStream);
-
- return stackTraceStr;
+ // convert exception stack to string
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ PrintStream printStream = new PrintStream(outputStream);
+ err.printStackTrace(printStream);
+
+ String stackTraceStr = outputStream.toString();
+ printStream.close();
+ IOUtil.closeOutputStream(outputStream);
+
+ return stackTraceStr;
}
/**
@@ -1580,4 +1583,23 @@
return true;
return false;
}
+
+ /**
+ * Removes leading and tailing "\n" newline commands. Very similar:
+ * StringUtils.trimToEmpty(string);
+ *
+ * @param string
+ * return <code>null</code> if <code>null</code> is passed.
+ */
+ public static String trimNewlines(String string) {
+
+ if (string == null)
+ return null;
+
+ if (string.startsWith("\n"))
+ string = string.substring(1);
+ if (string.endsWith("\n"))
+ string = string.substring(0, string.length() - 1);
+ return string;
+ }
}
Modified: trunk/src/schmitzm/lang/ResourceProvider.java
===================================================================
--- trunk/src/schmitzm/lang/ResourceProvider.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/lang/ResourceProvider.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -411,7 +411,7 @@
// // Wenn Ressource auch im Standard-Bundle nicht vorhanden ist,
// // Fehler werfen (oder ignorieren
// if ( ignoreMissingResource ) {
- // LOGGER.warn("ResourceBundle "+primaryBundle+": "+err.getMessage());
+ // LOGGER.warn("ResourceBundle "+primaryBundle+": ",err);
// return null;
// }
// throw err2;
Modified: trunk/src/schmitzm/lang/resource/locales/LangResourceBundle.properties
===================================================================
--- trunk/src/schmitzm/lang/resource/locales/LangResourceBundle.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/lang/resource/locales/LangResourceBundle.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,48 +1,48 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-OperationTree.Integer=Integer
-OperationTree.Number=Number
-OperationTree.err.ParseErrorMess=Parse-Error at "${0}": ${1}
-OperationTree.err.UnexpectedEOR=Unexpected end of rule!
-OperationTree.err.UnexpectedError=Unexpected error!
-OperationTree.err.TokenNotExpected=${0} not expected
-OperationTree.err.MoreParamsExpected=${0} more function parameters expected. Bracket can not close!
-OperationTree.err.UnexpectedBracket=Bracket ${0} can not close ${1}
-OperationTree.err.BracketsNotClosed=Bracket(s) not closed: ${0}
-OperationTree.err.IllegalOperator=Illegal operator ${0}
-OperationTree.err.IllegalOperatorSyntax=Illegal ${0} syntax '${1}'
-OperationTree.err.ParamSepExpected=Parameter-Separator expected
-OperationTree.err.IllegalCharacter=Illegal character '${0}' (${1} expected)
-
-OperationTree.err.UnknownNode=Unknown operation tree node: ${0}
-OperationTree.err.UnknownOperator=Unknown operator: ${0}
-OperationTree.err.UnknownAliasOperator=Unknown alias operator: ${0}
-OperationTree.err.LessParams1=At least ${0} function parameters expected: ${1}(..)
-OperationTree.err.LessParams2=${0} function parameters expected: ${1}(..)
-OperationTree.err.IllegalParam=Illegal parameter ${0} for ${1}(..): ${2} expected
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+OperationTree.Integer=Integer
+OperationTree.Number=Number
+OperationTree.err.ParseErrorMess=Parse-Error at "${0}": ${1}
+OperationTree.err.UnexpectedEOR=Unexpected end of rule!
+OperationTree.err.UnexpectedError=Unexpected error!
+OperationTree.err.TokenNotExpected=${0} not expected
+OperationTree.err.MoreParamsExpected=${0} more function parameters expected. Bracket can not close!
+OperationTree.err.UnexpectedBracket=Bracket ${0} can not close ${1}
+OperationTree.err.BracketsNotClosed=Bracket(s) not closed: ${0}
+OperationTree.err.IllegalOperator=Illegal operator ${0}
+OperationTree.err.IllegalOperatorSyntax=Illegal ${0} syntax '${1}'
+OperationTree.err.ParamSepExpected=Parameter-Separator expected
+OperationTree.err.IllegalCharacter=Illegal character '${0}' (${1} expected)
+
+OperationTree.err.UnknownNode=Unknown operation tree node: ${0}
+OperationTree.err.UnknownOperator=Unknown operator: ${0}
+OperationTree.err.UnknownAliasOperator=Unknown alias operator: ${0}
+OperationTree.err.LessParams1=At least ${0} function parameters expected: ${1}(..)
+OperationTree.err.LessParams2=${0} function parameters expected: ${1}(..)
+OperationTree.err.IllegalParam=Illegal parameter ${0} for ${1}(..): ${2} expected
Modified: trunk/src/schmitzm/lang/resource/locales/LangResourceBundle_de.properties
===================================================================
--- trunk/src/schmitzm/lang/resource/locales/LangResourceBundle_de.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/lang/resource/locales/LangResourceBundle_de.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,81 +1,81 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focussing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# ------------------------------------------------
-# ------ German Translations for components ------
-# ------ in Package schmitzm.lang ------
-# ------------------------------------------------
-
-# --- Translations for OperationTree / OperationTreeParser
-OperationTree.Integer=Ganzzahl
-OperationTree.Number=Numerisch
-OperationTree.err.ParseErrorMess=Parser-Fehler bei "${0}": ${1}
-OperationTree.err.UnexpectedEOR=Unerwartetes Ende der Formel!
-OperationTree.err.UnexpectedError=Unerwarteter Fehler!
-OperationTree.err.TokenNotExpected=${0} nicht erlaubt
-OperationTree.err.MoreParamsExpected=Noch ${0} Funtionsparameter notwendig. Klammer kann nicht schliessen!
-OperationTree.err.UnexpectedBracket=Klammer ${0} kann ${1} nicht schliessen
-OperationTree.err.BracketsNotClosed=Klammer(n) werden nicht geschlossen: ${0}
-OperationTree.err.IllegalOperator=Ung\u00FCltiger Operator ${0}
-OperationTree.err.IllegalOperatorSyntax=Fehlerhafte ${0} Syntax '${1}'
-OperationTree.err.ParamSepExpected=Parameter-Trennzeichen erwartet
-OperationTree.err.IllegalCharacter=Ung\u00FCltiges Zeichen '${0}' (${1} erwartet)
-
-OperationTree.err.UnknownNode=Unbekannter Operator-Knoten: ${0}
-OperationTree.err.UnknownOperator=Unbekannter Operator: ${0}
-OperationTree.err.UnknownAliasOperator=Unbekannter Alias-Operator: ${0}
-OperationTree.err.LessParams1=Mindestens ${0} Funktionsparameter ben\u00F6tigt\: ${1}(..)
-OperationTree.err.LessParams2=${0} Funktionsparameter ben\u00F6tigt\: ${1}(..)
-OperationTree.err.IllegalParam=Illegaler Funktionsparameter ${0} f\u00FCr ${1}(..)\: ${2} erwartet
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focussing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# ------------------------------------------------
+# ------ German Translations for components ------
+# ------ in Package schmitzm.lang ------
+# ------------------------------------------------
+
+# --- Translations for OperationTree / OperationTreeParser
+OperationTree.Integer=Ganzzahl
+OperationTree.Number=Numerisch
+OperationTree.err.ParseErrorMess=Parser-Fehler bei "${0}": ${1}
+OperationTree.err.UnexpectedEOR=Unerwartetes Ende der Formel!
+OperationTree.err.UnexpectedError=Unerwarteter Fehler!
+OperationTree.err.TokenNotExpected=${0} nicht erlaubt
+OperationTree.err.MoreParamsExpected=Noch ${0} Funtionsparameter notwendig. Klammer kann nicht schliessen!
+OperationTree.err.UnexpectedBracket=Klammer ${0} kann ${1} nicht schliessen
+OperationTree.err.BracketsNotClosed=Klammer(n) werden nicht geschlossen: ${0}
+OperationTree.err.IllegalOperator=Ung\u00FCltiger Operator ${0}
+OperationTree.err.IllegalOperatorSyntax=Fehlerhafte ${0} Syntax '${1}'
+OperationTree.err.ParamSepExpected=Parameter-Trennzeichen erwartet
+OperationTree.err.IllegalCharacter=Ung\u00FCltiges Zeichen '${0}' (${1} erwartet)
+
+OperationTree.err.UnknownNode=Unbekannter Operator-Knoten: ${0}
+OperationTree.err.UnknownOperator=Unbekannter Operator: ${0}
+OperationTree.err.UnknownAliasOperator=Unbekannter Alias-Operator: ${0}
+OperationTree.err.LessParams1=Mindestens ${0} Funktionsparameter ben\u00F6tigt\: ${1}(..)
+OperationTree.err.LessParams2=${0} Funktionsparameter ben\u00F6tigt\: ${1}(..)
+OperationTree.err.IllegalParam=Illegaler Funktionsparameter ${0} f\u00FCr ${1}(..)\: ${2} erwartet
Modified: trunk/src/schmitzm/lang/resource/locales/LangResourceBundle_it.properties
===================================================================
--- trunk/src/schmitzm/lang/resource/locales/LangResourceBundle_it.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/lang/resource/locales/LangResourceBundle_it.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,55 +1,55 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Annica Sahlin
-##########
-
-# -------------------------------------------------
-# ------ Italian Translations for components ------
-# ------ in Package schmitzm.lang ------
-# -------------------------------------------------
-
-# --- Translations for OperationTree / OperationTreeParser
-OperationTree.Integer=Integro
-OperationTree.Number=Numero
-OperationTree.err.BracketsNotClosed=Parentesi(s) non \u00e8 chiusa: ${0}
-OperationTree.err.IllegalCharacter=Carattere non accettato '${0}' (${1} expected)");
-OperationTree.err.IllegalOperator=Operatore non accettato ${0}
-OperationTree.err.IllegalOperatorSyntax=Sintassi non accettato ${0} '${1}'
-OperationTree.err.IllegalParam=Parametro non accettato ${0} per ${1}(..): ${2} expected
-OperationTree.err.LessParams1=Almeno ${0} parametri di funzione sono richiesti: ${1}(..)
-OperationTree.err.LessParams2=${0} parametri di funzione richiesti: ${1}(..)
-OperationTree.err.MoreParamsExpected= ${0} ulteriori parametri di funzione richiesti. Parentesi non pu\u00f2 essere chiusa!
-OperationTree.err.ParamSepExpected=Separatore di parametro richiesto
-OperationTree.err.ParseErrorMess=Errore di analisi in "${0}": ${1}
-OperationTree.err.TokenNotExpected=${0} non richiesto
-OperationTree.err.UnexpectedBracket=Parentesi ${0} non pu\u00f2 essere chiusa ${1}
-OperationTree.err.UnexpectedEOR=Inaspettata chiusura di rule!
-OperationTree.err.UnexpectedError=Errore inaspettato!
-OperationTree.err.UnknownAliasOperator=Operatore alias non conosciuto: ${0}
-OperationTree.err.UnknownNode=Operazione sconosciuta tree node: ${0}
-OperationTree.err.UnknownOperator=Operatore non conosciuto: ${0}
-
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Annica Sahlin
+##########
+
+# -------------------------------------------------
+# ------ Italian Translations for components ------
+# ------ in Package schmitzm.lang ------
+# -------------------------------------------------
+
+# --- Translations for OperationTree / OperationTreeParser
+OperationTree.Integer=Integro
+OperationTree.Number=Numero
+OperationTree.err.BracketsNotClosed=Parentesi(s) non \u00e8 chiusa: ${0}
+OperationTree.err.IllegalCharacter=Carattere non accettato '${0}' (${1} expected)");
+OperationTree.err.IllegalOperator=Operatore non accettato ${0}
+OperationTree.err.IllegalOperatorSyntax=Sintassi non accettato ${0} '${1}'
+OperationTree.err.IllegalParam=Parametro non accettato ${0} per ${1}(..): ${2} expected
+OperationTree.err.LessParams1=Almeno ${0} parametri di funzione sono richiesti: ${1}(..)
+OperationTree.err.LessParams2=${0} parametri di funzione richiesti: ${1}(..)
+OperationTree.err.MoreParamsExpected= ${0} ulteriori parametri di funzione richiesti. Parentesi non pu\u00f2 essere chiusa!
+OperationTree.err.ParamSepExpected=Separatore di parametro richiesto
+OperationTree.err.ParseErrorMess=Errore di analisi in "${0}": ${1}
+OperationTree.err.TokenNotExpected=${0} non richiesto
+OperationTree.err.UnexpectedBracket=Parentesi ${0} non pu\u00f2 essere chiusa ${1}
+OperationTree.err.UnexpectedEOR=Inaspettata chiusura di rule!
+OperationTree.err.UnexpectedError=Errore inaspettato!
+OperationTree.err.UnknownAliasOperator=Operatore alias non conosciuto: ${0}
+OperationTree.err.UnknownNode=Operazione sconosciuta tree node: ${0}
+OperationTree.err.UnknownOperator=Operatore non conosciuto: ${0}
+
Modified: trunk/src/schmitzm/mail/MailUtil.java
===================================================================
--- trunk/src/schmitzm/mail/MailUtil.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/mail/MailUtil.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -27,80 +27,120 @@
* Diese Klasse stellt Hilfsmethoden zum verschicken von Mails bereit.
*/
public class MailUtil {
- /** Mail address for Martin Schmitz. */
- public static final String MAIL_ADDR_MARTIN_SCHMITZ = "Martin.Schmitz at koeln.de";
- /** Mail address for Stefan Tzeggai. */
- public static final String MAIL_ADDR_STEFAN_TZEGGAI = "tzeggai at wikisquare.de";
- /** Mail address for SCHMITZM bug reports. */
- public static final String MAIL_ADDR_SCHMITZM_BUGS = "schmitzm-bugs at wikisquare.de";
-
- private static Logger log = Logger.getLogger(MailUtil.class);
+ /** Mail address for Martin Schmitz. */
+ public static final String MAIL_ADDR_MARTIN_SCHMITZ = "Martin.Schmitz at koeln.de";
+ /** Mail address for Stefan Tzeggai. */
+ public static final String MAIL_ADDR_STEFAN_TZEGGAI = "tzeggai at wikisquare.de";
+ /** Mail address for SCHMITZM bug reports. */
+ public static final String MAIL_ADDR_SCHMITZM_BUGS = "schmitzm-bugs at wikisquare.de";
- /**
- * {@link ResourceProvider} for the localization of the package
- * {@code schmitzm.Mail}. These are provided in property files under
- * {@code schmitzm.mail.resource.locales}.
- */
- public static ResourceProvider RESOURCE = ResourceProvider.newInstance(
- LangUtil.extendPackagePath(MailUtil.class,
- "resource.locales.MailResourceBundle"), Locale.ENGLISH);
+ private static Logger log = Logger.getLogger(MailUtil.class);
- /** Maximale Laenge des Mail-Bodies. Ist der Mail-Inhalt laenger, wird er
- * gekuerzt. */
- private static final int MAX_MAIL_BODY_SIZE = 1500;
+ /**
+ * {@link ResourceProvider} for the localization of the package
+ * {@code schmitzm.Mail}. These are provided in property files under
+ * {@code schmitzm.mail.resource.locales}.
+ */
+ public static ResourceProvider RESOURCE = ResourceProvider.newInstance(
+ LangUtil.extendPackagePath(MailUtil.class,
+ "resource.locales.MailResourceBundle"), Locale.ENGLISH);
/**
+ * Maximale Laenge des Mail-Bodies. Ist der Mail-Inhalt laenger, wird er
+ * gekuerzt.
+ */
+ private static final int MAX_MAIL_BODY_SIZE = 1500;
+
+ /**
* Opens the local mail client with a new mail.
- * @param mailDestAddr destination address(es); can be {@code null}
- * @param mailSubject mail subject; can be {@code null}
- * @param mailBody mail body content; can be {@code null}
+ *
+ * @param mailDestAddr
+ * destination address(es); can be {@code null}
+ * @param mailSubject
+ * mail subject; can be {@code null}
+ * @param mailBody
+ * mail body content; can be {@code null}
*/
- public static void sendDesktopMail(String mailDestAddr, String mailSubject, String mailBody) {
- if (!Desktop.isDesktopSupported() ||
- !Desktop.getDesktop().isSupported(Desktop.Action.MAIL)) {
- JOptionPane.showMessageDialog(null, RESOURCE.getString("MailUtil.DesktopMail.NotSupported"));
- return;
- }
-
- try {
- // Mail body can not be infinitely big
- if ( mailBody.length() > MAX_MAIL_BODY_SIZE )
- mailBody = mailBody.substring(0,MAX_MAIL_BODY_SIZE) + "...\n[...]";
-
- StringBuffer uriMailStr = new StringBuffer();
- uriMailStr.append( mailDestAddr != null ? mailDestAddr : "");
- uriMailStr.append("?SUBJECT=").append( mailSubject != null ? mailSubject : "");
- uriMailStr.append("&BODY=").append( mailBody != null ? mailBody : "");
- URI uriMailTo = new URI("mailto",uriMailStr.toString(),null);
- Desktop.getDesktop().mail(uriMailTo);
- } catch (Exception err) {
- ExceptionDialog.show(null, err, null, RESOURCE.getString("MailUtil.DesktopMail.CreationError"));
- }
+ public static void sendDesktopMail(String mailDestAddr, String mailSubject,
+ String mailBody) {
+ if (!Desktop.isDesktopSupported()
+ || !Desktop.getDesktop().isSupported(Desktop.Action.MAIL)) {
+ JOptionPane.showMessageDialog(null,
+ RESOURCE.getString("MailUtil.DesktopMail.NotSupported"));
+ return;
+ }
+
+ try {
+ // Mail body can not be infinitely big
+ if (mailBody.length() > MAX_MAIL_BODY_SIZE)
+ mailBody = mailBody.substring(0, MAX_MAIL_BODY_SIZE)
+ + "...\n[...]";
+
+ StringBuffer uriMailStr = new StringBuffer();
+ uriMailStr.append(mailDestAddr != null ? mailDestAddr : "");
+ uriMailStr.append("?SUBJECT=").append(
+ mailSubject != null ? mailSubject : "");
+ uriMailStr.append("&BODY=")
+ .append(mailBody != null ? mailBody : "");
+ URI uriMailTo = new URI("mailto", uriMailStr.toString(), null);
+ Desktop.getDesktop().mail(uriMailTo);
+ } catch (Exception err) {
+ ExceptionDialog.show(null, err, null,
+ RESOURCE.getString("MailUtil.DesktopMail.CreationError"));
+ }
}
-
+
/**
- * Opens the local mail client with a new mail for an exception.
- * @param mailDestAddr destination address(es); can be {@code null}
- * @param err exception to create a mail for
- */
- public static void sendDesktopExceptionMail(String mailDestAddr, Throwable err) {
- String exceptionMess = err.getMessage();
- String exceptionStack = LangUtil.getStackTraceFromException(err);
+ * Opens the local mail client with a new mail for an exception.
+ *
+ * @param mailDestAddr
+ * destination address(es); can be {@code null}
+ * @param err
+ * exception to create a mail for
+ * @param additionalInfo
+ * may be <code>null</code>, adds additional text provided by the
+ * caller
+ */
+ public static void sendDesktopExceptionMail(String mailDestAddr,
+ Throwable err, String additionalInfo) {
+ String exceptionMess = err.getMessage();
+ String exceptionStack = LangUtil.getStackTraceFromException(err);
- StringBuffer mailBody = new StringBuffer();
- mailBody.append("\n")
- .append("Date/Time: ").append(LangUtil.getCurrentTimeFormatted(null)).append("\n")
- .append("Exception: ").append(exceptionMess).append("\n")
- .append("Java version: ").append(System.getProperty("java.version")).append("\n")
- .append("Comment: ___________").append("\n")
- .append("\n")
- .append(exceptionStack);
- String mailSubject = "Exception-Report: " + exceptionMess;
-
- sendDesktopMail(mailDestAddr, mailSubject, mailBody.toString());
- }
-
+ StringBuffer mailBody = new StringBuffer();
+ mailBody.append("\n").append("Date/Time: ")
+ .append(LangUtil.getCurrentTimeFormatted(null)).append("\n")
+ .append("Exception: ").append(exceptionMess).append("\n")
+ .append("Java version: ")
+ .append(System.getProperty("java.version")).append("\n");
+
+ // insert optinal additional comment
+ if (additionalInfo != null) {
+ additionalInfo = LangUtil.trimNewlines(additionalInfo);
+
+ mailBody.append(additionalInfo + "\n");
+ }
+
+ mailBody.append("Comment: ___________").append("\n").append("\n")
+ .append(exceptionStack);
+ String mailSubject = "Exception-Report: " + exceptionMess;
+
+ sendDesktopMail(mailDestAddr, mailSubject, mailBody.toString());
+ }
+
/**
+ * Opens the local mail client with a new mail for an exception.
+ *
+ * @param mailDestAddr
+ * destination address(es); can be {@code null}
+ * @param err
+ * exception to create a mail for
+ */
+ public static void sendDesktopExceptionMail(String mailDestAddr,
+ Throwable err) {
+ sendDesktopExceptionMail(mailDestAddr, err, null);
+ }
+
+ /**
* Verschickt eine Email, wobei der Login Klartext erfolgt. Die Email wird
* auf dem Aktuellen Thread verschickt und kann natürlich theoretisch
* längere zeit beanspruchen! Kein Parameter darf <code>null</code> sein.
@@ -221,51 +261,54 @@
}
}
-// Sample code from http://www.javapractices.com/topic/TopicAction.do?Id=242
-// to quote the mail body by encodeUnusualChars(..)
-// Maybe we can reuse this (untested) code in future
-
-// private static final Pattern SIMPLE_CHARS = Pattern.compile("[a-zA-Z0-9]");
-//
-// private String encodeUnusualChars(String aText){
-// StringBuilder result = new StringBuilder();
-// CharacterIterator iter = new StringCharacterIterator(aText);
-// for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) {
-// char[] chars = {c};
-// String character = new String(chars);
-// if(isSimpleCharacter(character)){
-// result.append(c);
-// }
-// else {
-// hexEncode(character, "UTF-8", result);
-// }
-// }
-// return result.toString();
-// }
-//
-// private boolean isSimpleCharacter(String aCharacter){
-// Matcher matcher = SIMPLE_CHARS.matcher(aCharacter);
-// return matcher.matches();
-// }
-//
-// /**
-// For the given character and encoding, appends one or more hex-encoded characters.
-// For double-byte characters, two hex-encoded items will be appended.
-// */
-// private static void hexEncode(String aCharacter, String aEncoding, StringBuilder aOut) {
-// try {
-// String HEX_DIGITS = "0123456789ABCDEF";
-// byte[] bytes = aCharacter.getBytes(aEncoding);
-// for (int idx = 0; idx < bytes.length; idx++) {
-// aOut.append('%');
-// aOut.append(HEX_DIGITS.charAt((bytes[idx] & 0xf0) >> 4));
-// aOut.append(HEX_DIGITS.charAt(bytes[idx] & 0xf));
-// }
-// }
-// catch (UnsupportedEncodingException ex) {
-// ex.printStackTrace();
-// }
-// }
-
+ // Sample code from http://www.javapractices.com/topic/TopicAction.do?Id=242
+ // to quote the mail body by encodeUnusualChars(..)
+ // Maybe we can reuse this (untested) code in future
+ // private static final Pattern SIMPLE_CHARS =
+ // Pattern.compile("[a-zA-Z0-9]");
+ //
+ // private String encodeUnusualChars(String aText){
+ // StringBuilder result = new StringBuilder();
+ // CharacterIterator iter = new StringCharacterIterator(aText);
+ // for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next())
+ // {
+ // char[] chars = {c};
+ // String character = new String(chars);
+ // if(isSimpleCharacter(character)){
+ // result.append(c);
+ // }
+ // else {
+ // hexEncode(character, "UTF-8", result);
+ // }
+ // }
+ // return result.toString();
+ // }
+ //
+ // private boolean isSimpleCharacter(String aCharacter){
+ // Matcher matcher = SIMPLE_CHARS.matcher(aCharacter);
+ // return matcher.matches();
+ // }
+ //
+ // /**
+ // For the given character and encoding, appends one or more hex-encoded
+ // characters.
+ // For double-byte characters, two hex-encoded items will be appended.
+ // */
+ // private static void hexEncode(String aCharacter, String aEncoding,
+ // StringBuilder aOut) {
+ // try {
+ // String HEX_DIGITS = "0123456789ABCDEF";
+ // byte[] bytes = aCharacter.getBytes(aEncoding);
+ // for (int idx = 0; idx < bytes.length; idx++) {
+ // aOut.append('%');
+ // aOut.append(HEX_DIGITS.charAt((bytes[idx] & 0xf0) >> 4));
+ // aOut.append(HEX_DIGITS.charAt(bytes[idx] & 0xf));
+ // }
+ // }
+ // catch (UnsupportedEncodingException ex) {
+ // ex.printStackTrace();
+ // }
+ // }
+
}
Modified: trunk/src/schmitzm/mail/resource/locales/MailResourceBundle.properties
===================================================================
--- trunk/src/schmitzm/mail/resource/locales/MailResourceBundle.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/mail/resource/locales/MailResourceBundle.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,62 +1,62 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focussing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# ---------------------------------------------------------------
-# ------ Default Translations (english) for components ------
-# ------ in Package schmitzm.mail ------
-# ---------------------------------------------------------------
-
-MailUtil.DesktopMail.NotSupported=Mailing is not supported on your operating system!
-MailUtil.DesktopMail.CreationError=Error during creation of exception mail
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focussing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# ---------------------------------------------------------------
+# ------ Default Translations (english) for components ------
+# ------ in Package schmitzm.mail ------
+# ---------------------------------------------------------------
+
+MailUtil.DesktopMail.NotSupported=Mailing is not supported on your operating system!
+MailUtil.DesktopMail.CreationError=Error during creation of exception mail
Modified: trunk/src/schmitzm/mail/resource/locales/MailResourceBundle_de.properties
===================================================================
--- trunk/src/schmitzm/mail/resource/locales/MailResourceBundle_de.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/mail/resource/locales/MailResourceBundle_de.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,62 +1,62 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focussing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# ----------------------------------------------------
-# ------ German Translations for components ------
-# ------ in Package schmitzm.mail ------
-# ----------------------------------------------------
-
-MailUtil.DesktopMail.NotSupported=Mailen wird von Ihrem Betriebssystem leider nicht unterst\u00FCtzt.
-MailUtil.DesktopMail.CreationError=Fehler beim Erstellen der Fehler-Mail
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focussing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# ----------------------------------------------------
+# ------ German Translations for components ------
+# ------ in Package schmitzm.mail ------
+# ----------------------------------------------------
+
+MailUtil.DesktopMail.NotSupported=Mailen wird von Ihrem Betriebssystem leider nicht unterst\u00FCtzt.
+MailUtil.DesktopMail.CreationError=Fehler beim Erstellen der Fehler-Mail
Modified: trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties
===================================================================
--- trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,252 +1,252 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focussing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# ---------------------------------------------------------------
-# ------ Default Translations (english) for GUI components ------
-# ------ in Package schmitzm.swing ------
-# ---------------------------------------------------------------
-
-Ok=Ok
-Cancel=Cancel
-Apply=Apply
-Ready=Ready
-Open=Open
-OpenFolder=Open folder
-Close=Close
-Save=Save
-WaitMess=Please wait...
-FileExists=File already exists
-Details=Details...
-Warning=Warning
-Error=Error
-Information=Information
-Class=Class
-Description=Description
-InvalidInputMess=Invalid input
-Refresh=Refresh
-Reload=Reload
-Clear=Clear
-Skip=Skip
-Overwrite=Overwrite
-OverwriteAll=Overwrite all
-Replace=Replace
-CreateDuplicate=Create duplicate
-RememberChoice=Remember this choice
-Rule=Rule
-RuleToolTip=Insert your arithmetical rule here...
-Operators=Operators
-Start=Start
-Calculate=Calculate
-
-ExceptionDialog.CopyToClipboard=Copy to clipboard
-ExceptionDialog.CopyToConsole=Copy to console
-ExceptionDialog.Mail=Mail
-ExceptionDialog.MailDisabled.Desc=Mailing currently not available, because a destination mail address for bug reporting is not set in this application (ExceptionDialog.setMailDestinationAddress(..))
-
-ManualInputOption.PasswordVisible.visibility=visible
-
-OperationTreePanel.OpDesc.and=AND
-OperationTreePanel.OpDesc.or=OR
-OperationTreePanel.OpDesc.not=NOT
-OperationTreePanel.OpDesc.abs=abs($NUMBER)
-OperationTreePanel.OpDesc.sqrt=sqrt($NUMBER)
-OperationTreePanel.OpDesc.round=round($NUMBER)
-OperationTreePanel.OpDesc.trunc=trunc($NUMBER)
-OperationTreePanel.OpDesc.isNaN=isNaN($NUMBER)
-OperationTreePanel.OpDesc.NaN=NaN
-OperationTreePanel.OpDesc.random=random number
-OperationTreePanel.OpDesc.sin=sin($NUMBER)
-OperationTreePanel.OpDesc.cos=cos($NUMBER)
-OperationTreePanel.OpDesc.tan=tan($NUMBER)
-OperationTreePanel.OpDesc.asin=arcsine($NUMBER)
-OperationTreePanel.OpDesc.acos=arccose($NUMBER)
-OperationTreePanel.OpDesc.atan=arctan($NUMBER)
-OperationTreePanel.OpDesc.exp=exp($NUMBER)
-OperationTreePanel.OpDesc.ln=ln($NUMBER)
-OperationTreePanel.OpDesc.log=log($NUMBER)
-OperationTreePanel.OpDesc.str=str($NUMBER)
-OperationTreePanel.OpDesc.val=val($TEXT)
-OperationTreePanel.OpDesc.len=len($TEXT)
-OperationTreePanel.OpDesc.toupper=toupper($TEXT)
-OperationTreePanel.OpDesc.tolower=tolower($TEXT)
-OperationTreePanel.OpDesc.ite=IF .. THEN .. ELSE
-OperationTreePanel.OpDesc.regex=REGEX( $TEXT , $REGEX)
-OperationTreePanel.OpDesc.substr=SUBSTRING( $TEXT , $NUMBER , $NUMBER)
-OperationTreePanel.OpDesc.split=SPLIT( $TEXT , $REGEX , $NUMBER)
-OperationTreePanel.OpDesc.str2millis=str2millis( $TEXT , $TEXT)
-OperationTreePanel.OpDesc.date2millis=date2millis( $YEAR, $MONTH, $DAY)
-OperationTreePanel.OpDesc.millis2str=millis2str( $NUMBER , $FORMAT)
-OperationTreePanel.OpDesc.date2str=date2millis( $YEAR, $MONTH, $DAY, $FORMAT)
-OperationTreePanel.OpDesc.day_millis=DAY_MILLIS
-OperationTreePanel.OpDesc.week_millis=WEEK_MILLIS
-OperationTreePanel.OpDesc.plus=+
-OperationTreePanel.OpDesc.minus=-
-OperationTreePanel.OpDesc.multiply=*
-OperationTreePanel.OpDesc.divide=/
-OperationTreePanel.OpDesc.pow=^
-OperationTreePanel.OpDesc.eq=\=
-OperationTreePanel.OpDesc.ne=<>
-OperationTreePanel.OpDesc.lt=<
-OperationTreePanel.OpDesc.le=<=
-OperationTreePanel.OpDesc.gt=>
-OperationTreePanel.OpDesc.ge=>=
-OperationTreePanel.OpDesc.X=Raster cell X
-OperationTreePanel.OpDesc.Y=Raster cell Y
-OperationTreePanel.OpDesc.NoData=NoData value
-OperationTreePanel.OpDesc.isNoData=isNoData(.)
-
-OperationTreePanel.OpTooltip.and=Returns TRUE only if both arguments is TRUE.
-OperationTreePanel.OpTooltip.or=Returns TRUE is any argument is TRUE.
-OperationTreePanel.OpTooltip.not=Reverses the value of the argument.
-OperationTreePanel.OpTooltip.abs=Absolute value of a number.
-OperationTreePanel.OpTooltip.sqrt=Returns the square root of a number.
-OperationTreePanel.OpTooltip.round=Rounds a number.
-OperationTreePanel.OpTooltip.trunc=Truncates the decimal places of a number.
-OperationTreePanel.OpTooltip.isNaN=Returns TRUE if value is not a number.
-OperationTreePanel.OpTooltip.NaN=The value of "NotANumber"
-OperationTreePanel.OpTooltip.random=Returns a random number between 0 and 1.
-OperationTreePanel.OpTooltip.sin=Returns the sine of a number.
-OperationTreePanel.OpTooltip.cos=Returns the cosine of a number.
-OperationTreePanel.OpTooltip.tan=Returns the tangent of a number.
-OperationTreePanel.OpTooltip.asin=Returns the arcsine of a number.
-OperationTreePanel.OpTooltip.acos=Returns the arccosine of a number.
-OperationTreePanel.OpTooltip.atan=Returns the arctangent of a number.
-OperationTreePanel.OpTooltip.exp=Calculates the exponent for basis e.
-OperationTreePanel.OpTooltip.ln=Calculates the natural logarithm of a number.
-OperationTreePanel.OpTooltip.log=Calculates the base-10 logarithm of a number.
-OperationTreePanel.OpTooltip.str=Converts a number to a text.
-OperationTreePanel.OpTooltip.val=Converts a text to a number.
-OperationTreePanel.OpTooltip.len=Calculates the length if a text string.
-OperationTreePanel.OpTooltip.toupper=Converts text to uppercase.
-OperationTreePanel.OpTooltip.tolower=Converts text to lowercase.
-OperationTreePanel.OpTooltip.ite=Specifies a logical test to be performed.
-OperationTreePanel.OpTooltip.regex=Performs regular-expressions operation on a text.
-OperationTreePanel.OpTooltip.substr=Returns only a part of a text.
-OperationTreePanel.OpTooltip.split=Returns the n-th result of a text split over a regular expression.
-OperationTreePanel.OpTooltip.str2millis=Converts a date from string to milliseconds
-OperationTreePanel.OpTooltip.date2millis=Converts a date to milliseconds
-OperationTreePanel.OpTooltip.millis2str=Converts milliseconds to a date string
-OperationTreePanel.OpTooltip.date2str=Converts a date to a date string
-OperationTreePanel.OpTooltip.day_millis=The value of a day in milliseconds
-OperationTreePanel.OpTooltip.week_millis=The value of a week in milliseconds
-OperationTreePanel.OpTooltip.plus=Addition
-OperationTreePanel.OpTooltip.minus=-Subtraction
-OperationTreePanel.OpTooltip.multiply=Multiplication
-OperationTreePanel.OpTooltip.divide=Division
-OperationTreePanel.OpTooltip.pow=Power - e.g. $VAL ^ 9
-OperationTreePanel.OpTooltip.eq=Equals - e.g. $VAL1 = 23
-OperationTreePanel.OpTooltip.ne=Unequals - e.g. $VAL <> 45
-OperationTreePanel.OpTooltip.lt=Lesser - e.g. $VAL < $VAL2
-OperationTreePanel.OpTooltip.le=Lesser or equal
-OperationTreePanel.OpTooltip.gt=Greater
-OperationTreePanel.OpTooltip.ge=Greater or equal
-OperationTreePanel.OpTooltip.X=Returns the raster cells X coordinate
-OperationTreePanel.OpTooltip.Y=Returns the raster cells Y coordinate
-OperationTreePanel.OpTooltip.NoData=Constant for the NoData value
-OperationTreePanel.OpTooltip.isNoData=Returns TRUE if cell contains no data.
-
-TranslationAskJDialog.Title=Please translate
-TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation = Sorry, but you must not use characters { and } in any text label.
-
-CancellableDialogAdapter.close.save.title=Save?
-CancellableDialogAdapter.close.save.msg=<html>Shall any changes in <center><b><i>${0}</i></b></center> be saved?</html>
-CancellableDialogAdapter.forceClose.save.msg=<html>The window <center><b><i>${0}</i></b></center> will be closed now.<br>Do you want to save any changes?</html>
-
-HeapMemoryBar.status =${0} (${1}%) of max. ${2}
-HeapMemoryBar.tt = An overview about current memory usage.
-
-
-CQLFitlerParser.OpDesc.and=AND
-CQLFitlerParser.OpDesc.or=OR
-CQLFitlerParser.OpDesc.not=NOT
-CQLFitlerParser.OpDesc.eq=\=
-CQLFitlerParser.OpDesc.like=LIKE
-CQLFitlerParser.OpDesc.ne=<>
-CQLFitlerParser.OpDesc.lt=<
-CQLFitlerParser.OpDesc.le=<=
-CQLFitlerParser.OpDesc.gt=>
-CQLFitlerParser.OpDesc.ge=>=
-
-CQLFitlerParser.OpTooltip.and=Returns TRUE only if both arguments is TRUE.
-CQLFitlerParser.OpTooltip.or=Returns TRUE is any argument is TRUE.
-CQLFitlerParser.OpTooltip.not=TRUE becomes FALSE, FALSE becomes TRUE.
-CQLFitlerParser.OpTooltip.eq=Equals for numbers - e.g. VAL1 = 23
-CQLFitlerParser.OpTooltip.like=Equals for texts- e.g. VAR2 LIKE 'BURGH%'. % is a wildcard for anything.
-CQLFitlerParser.OpTooltip.ne=Unequals - e.g. VAR <> 45
-CQLFitlerParser.OpTooltip.lt=Lesser - e.g. VAR < VAR2
-CQLFitlerParser.OpTooltip.le=Lesser or equal
-CQLFitlerParser.OpTooltip.gt=Greater
-CQLFitlerParser.OpTooltip.ge=Greater or equal
-
-ResourceProviderManagerFrame.Title=Language packs
-ResourceProviderManagerFrame.Bundle=Language bundle
-ResourceProviderManagerFrame.ExtentionOf=Extension of...
-ResourceProviderManagerFrame.RootLang=Root language
-ResourceProviderManagerFrame.AdditionalLang=Additional languages
-ResourceProviderManagerFrame.NewLang=Create new language files...
-ResourceProviderManagerFrame.UpdateLang=Update language files...
-ResourceProviderManagerFrame.OtherLang=<other language>
-ResourceProviderManagerFrame.Language=Language
-ResourceProviderManagerFrame.LanguageCode=Language code
-ResourceProviderManagerFrame.FinishMess=Property files successfully created...
-ResourceProviderManagerFrame.UpdateMess=${0} resource bundles updated...
-
-
-Menu.Logging=Logging...
-Menu.Logging.DEBUG=Log every message
-Menu.Logging.INFO=Log information, warning and errors
-Menu.Logging.WARN=Log warnings and errors
-Menu.Logging.ERROR=Log only errors
-Menu.Logging.OpenFile=Open ${0}
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focussing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# ---------------------------------------------------------------
+# ------ Default Translations (english) for GUI components ------
+# ------ in Package schmitzm.swing ------
+# ---------------------------------------------------------------
+
+Ok=Ok
+Cancel=Cancel
+Apply=Apply
+Ready=Ready
+Open=Open
+OpenFolder=Open folder
+Close=Close
+Save=Save
+WaitMess=Please wait...
+FileExists=File already exists
+Details=Details...
+Warning=Warning
+Error=Error
+Information=Information
+Class=Class
+Description=Description
+InvalidInputMess=Invalid input
+Refresh=Refresh
+Reload=Reload
+Clear=Clear
+Skip=Skip
+Overwrite=Overwrite
+OverwriteAll=Overwrite all
+Replace=Replace
+CreateDuplicate=Create duplicate
+RememberChoice=Remember this choice
+Rule=Rule
+RuleToolTip=Insert your arithmetical rule here...
+Operators=Operators
+Start=Start
+Calculate=Calculate
+
+ExceptionDialog.CopyToClipboard=Copy to clipboard
+ExceptionDialog.CopyToConsole=Copy to console
+ExceptionDialog.Mail=Mail
+ExceptionDialog.MailDisabled.Desc=Mailing currently not available, because a destination mail address for bug reporting is not set in this application (ExceptionDialog.setMailDestinationAddress(..))
+
+ManualInputOption.PasswordVisible.visibility=visible
+
+OperationTreePanel.OpDesc.and=AND
+OperationTreePanel.OpDesc.or=OR
+OperationTreePanel.OpDesc.not=NOT
+OperationTreePanel.OpDesc.abs=abs($NUMBER)
+OperationTreePanel.OpDesc.sqrt=sqrt($NUMBER)
+OperationTreePanel.OpDesc.round=round($NUMBER)
+OperationTreePanel.OpDesc.trunc=trunc($NUMBER)
+OperationTreePanel.OpDesc.isNaN=isNaN($NUMBER)
+OperationTreePanel.OpDesc.NaN=NaN
+OperationTreePanel.OpDesc.random=random number
+OperationTreePanel.OpDesc.sin=sin($NUMBER)
+OperationTreePanel.OpDesc.cos=cos($NUMBER)
+OperationTreePanel.OpDesc.tan=tan($NUMBER)
+OperationTreePanel.OpDesc.asin=arcsine($NUMBER)
+OperationTreePanel.OpDesc.acos=arccose($NUMBER)
+OperationTreePanel.OpDesc.atan=arctan($NUMBER)
+OperationTreePanel.OpDesc.exp=exp($NUMBER)
+OperationTreePanel.OpDesc.ln=ln($NUMBER)
+OperationTreePanel.OpDesc.log=log($NUMBER)
+OperationTreePanel.OpDesc.str=str($NUMBER)
+OperationTreePanel.OpDesc.val=val($TEXT)
+OperationTreePanel.OpDesc.len=len($TEXT)
+OperationTreePanel.OpDesc.toupper=toupper($TEXT)
+OperationTreePanel.OpDesc.tolower=tolower($TEXT)
+OperationTreePanel.OpDesc.ite=IF .. THEN .. ELSE
+OperationTreePanel.OpDesc.regex=REGEX( $TEXT , $REGEX)
+OperationTreePanel.OpDesc.substr=SUBSTRING( $TEXT , $NUMBER , $NUMBER)
+OperationTreePanel.OpDesc.split=SPLIT( $TEXT , $REGEX , $NUMBER)
+OperationTreePanel.OpDesc.str2millis=str2millis( $TEXT , $TEXT)
+OperationTreePanel.OpDesc.date2millis=date2millis( $YEAR, $MONTH, $DAY)
+OperationTreePanel.OpDesc.millis2str=millis2str( $NUMBER , $FORMAT)
+OperationTreePanel.OpDesc.date2str=date2millis( $YEAR, $MONTH, $DAY, $FORMAT)
+OperationTreePanel.OpDesc.day_millis=DAY_MILLIS
+OperationTreePanel.OpDesc.week_millis=WEEK_MILLIS
+OperationTreePanel.OpDesc.plus=+
+OperationTreePanel.OpDesc.minus=-
+OperationTreePanel.OpDesc.multiply=*
+OperationTreePanel.OpDesc.divide=/
+OperationTreePanel.OpDesc.pow=^
+OperationTreePanel.OpDesc.eq=\=
+OperationTreePanel.OpDesc.ne=<>
+OperationTreePanel.OpDesc.lt=<
+OperationTreePanel.OpDesc.le=<=
+OperationTreePanel.OpDesc.gt=>
+OperationTreePanel.OpDesc.ge=>=
+OperationTreePanel.OpDesc.X=Raster cell X
+OperationTreePanel.OpDesc.Y=Raster cell Y
+OperationTreePanel.OpDesc.NoData=NoData value
+OperationTreePanel.OpDesc.isNoData=isNoData(.)
+
+OperationTreePanel.OpTooltip.and=Returns TRUE only if both arguments is TRUE.
+OperationTreePanel.OpTooltip.or=Returns TRUE is any argument is TRUE.
+OperationTreePanel.OpTooltip.not=Reverses the value of the argument.
+OperationTreePanel.OpTooltip.abs=Absolute value of a number.
+OperationTreePanel.OpTooltip.sqrt=Returns the square root of a number.
+OperationTreePanel.OpTooltip.round=Rounds a number.
+OperationTreePanel.OpTooltip.trunc=Truncates the decimal places of a number.
+OperationTreePanel.OpTooltip.isNaN=Returns TRUE if value is not a number.
+OperationTreePanel.OpTooltip.NaN=The value of "NotANumber"
+OperationTreePanel.OpTooltip.random=Returns a random number between 0 and 1.
+OperationTreePanel.OpTooltip.sin=Returns the sine of a number.
+OperationTreePanel.OpTooltip.cos=Returns the cosine of a number.
+OperationTreePanel.OpTooltip.tan=Returns the tangent of a number.
+OperationTreePanel.OpTooltip.asin=Returns the arcsine of a number.
+OperationTreePanel.OpTooltip.acos=Returns the arccosine of a number.
+OperationTreePanel.OpTooltip.atan=Returns the arctangent of a number.
+OperationTreePanel.OpTooltip.exp=Calculates the exponent for basis e.
+OperationTreePanel.OpTooltip.ln=Calculates the natural logarithm of a number.
+OperationTreePanel.OpTooltip.log=Calculates the base-10 logarithm of a number.
+OperationTreePanel.OpTooltip.str=Converts a number to a text.
+OperationTreePanel.OpTooltip.val=Converts a text to a number.
+OperationTreePanel.OpTooltip.len=Calculates the length if a text string.
+OperationTreePanel.OpTooltip.toupper=Converts text to uppercase.
+OperationTreePanel.OpTooltip.tolower=Converts text to lowercase.
+OperationTreePanel.OpTooltip.ite=Specifies a logical test to be performed.
+OperationTreePanel.OpTooltip.regex=Performs regular-expressions operation on a text.
+OperationTreePanel.OpTooltip.substr=Returns only a part of a text.
+OperationTreePanel.OpTooltip.split=Returns the n-th result of a text split over a regular expression.
+OperationTreePanel.OpTooltip.str2millis=Converts a date from string to milliseconds
+OperationTreePanel.OpTooltip.date2millis=Converts a date to milliseconds
+OperationTreePanel.OpTooltip.millis2str=Converts milliseconds to a date string
+OperationTreePanel.OpTooltip.date2str=Converts a date to a date string
+OperationTreePanel.OpTooltip.day_millis=The value of a day in milliseconds
+OperationTreePanel.OpTooltip.week_millis=The value of a week in milliseconds
+OperationTreePanel.OpTooltip.plus=Addition
+OperationTreePanel.OpTooltip.minus=-Subtraction
+OperationTreePanel.OpTooltip.multiply=Multiplication
+OperationTreePanel.OpTooltip.divide=Division
+OperationTreePanel.OpTooltip.pow=Power - e.g. $VAL ^ 9
+OperationTreePanel.OpTooltip.eq=Equals - e.g. $VAL1 = 23
+OperationTreePanel.OpTooltip.ne=Unequals - e.g. $VAL <> 45
+OperationTreePanel.OpTooltip.lt=Lesser - e.g. $VAL < $VAL2
+OperationTreePanel.OpTooltip.le=Lesser or equal
+OperationTreePanel.OpTooltip.gt=Greater
+OperationTreePanel.OpTooltip.ge=Greater or equal
+OperationTreePanel.OpTooltip.X=Returns the raster cells X coordinate
+OperationTreePanel.OpTooltip.Y=Returns the raster cells Y coordinate
+OperationTreePanel.OpTooltip.NoData=Constant for the NoData value
+OperationTreePanel.OpTooltip.isNoData=Returns TRUE if cell contains no data.
+
+TranslationAskJDialog.Title=Please translate
+TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation = Sorry, but you must not use characters { and } in any text label.
+
+CancellableDialogAdapter.close.save.title=Save?
+CancellableDialogAdapter.close.save.msg=<html>Shall any changes in <center><b><i>${0}</i></b></center> be saved?</html>
+CancellableDialogAdapter.forceClose.save.msg=<html>The window <center><b><i>${0}</i></b></center> will be closed now.<br>Do you want to save any changes?</html>
+
+HeapMemoryBar.status =${0} (${1}%) of max. ${2}
+HeapMemoryBar.tt = An overview about current memory usage.
+
+
+CQLFitlerParser.OpDesc.and=AND
+CQLFitlerParser.OpDesc.or=OR
+CQLFitlerParser.OpDesc.not=NOT
+CQLFitlerParser.OpDesc.eq=\=
+CQLFitlerParser.OpDesc.like=LIKE
+CQLFitlerParser.OpDesc.ne=<>
+CQLFitlerParser.OpDesc.lt=<
+CQLFitlerParser.OpDesc.le=<=
+CQLFitlerParser.OpDesc.gt=>
+CQLFitlerParser.OpDesc.ge=>=
+
+CQLFitlerParser.OpTooltip.and=Returns TRUE only if both arguments is TRUE.
+CQLFitlerParser.OpTooltip.or=Returns TRUE is any argument is TRUE.
+CQLFitlerParser.OpTooltip.not=TRUE becomes FALSE, FALSE becomes TRUE.
+CQLFitlerParser.OpTooltip.eq=Equals for numbers - e.g. VAL1 = 23
+CQLFitlerParser.OpTooltip.like=Equals for texts- e.g. VAR2 LIKE 'BURGH%'. % is a wildcard for anything.
+CQLFitlerParser.OpTooltip.ne=Unequals - e.g. VAR <> 45
+CQLFitlerParser.OpTooltip.lt=Lesser - e.g. VAR < VAR2
+CQLFitlerParser.OpTooltip.le=Lesser or equal
+CQLFitlerParser.OpTooltip.gt=Greater
+CQLFitlerParser.OpTooltip.ge=Greater or equal
+
+ResourceProviderManagerFrame.Title=Language packs
+ResourceProviderManagerFrame.Bundle=Language bundle
+ResourceProviderManagerFrame.ExtentionOf=Extension of...
+ResourceProviderManagerFrame.RootLang=Root language
+ResourceProviderManagerFrame.AdditionalLang=Additional languages
+ResourceProviderManagerFrame.NewLang=Create new language files...
+ResourceProviderManagerFrame.UpdateLang=Update language files...
+ResourceProviderManagerFrame.OtherLang=<other language>
+ResourceProviderManagerFrame.Language=Language
+ResourceProviderManagerFrame.LanguageCode=Language code
+ResourceProviderManagerFrame.FinishMess=Property files successfully created...
+ResourceProviderManagerFrame.UpdateMess=${0} resource bundles updated...
+
+
+Menu.Logging=Logging...
+Menu.Logging.DEBUG=Log every message
+Menu.Logging.INFO=Log information, warning and errors
+Menu.Logging.WARN=Log warnings and errors
+Menu.Logging.ERROR=Log only errors
+Menu.Logging.OpenFile=Open ${0}
Modified: trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties
===================================================================
--- trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,223 +1,223 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focussing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Martin O. J. Schmitz - initial API and implementation
-# Stefan A. Tzeggai - additional utility classes
-##########
-# ----------------------------------------------------
-# ------ German Translations for GUI components ------
-# ------ in Package schmitzm.swing ------
-# ----------------------------------------------------
-
-Cancel=Abbrechen
-Apply=\u00DCbernehmen
-Ready=Fertig
-Open=\u00D6ffnen
-OpenFolder=Ordner \u00F6ffnen
-Close=Schliessen
-Save=Speichern
-WaitMess=Bitte warten...
-FileExists=Datei existiert bereits
-Warning=Warnung
-Error=Fehler
-Class=Klasse
-Description=Beschreibung
-InvalidInputMess=Unzul\u00E4ssige Eingabe
-Refresh=Aktualisieren
-Reload=Neu laden
-Clear=L\u00F6schen
-Skip=\u00DCbergehen
-Overwrite=\u00DCberschreiben
-OverwriteAll=Alle \u00FCberschreiben
-Replace=Ersetzen
-CreateDuplicate=Duplikat erzeugen
-RememberChoice=Immer diese Auswahl treffen
-Rule=Formel
-RuleToolTip=Hier eine arithmetische Formel eingeben...
-Operators=Operatoren
-Start=Start
-Calculate=Rechnen
-
-ExceptionDialog.CopyToClipboard=In die Zwischenablage
-ExceptionDialog.CopyToConsole=Auf Console ausgeben
-ExceptionDialog.Mail=Mailen
-ExceptionDialog.MailDisabled.Desc=Mailen derzeit nicht m\u00f6glich, da in der aktuellen Anwendung keine Ziel-Adresse f\u00fcr Bug-Reporting eingestellt ist (ExceptionDialog.setMailDestinationAddress(..))
-
-ManualInputOption.PasswordVisible.visibility=sichtbar
-
-OperationTreePanel.OpDesc.and=UND
-OperationTreePanel.OpDesc.or=ODER
-OperationTreePanel.OpDesc.not=NICHT
-OperationTreePanel.OpDesc.abs=abs($NUMBER)
-OperationTreePanel.OpDesc.random=Zufallszahl
-OperationTreePanel.OpDesc.asin=arcsin($NUMBER)
-OperationTreePanel.OpDesc.acos=arccos($NUMBER)
-
-OperationTreePanel.OpDesc.str=str($NUMBER)
-OperationTreePanel.OpDesc.val=val($TEXT)
-OperationTreePanel.OpDesc.len=len($TEXT)
-OperationTreePanel.OpDesc.toupper=toupper($TEXT)
-OperationTreePanel.OpDesc.tolower=tolower($TEXT)
-OperationTreePanel.OpDesc.ite=WENN .. DANN .. SONST ..
-
-OperationTreePanel.OpDesc.plus=+
-OperationTreePanel.OpDesc.minus=-
-OperationTreePanel.OpDesc.multiply=*
-OperationTreePanel.OpDesc.divide=/
-OperationTreePanel.OpDesc.pow=^
-OperationTreePanel.OpDesc.eq=\=
-OperationTreePanel.OpDesc.ne=<>
-OperationTreePanel.OpDesc.lt=<
-OperationTreePanel.OpDesc.le=<=
-OperationTreePanel.OpDesc.gt=>
-OperationTreePanel.OpDesc.ge=>=
-OperationTreePanel.OpDesc.X=X-Koordinate
-OperationTreePanel.OpDesc.Y=Y-Koordinate
-OperationTreePanel.OpDesc.NoData=NoData
-OperationTreePanel.OpDesc.isNoData=isNoData(.)
-
-OperationTreePanel.OpTooltip.and=Liefert WAHR, wenn beide Argumente WAHR sind.
-OperationTreePanel.OpTooltip.or=Liefert WAHR, sobald ein Argument WAHR ist.
-OperationTreePanel.OpTooltip.not=Invertiet WAHR zu FALSCH und FLASCH zu WAHR.
-OperationTreePanel.OpTooltip.abs=Absoluter Wert einer Zahl.
-OperationTreePanel.OpTooltip.sqrt=Liefert die Wurzel einer Zahl.
-OperationTreePanel.OpTooltip.round=Rundet eine Dezimal-Zahl zu einer Ganzzahl.
-OperationTreePanel.OpTooltip.trunc=Schneidet Nachkommastellen ab.
-OperationTreePanel.OpTooltip.isNaN=Liefert WAHR, wenn die Zahl "keine Zahl" ist (z.B. bei Division durch Null).
-OperationTreePanel.OpTooltip.NaN=Der Wert "keine Zahl".
-OperationTreePanel.OpTooltip.random=Liefert eine Zufallszahl zwischen 0 und 1.
-OperationTreePanel.OpTooltip.sin=Liefert den Sinus-Wert zu einer Zahl.
-OperationTreePanel.OpTooltip.cos=Liefert den Cosinus-Wert zu einer Zahl.
-OperationTreePanel.OpTooltip.tan=Liefert den Tangenz-Wert zu einer Zahl.
-OperationTreePanel.OpTooltip.asin=Liefert den Arcus-Sinus-Wert zu einer Zahl.
-OperationTreePanel.OpTooltip.acos=Liefert den Arcus-Cosinus-Wert zu einer Zahl.
-OperationTreePanel.OpTooltip.atan=Liefert den Arcus-Tangens-Wert zu einer Zahl.
-OperationTreePanel.OpTooltip.exp=Berechnet die Exponenzialfunktion (e^x).
-OperationTreePanel.OpTooltip.ln=Berechnet die Logarithmus-Funktion zur Basis e.
-OperationTreePanel.OpTooltip.log=Berechnet die Logarithmus-Funktion zur Basis 10.
-OperationTreePanel.OpTooltip.str=Konvertiert eine Zahl in einen Text.
-OperationTreePanel.OpTooltip.val=Konvertiert einen Text in eine Zahl.
-OperationTreePanel.OpTooltip.len=Berechnet die L\u00E4nge eines Texts.
-OperationTreePanel.OpTooltip.toupper=Konvertiert Text in Gro\u00DFbuchstaben.
-OperationTreePanel.OpTooltip.tolower=Konvertiert Text in Kleinbuchstaben.
-OperationTreePanel.OpTooltip.ite=Spezifiziert einen logischen Test.
-OperationTreePanel.OpTooltip.regex=Wertet einen regul\u00E4ren Ausdruck auf einem Text aus.
-OperationTreePanel.OpTooltip.substr=Liefert einen Teil-String.
-OperationTreePanel.OpTooltip.split=Liefert das n-te Ergebnis eines Text-Split \u00FCber einem regul\u00E4ren Ausdruck
-OperationTreePanel.OpTooltip.str2millis=Konvertiert einen Datum-Text in Millisekunden
-OperationTreePanel.OpTooltip.date2millis=Konvertiert ein Datum in Millisekunden
-OperationTreePanel.OpTooltip.millis2str=Konvertiert Millisekunden in einen Datum-Text
-OperationTreePanel.OpTooltip.date2str=Konvertiert ein Datum in einen Datum-Text
-OperationTreePanel.OpTooltip.day_millis=Ein Tag in Millisekunden
-OperationTreePanel.OpTooltip.week_millis=Eine Woche in Millisekunden
-OperationTreePanel.OpTooltip.plus=Addition
-OperationTreePanel.OpTooltip.minus=Subtraktion
-OperationTreePanel.OpTooltip.multiply=Multiplikation
-OperationTreePanel.OpTooltip.divide=Division
-OperationTreePanel.OpTooltip.pow=Potenzfunktion
-OperationTreePanel.OpTooltip.eq=Gleich
-OperationTreePanel.OpTooltip.ne=Ungleich
-OperationTreePanel.OpTooltip.lt=Kleiner als
-OperationTreePanel.OpTooltip.le=Kleiner oder gleich
-OperationTreePanel.OpTooltip.gt=Gr\u00F6\u00DFer als
-OperationTreePanel.OpTooltip.ge=Gr\u00F6\u00DFer oder gleich
-OperationTreePanel.OpTooltip.X=Liefert die X-Koordinate einer Zelle (in Raster-Koordinaten)
-OperationTreePanel.OpTooltip.Y=Liefert die Y-Koordinate einer Zelle (in Raster-Koordinaten)
-OperationTreePanel.OpTooltip.NoData=Liefert den "NoData"-Wert
-OperationTreePanel.OpTooltip.isNoData=Liefert WAHR, wenn die Zelle keinen Wert beinhaltet
-
-TranslationAskJDialog.Title=Bitte \u00FCbersetzen
-TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation = Die Zeichen { und } d\u00FCrfen Sie leider nicht benutzen.
-
-
-CancellableDialogAdapter.close.save.title=Speichern?
-CancellableDialogAdapter.close.save.msg=<html>Wollen Sie eventuelle \u00C4nderungen an <center><b><i>${0}</i></b></center> speichern?</html>
-CancellableDialogAdapter.forceClose.save.msg=<html>Das Fenster <center><b><i>${0}</i></b></center> muss nun gesclossen werden. Wollen Sie eventuelle \u00C4nderungen speichern?</html>
-
-HeapMemoryBar.status =${0} (${1}%) von max. ${2}
-HeapMemoryBar.tt = Eine \u00DCbersicht \u00FCber den aktuellen Speicherverbrauch der Anwendung.
-
-
-CQLFitlerParser.OpDesc.and=AND
-CQLFitlerParser.OpDesc.or=OR
-CQLFitlerParser.OpDesc.not=NOT
-CQLFitlerParser.OpDesc.eq=\=
-CQLFitlerParser.OpDesc.like=LIKE
-CQLFitlerParser.OpDesc.ne=<>
-CQLFitlerParser.OpDesc.lt=<
-CQLFitlerParser.OpDesc.le=<=
-CQLFitlerParser.OpDesc.gt=>
-CQLFitlerParser.OpDesc.ge=>=
-
-CQLFitlerParser.OpTooltip.and=Liefert WAHR, wenn beide Argumente WAHR sind.
-CQLFitlerParser.OpTooltip.or=Liefert WAHR, sobald ein Argument WAHR ist.
-CQLFitlerParser.OpTooltip.not=Invertiet WAHR zu FALSCH und FLASCH zu WAHR.
-CQLFitlerParser.OpTooltip.eq=Vergleich zweier Zahlen - z.B. VAL1 = 23
-CQLFitlerParser.OpTooltip.like=Vergleich zweier Texte, z.B. VAR2 LIKE 'BURGH%'. Achtung: % is ein Platzhalter!
-CQLFitlerParser.OpTooltip.ne=Zwei Zahlen sind ungleich. z.B. VAR <> 45
-CQLFitlerParser.OpTooltip.lt=Kleiner als, z.B. VAR < VAR2
-CQLFitlerParser.OpTooltip.le=Kleiner oder gleich, z.B. VAR < VAR2
-CQLFitlerParser.OpTooltip.gt=Gr\u00F6\u00DFer
-CQLFitlerParser.OpTooltip.ge=Gr\u00F6\u00DFer oder gleich
-
-ResourceProviderManagerFrame.Title=Sprach-Pakete
-ResourceProviderManagerFrame.Bundle=Sprach Paket
-ResourceProviderManagerFrame.ExtentionOf=Erweiterung von...
-ResourceProviderManagerFrame.RootLang=Standard Sprache
-ResourceProviderManagerFrame.AdditionalLang=Weitere Sprachen
-ResourceProviderManagerFrame.NewLang=Neue Sprachdateien anlegen...
-ResourceProviderManagerFrame.UpdateLang=Sprachdateien aktualisieren...
-ResourceProviderManagerFrame.OtherLang=<andere Sprache>
-ResourceProviderManagerFrame.Language=Sprache
-ResourceProviderManagerFrame.LanguageCode=Sprachcode
-ResourceProviderManagerFrame.FinishMess=Property-Dateien erfolgreich erstellt...
-ResourceProviderManagerFrame.UpdateMess=${0} Sprach-Pakete aktualisiert...
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focussing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Martin O. J. Schmitz - initial API and implementation
+# Stefan A. Tzeggai - additional utility classes
+##########
+# ----------------------------------------------------
+# ------ German Translations for GUI components ------
+# ------ in Package schmitzm.swing ------
+# ----------------------------------------------------
+
+Cancel=Abbrechen
+Apply=\u00DCbernehmen
+Ready=Fertig
+Open=\u00D6ffnen
+OpenFolder=Ordner \u00F6ffnen
+Close=Schliessen
+Save=Speichern
+WaitMess=Bitte warten...
+FileExists=Datei existiert bereits
+Warning=Warnung
+Error=Fehler
+Class=Klasse
+Description=Beschreibung
+InvalidInputMess=Unzul\u00E4ssige Eingabe
+Refresh=Aktualisieren
+Reload=Neu laden
+Clear=L\u00F6schen
+Skip=\u00DCbergehen
+Overwrite=\u00DCberschreiben
+OverwriteAll=Alle \u00FCberschreiben
+Replace=Ersetzen
+CreateDuplicate=Duplikat erzeugen
+RememberChoice=Immer diese Auswahl treffen
+Rule=Formel
+RuleToolTip=Hier eine arithmetische Formel eingeben...
+Operators=Operatoren
+Start=Start
+Calculate=Rechnen
+
+ExceptionDialog.CopyToClipboard=In die Zwischenablage
+ExceptionDialog.CopyToConsole=Auf Console ausgeben
+ExceptionDialog.Mail=Mailen
+ExceptionDialog.MailDisabled.Desc=Mailen derzeit nicht m\u00f6glich, da in der aktuellen Anwendung keine Ziel-Adresse f\u00fcr Bug-Reporting eingestellt ist (ExceptionDialog.setMailDestinationAddress(..))
+
+ManualInputOption.PasswordVisible.visibility=sichtbar
+
+OperationTreePanel.OpDesc.and=UND
+OperationTreePanel.OpDesc.or=ODER
+OperationTreePanel.OpDesc.not=NICHT
+OperationTreePanel.OpDesc.abs=abs($NUMBER)
+OperationTreePanel.OpDesc.random=Zufallszahl
+OperationTreePanel.OpDesc.asin=arcsin($NUMBER)
+OperationTreePanel.OpDesc.acos=arccos($NUMBER)
+
+OperationTreePanel.OpDesc.str=str($NUMBER)
+OperationTreePanel.OpDesc.val=val($TEXT)
+OperationTreePanel.OpDesc.len=len($TEXT)
+OperationTreePanel.OpDesc.toupper=toupper($TEXT)
+OperationTreePanel.OpDesc.tolower=tolower($TEXT)
+OperationTreePanel.OpDesc.ite=WENN .. DANN .. SONST ..
+
+OperationTreePanel.OpDesc.plus=+
+OperationTreePanel.OpDesc.minus=-
+OperationTreePanel.OpDesc.multiply=*
+OperationTreePanel.OpDesc.divide=/
+OperationTreePanel.OpDesc.pow=^
+OperationTreePanel.OpDesc.eq=\=
+OperationTreePanel.OpDesc.ne=<>
+OperationTreePanel.OpDesc.lt=<
+OperationTreePanel.OpDesc.le=<=
+OperationTreePanel.OpDesc.gt=>
+OperationTreePanel.OpDesc.ge=>=
+OperationTreePanel.OpDesc.X=X-Koordinate
+OperationTreePanel.OpDesc.Y=Y-Koordinate
+OperationTreePanel.OpDesc.NoData=NoData
+OperationTreePanel.OpDesc.isNoData=isNoData(.)
+
+OperationTreePanel.OpTooltip.and=Liefert WAHR, wenn beide Argumente WAHR sind.
+OperationTreePanel.OpTooltip.or=Liefert WAHR, sobald ein Argument WAHR ist.
+OperationTreePanel.OpTooltip.not=Invertiet WAHR zu FALSCH und FLASCH zu WAHR.
+OperationTreePanel.OpTooltip.abs=Absoluter Wert einer Zahl.
+OperationTreePanel.OpTooltip.sqrt=Liefert die Wurzel einer Zahl.
+OperationTreePanel.OpTooltip.round=Rundet eine Dezimal-Zahl zu einer Ganzzahl.
+OperationTreePanel.OpTooltip.trunc=Schneidet Nachkommastellen ab.
+OperationTreePanel.OpTooltip.isNaN=Liefert WAHR, wenn die Zahl "keine Zahl" ist (z.B. bei Division durch Null).
+OperationTreePanel.OpTooltip.NaN=Der Wert "keine Zahl".
+OperationTreePanel.OpTooltip.random=Liefert eine Zufallszahl zwischen 0 und 1.
+OperationTreePanel.OpTooltip.sin=Liefert den Sinus-Wert zu einer Zahl.
+OperationTreePanel.OpTooltip.cos=Liefert den Cosinus-Wert zu einer Zahl.
+OperationTreePanel.OpTooltip.tan=Liefert den Tangenz-Wert zu einer Zahl.
+OperationTreePanel.OpTooltip.asin=Liefert den Arcus-Sinus-Wert zu einer Zahl.
+OperationTreePanel.OpTooltip.acos=Liefert den Arcus-Cosinus-Wert zu einer Zahl.
+OperationTreePanel.OpTooltip.atan=Liefert den Arcus-Tangens-Wert zu einer Zahl.
+OperationTreePanel.OpTooltip.exp=Berechnet die Exponenzialfunktion (e^x).
+OperationTreePanel.OpTooltip.ln=Berechnet die Logarithmus-Funktion zur Basis e.
+OperationTreePanel.OpTooltip.log=Berechnet die Logarithmus-Funktion zur Basis 10.
+OperationTreePanel.OpTooltip.str=Konvertiert eine Zahl in einen Text.
+OperationTreePanel.OpTooltip.val=Konvertiert einen Text in eine Zahl.
+OperationTreePanel.OpTooltip.len=Berechnet die L\u00E4nge eines Texts.
+OperationTreePanel.OpTooltip.toupper=Konvertiert Text in Gro\u00DFbuchstaben.
+OperationTreePanel.OpTooltip.tolower=Konvertiert Text in Kleinbuchstaben.
+OperationTreePanel.OpTooltip.ite=Spezifiziert einen logischen Test.
+OperationTreePanel.OpTooltip.regex=Wertet einen regul\u00E4ren Ausdruck auf einem Text aus.
+OperationTreePanel.OpTooltip.substr=Liefert einen Teil-String.
+OperationTreePanel.OpTooltip.split=Liefert das n-te Ergebnis eines Text-Split \u00FCber einem regul\u00E4ren Ausdruck
+OperationTreePanel.OpTooltip.str2millis=Konvertiert einen Datum-Text in Millisekunden
+OperationTreePanel.OpTooltip.date2millis=Konvertiert ein Datum in Millisekunden
+OperationTreePanel.OpTooltip.millis2str=Konvertiert Millisekunden in einen Datum-Text
+OperationTreePanel.OpTooltip.date2str=Konvertiert ein Datum in einen Datum-Text
+OperationTreePanel.OpTooltip.day_millis=Ein Tag in Millisekunden
+OperationTreePanel.OpTooltip.week_millis=Eine Woche in Millisekunden
+OperationTreePanel.OpTooltip.plus=Addition
+OperationTreePanel.OpTooltip.minus=Subtraktion
+OperationTreePanel.OpTooltip.multiply=Multiplikation
+OperationTreePanel.OpTooltip.divide=Division
+OperationTreePanel.OpTooltip.pow=Potenzfunktion
+OperationTreePanel.OpTooltip.eq=Gleich
+OperationTreePanel.OpTooltip.ne=Ungleich
+OperationTreePanel.OpTooltip.lt=Kleiner als
+OperationTreePanel.OpTooltip.le=Kleiner oder gleich
+OperationTreePanel.OpTooltip.gt=Gr\u00F6\u00DFer als
+OperationTreePanel.OpTooltip.ge=Gr\u00F6\u00DFer oder gleich
+OperationTreePanel.OpTooltip.X=Liefert die X-Koordinate einer Zelle (in Raster-Koordinaten)
+OperationTreePanel.OpTooltip.Y=Liefert die Y-Koordinate einer Zelle (in Raster-Koordinaten)
+OperationTreePanel.OpTooltip.NoData=Liefert den "NoData"-Wert
+OperationTreePanel.OpTooltip.isNoData=Liefert WAHR, wenn die Zelle keinen Wert beinhaltet
+
+TranslationAskJDialog.Title=Bitte \u00FCbersetzen
+TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation = Die Zeichen { und } d\u00FCrfen Sie leider nicht benutzen.
+
+
+CancellableDialogAdapter.close.save.title=Speichern?
+CancellableDialogAdapter.close.save.msg=<html>Wollen Sie eventuelle \u00C4nderungen an <center><b><i>${0}</i></b></center> speichern?</html>
+CancellableDialogAdapter.forceClose.save.msg=<html>Das Fenster <center><b><i>${0}</i></b></center> muss nun gesclossen werden. Wollen Sie eventuelle \u00C4nderungen speichern?</html>
+
+HeapMemoryBar.status =${0} (${1}%) von max. ${2}
+HeapMemoryBar.tt = Eine \u00DCbersicht \u00FCber den aktuellen Speicherverbrauch der Anwendung.
+
+
+CQLFitlerParser.OpDesc.and=AND
+CQLFitlerParser.OpDesc.or=OR
+CQLFitlerParser.OpDesc.not=NOT
+CQLFitlerParser.OpDesc.eq=\=
+CQLFitlerParser.OpDesc.like=LIKE
+CQLFitlerParser.OpDesc.ne=<>
+CQLFitlerParser.OpDesc.lt=<
+CQLFitlerParser.OpDesc.le=<=
+CQLFitlerParser.OpDesc.gt=>
+CQLFitlerParser.OpDesc.ge=>=
+
+CQLFitlerParser.OpTooltip.and=Liefert WAHR, wenn beide Argumente WAHR sind.
+CQLFitlerParser.OpTooltip.or=Liefert WAHR, sobald ein Argument WAHR ist.
+CQLFitlerParser.OpTooltip.not=Invertiet WAHR zu FALSCH und FLASCH zu WAHR.
+CQLFitlerParser.OpTooltip.eq=Vergleich zweier Zahlen - z.B. VAL1 = 23
+CQLFitlerParser.OpTooltip.like=Vergleich zweier Texte, z.B. VAR2 LIKE 'BURGH%'. Achtung: % is ein Platzhalter!
+CQLFitlerParser.OpTooltip.ne=Zwei Zahlen sind ungleich. z.B. VAR <> 45
+CQLFitlerParser.OpTooltip.lt=Kleiner als, z.B. VAR < VAR2
+CQLFitlerParser.OpTooltip.le=Kleiner oder gleich, z.B. VAR < VAR2
+CQLFitlerParser.OpTooltip.gt=Gr\u00F6\u00DFer
+CQLFitlerParser.OpTooltip.ge=Gr\u00F6\u00DFer oder gleich
+
+ResourceProviderManagerFrame.Title=Sprach-Pakete
+ResourceProviderManagerFrame.Bundle=Sprach Paket
+ResourceProviderManagerFrame.ExtentionOf=Erweiterung von...
+ResourceProviderManagerFrame.RootLang=Standard Sprache
+ResourceProviderManagerFrame.AdditionalLang=Weitere Sprachen
+ResourceProviderManagerFrame.NewLang=Neue Sprachdateien anlegen...
+ResourceProviderManagerFrame.UpdateLang=Sprachdateien aktualisieren...
+ResourceProviderManagerFrame.OtherLang=<andere Sprache>
+ResourceProviderManagerFrame.Language=Sprache
+ResourceProviderManagerFrame.LanguageCode=Sprachcode
+ResourceProviderManagerFrame.FinishMess=Property-Dateien erfolgreich erstellt...
+ResourceProviderManagerFrame.UpdateMess=${0} Sprach-Pakete aktualisiert...
Modified: trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_it.properties
===================================================================
--- trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_it.properties 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_it.properties 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,207 +1,207 @@
-##########
-#Copyright (c) 2009 Martin O. J. Schmitz.
-#
-#This file is part of the SCHMITZM library - a collection of utility
-#classes based on Java 1.6, focusing (not only) on Java Swing
-#and the Geotools library.
-#
-#The SCHMITZM project is hosted at:
-#http://wald.intevation.org/projects/schmitzm/
-#
-#This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU Lesser General Public License
-#as published by the Free Software Foundation; either version 3
-#of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU Lesser General Public License (license.txt)
-#along with this program; if not, write to the Free Software
-#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#or try this link: http://www.gnu.org/licenses/lgpl.html
-#
-#Contributors:
-# Annica Sahlin
-##########
-
-# -----------------------------------------------------
-# ------ Italian Translations for GUI components ------
-# ------ in Package schmitzm.swing ------
-# -----------------------------------------------------
-Apply=Applica
-CQLFitlerParser.OpDesc.and= AND
-CQLFitlerParser.OpDesc.eq==
-CQLFitlerParser.OpDesc.ge=>=
-CQLFitlerParser.OpDesc.gt=>
-CQLFitlerParser.OpDesc.le=<=
-CQLFitlerParser.OpDesc.like=LIKE
-CQLFitlerParser.OpDesc.lt=<
-CQLFitlerParser.OpDesc.ne=<>
-CQLFitlerParser.OpDesc.not=NOT
-CQLFitlerParser.OpDesc.or=OR
-CQLFitlerParser.OpTooltip.and=Risulta VERO/TRUE solo nel caso in cui entrambi argumenti siano VERE/TRUE.
-CQLFitlerParser.OpTooltip.eq=Equals for numbers/Uguale a - ad es. VAL1 = 23
-CQLFitlerParser.OpTooltip.ge=Maggiore di o uguale a
-CQLFitlerParser.OpTooltip.gt=Maggiore di
-CQLFitlerParser.OpTooltip.le=Minore di o uguale a
-CQLFitlerParser.OpTooltip.like=Equals for texts- ad es. VAR2 LIKE 'BURGH%'. % is a wildcard for anything.
-CQLFitlerParser.OpTooltip.lt=Minore di - e.g. VAR < VAR2
-CQLFitlerParser.OpTooltip.ne=Non uguale a - ad es. VAR <> 45
-CQLFitlerParser.OpTooltip.not=VERO/TRUE diventa FALSO/FALSE, FALSO/FALSE diventa VERO/TRUE.
-CQLFitlerParser.OpTooltip.or=Risulta VERO/TRUE nel caso in cui qualsiasi argomento sia VERO/TRUE.
-Calculate=Calcola
-Cancel=Cancella
-CancellableDialogAdapter.close.save.msg=<html>Salvare le modifiche in <center><b><i>${0}</i></b></center>?</html>
-CancellableDialogAdapter.close.save.title=Salva?
-CancellableDialogAdapter.forceClose.save.msg=<html>La finestra di dialogo<center><b><i>${0}</i></b></center> sar\u00e0 chiusa.<br>Vuoi salvare le modifiche?</html>
-Class=Classe
-Clear=Clear
-Close=Chiudi
-CreateDuplicate=Crea duplicato
-Description=Descrizione
-Details=Dettagli...
-Error=Errore
-ExceptionDialog.CopyToClipboard=Copia negli appunti
-ExceptionDialog.CopyToConsole=Copia a console
-FileExists=File esiste gi\u00e0\u00a0
-HeapMemoryBar.status=${0} (${1}%) of max. ${2}
-HeapMemoryBar.tt=Memoria attualmente in uso.
-Information=Informazioni
-InvalidInputMess=Input non valido
-Ok=Ok
-Open=Apri
-OpenFolder=Apri cartella
-OperationTreePanel.OpDesc.ITE=IF .. THEN .. ELSE
-OperationTreePanel.OpDesc.NaN=NaN
-OperationTreePanel.OpDesc.NoData=NoData value
-OperationTreePanel.OpDesc.REGEX=REGEX( $TEXT , REGEX)
-OperationTreePanel.OpDesc.SUBSTR=SUBSTRING( $TEXT , $NUMBER , $NUMBER)
-OperationTreePanel.OpDesc.X=Raster cell X
-OperationTreePanel.OpDesc.Y=Raster cell Y
-OperationTreePanel.OpDesc.abs=abs($NUMBER)
-OperationTreePanel.OpDesc.acos=arccose($NUMBER)
-OperationTreePanel.OpDesc.and=AND
-OperationTreePanel.OpDesc.asin=arcsine($NUMBER)
-OperationTreePanel.OpDesc.atan=arctan($NUMBER)
-OperationTreePanel.OpDesc.cos=cos($NUMBER)
-OperationTreePanel.OpDesc.date2millis= date2millis( $YEAR, $MONTH, $DAY)
-OperationTreePanel.OpDesc.date2str= date2millis( $YEAR, $MONTH, $DAY, $FORMAT)
-OperationTreePanel.OpDesc.day_millis= DAY_MILLIS
-OperationTreePanel.OpDesc.divide= /
-OperationTreePanel.OpDesc.eq= =
-OperationTreePanel.OpDesc.exp=exp($NUMBER)
-OperationTreePanel.OpDesc.ge=>=
-OperationTreePanel.OpDesc.gt= >
-OperationTreePanel.OpDesc.isNaN=isNaN($NUMBER)
-OperationTreePanel.OpDesc.isNoData=isNoData(.)
-OperationTreePanel.OpDesc.ite=IF .. THEN .. ELSE
-OperationTreePanel.OpDesc.le=<=
-OperationTreePanel.OpDesc.len=len($TEXT)
-OperationTreePanel.OpDesc.ln=ln($NUMBER)
-OperationTreePanel.OpDesc.log=log($NUMBER)
-OperationTreePanel.OpDesc.lt=<
-OperationTreePanel.OpDesc.millis2str= millis2str( $NUMBER , $FORMAT)
-OperationTreePanel.OpDesc.minus= -
-OperationTreePanel.OpDesc.multiply= *
-OperationTreePanel.OpDesc.ne= <>
-OperationTreePanel.OpDesc.not= NOT
-OperationTreePanel.OpDesc.or=OR
-OperationTreePanel.OpDesc.plus= +
-OperationTreePanel.OpDesc.pow= ^
-OperationTreePanel.OpDesc.random= random number
-OperationTreePanel.OpDesc.regex= REGEX( $TEXT , $REGEX)
-OperationTreePanel.OpDesc.round= round($NUMBER)
-OperationTreePanel.OpDesc.sin= sin($NUMBER)
-OperationTreePanel.OpDesc.split= SPLIT( $TEXT , $REGEX , $NUMBER)
-OperationTreePanel.OpDesc.sqrt= sqrt($NUMBER)
-OperationTreePanel.OpDesc.str= str($NUMBER)
-OperationTreePanel.OpDesc.str2millis= str2millis( $TEXT , $TEXT)
-OperationTreePanel.OpDesc.substr= SUBSTRING( $TEXT , $NUMBER , $NUMBER)
-OperationTreePanel.OpDesc.tan= tan($NUMBER)
-OperationTreePanel.OpDesc.tolower= tolower($TEXT)
-OperationTreePanel.OpDesc.toupper= toupper($TEXT)
-OperationTreePanel.OpDesc.trunc= trunc($NUMBER)
-OperationTreePanel.OpDesc.val= val($TEXT)
-OperationTreePanel.OpDesc.week_millis= WEEK_MILLIS
-OperationTreePanel.OpTooltip.NaN= The value of "NotANumber"
-OperationTreePanel.OpTooltip.NoData= Constant for the NoData value
-OperationTreePanel.OpTooltip.X= Riporta la coordinata X della cella del raster
-OperationTreePanel.OpTooltip.Y= Riporta la coordinata Y della cella del raster
-OperationTreePanel.OpTooltip.abs= Valore assoluto di un numero.
-OperationTreePanel.OpTooltip.acos= Riporta l'arcoseno di un numero.
-OperationTreePanel.OpTooltip.and= Risulta VERO/TRUE solo nel caso in cui entrambi argomenti siano VERI/TRUE.
-OperationTreePanel.OpTooltip.asin= Riporta l'arcoseno di un numero.
-OperationTreePanel.OpTooltip.atan= Riporta l'arcotangente di un numero.
-OperationTreePanel.OpTooltip.cos= Riporta il coseno di un numero.
-OperationTreePanel.OpTooltip.date2millis= Converte una data in millisecondi.
-OperationTreePanel.OpTooltip.date2str= Converte una data in una stringa di data
-OperationTreePanel.OpTooltip.day_millis= Il valore di un giorno espresso in millisecondi
-OperationTreePanel.OpTooltip.divide= Divisione
-OperationTreePanel.OpTooltip.eq= Equals/Uguale a - ad es. $VAL1 = 23
-OperationTreePanel.OpTooltip.exp=Calcola l'esponente di base e.
-OperationTreePanel.OpTooltip.ge= Maggiore di o uguale a
-OperationTreePanel.OpTooltip.gt= Maggiore di
-OperationTreePanel.OpTooltip.isNaN= Risulta VERO/TRUE se il valore non \u00e8 un numero.
-OperationTreePanel.OpTooltip.isNoData= Risulta VERO/TRUE se la cella contiene no data.
-OperationTreePanel.OpTooltip.ite= Specifica un test logico da eseguire.
-OperationTreePanel.OpTooltip.le= Minore di o uguale a
-OperationTreePanel.OpTooltip.len= Calcola la lunghezza di una stringa di testo.
-OperationTreePanel.OpTooltip.ln= Calcola il logaritmo naturale di un numero.
-OperationTreePanel.OpTooltip.log= Calcola il logaritmo di base-10 di un numero.
-OperationTreePanel.OpTooltip.lt= Minore di- ad es. $VAL < $VAL2
-OperationTreePanel.OpTooltip.millis2str= Converte millisecondi in una stringa di data
-OperationTreePanel.OpTooltip.minus= -Sottrazione
-OperationTreePanel.OpTooltip.multiply= Multiplicazione
-OperationTreePanel.OpTooltip.ne=Unequals/Non uguale a - e.g. $VAL <> 45
-OperationTreePanel.OpTooltip.not= Rovescia il valore dell'argomento.
-OperationTreePanel.OpTooltip.or= Risulta VERO/TRUE nel caso in cui qualsiasi argomento sia VEO/TRUE.
-OperationTreePanel.OpTooltip.plus= Addizione
-OperationTreePanel.OpTooltip.pow= Power - ad es. $VAL ^ 9
-OperationTreePanel.OpTooltip.random= Riporta un numero random compreso tra 0 and 1.
-OperationTreePanel.OpTooltip.regex= Esegue operazione regular-expressions su un testo.
-OperationTreePanel.OpTooltip.round= Arrotonda un numero.
-OperationTreePanel.OpTooltip.sin= Riporta il seno di un numero.
-OperationTreePanel.OpTooltip.split= Returns the n-th result of a text split over a regular expression.
-OperationTreePanel.OpTooltip.sqrt= Riporta la radice quadrata di un numero.
-OperationTreePanel.OpTooltip.str= Converte un numero in testo.
-OperationTreePanel.OpTooltip.str2millis= Converte una data da stringa in millisecondi
-OperationTreePanel.OpTooltip.substr= Riporta soltanto una parte di un testo.
-OperationTreePanel.OpTooltip.tan= Riporta il tangente di un numero.
-OperationTreePanel.OpTooltip.tolower= Converte testo in caratteri minuscoli.
-OperationTreePanel.OpTooltip.toupper= Converte testo in caratteri maiuscoli.
-OperationTreePanel.OpTooltip.trunc= Tronca i decimali di un numero.
-OperationTreePanel.OpTooltip.val= Converte un testo in un numero.
-OperationTreePanel.OpTooltip.week_millis= Il valore di una settimana espresso in millisecondi
-Operators=Operatori
-Overwrite=Sovrascrivere
-OverwriteAll=Sovrascrivere tutto
-Ready= Pronto
-Refresh=Aggiorna
-Reload= Ricarica
-RememberChoice= Ricorda questa selezione
-Replace= Sostituire
-ResourceProviderManagerFrame.AdditionalLang=Lingue addizionali
-ResourceProviderManagerFrame.Bundle= Fascia di lingue
-ResourceProviderManagerFrame.ExtentionOf=Estensione di...
-ResourceProviderManagerFrame.FinishMess= File di propriet\u00e0 creati con successo...
-ResourceProviderManagerFrame.Language= Lingua
-ResourceProviderManagerFrame.LanguageCode= Codice lingua
-ResourceProviderManagerFrame.NewLang= Crea nuovi files di lingua...
-ResourceProviderManagerFrame.OtherLang= <altra lingua>
-ResourceProviderManagerFrame.RootLang=Root language
-ResourceProviderManagerFrame.Title= Language packs
-ResourceProviderManagerFrame.UpdateLang= Aggiorna files di lingua...
-ResourceProviderManagerFrame.UpdateMess= ${0} resource bundles updated...
-Rule=Regola
-RuleToolTip=Inserisci regola aritmetica qui...
-Save= Salva
-Skip= Elimina
-Start= Avvio
-TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation= Spiaciente, ma non puoi usare caratteri { and } nell'etichetta.
-TranslationAskJDialog.Title=Tradurre prego
-WaitMess= Attendere prego...
-Warning= Attenzione
-
+##########
+#Copyright (c) 2009 Martin O. J. Schmitz.
+#
+#This file is part of the SCHMITZM library - a collection of utility
+#classes based on Java 1.6, focusing (not only) on Java Swing
+#and the Geotools library.
+#
+#The SCHMITZM project is hosted at:
+#http://wald.intevation.org/projects/schmitzm/
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU Lesser General Public License
+#as published by the Free Software Foundation; either version 3
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU Lesser General Public License (license.txt)
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#or try this link: http://www.gnu.org/licenses/lgpl.html
+#
+#Contributors:
+# Annica Sahlin
+##########
+
+# -----------------------------------------------------
+# ------ Italian Translations for GUI components ------
+# ------ in Package schmitzm.swing ------
+# -----------------------------------------------------
+Apply=Applica
+CQLFitlerParser.OpDesc.and= AND
+CQLFitlerParser.OpDesc.eq==
+CQLFitlerParser.OpDesc.ge=>=
+CQLFitlerParser.OpDesc.gt=>
+CQLFitlerParser.OpDesc.le=<=
+CQLFitlerParser.OpDesc.like=LIKE
+CQLFitlerParser.OpDesc.lt=<
+CQLFitlerParser.OpDesc.ne=<>
+CQLFitlerParser.OpDesc.not=NOT
+CQLFitlerParser.OpDesc.or=OR
+CQLFitlerParser.OpTooltip.and=Risulta VERO/TRUE solo nel caso in cui entrambi argumenti siano VERE/TRUE.
+CQLFitlerParser.OpTooltip.eq=Equals for numbers/Uguale a - ad es. VAL1 = 23
+CQLFitlerParser.OpTooltip.ge=Maggiore di o uguale a
+CQLFitlerParser.OpTooltip.gt=Maggiore di
+CQLFitlerParser.OpTooltip.le=Minore di o uguale a
+CQLFitlerParser.OpTooltip.like=Equals for texts- ad es. VAR2 LIKE 'BURGH%'. % is a wildcard for anything.
+CQLFitlerParser.OpTooltip.lt=Minore di - e.g. VAR < VAR2
+CQLFitlerParser.OpTooltip.ne=Non uguale a - ad es. VAR <> 45
+CQLFitlerParser.OpTooltip.not=VERO/TRUE diventa FALSO/FALSE, FALSO/FALSE diventa VERO/TRUE.
+CQLFitlerParser.OpTooltip.or=Risulta VERO/TRUE nel caso in cui qualsiasi argomento sia VERO/TRUE.
+Calculate=Calcola
+Cancel=Cancella
+CancellableDialogAdapter.close.save.msg=<html>Salvare le modifiche in <center><b><i>${0}</i></b></center>?</html>
+CancellableDialogAdapter.close.save.title=Salva?
+CancellableDialogAdapter.forceClose.save.msg=<html>La finestra di dialogo<center><b><i>${0}</i></b></center> sar\u00e0 chiusa.<br>Vuoi salvare le modifiche?</html>
+Class=Classe
+Clear=Clear
+Close=Chiudi
+CreateDuplicate=Crea duplicato
+Description=Descrizione
+Details=Dettagli...
+Error=Errore
+ExceptionDialog.CopyToClipboard=Copia negli appunti
+ExceptionDialog.CopyToConsole=Copia a console
+FileExists=File esiste gi\u00e0\u00a0
+HeapMemoryBar.status=${0} (${1}%) of max. ${2}
+HeapMemoryBar.tt=Memoria attualmente in uso.
+Information=Informazioni
+InvalidInputMess=Input non valido
+Ok=Ok
+Open=Apri
+OpenFolder=Apri cartella
+OperationTreePanel.OpDesc.ITE=IF .. THEN .. ELSE
+OperationTreePanel.OpDesc.NaN=NaN
+OperationTreePanel.OpDesc.NoData=NoData value
+OperationTreePanel.OpDesc.REGEX=REGEX( $TEXT , REGEX)
+OperationTreePanel.OpDesc.SUBSTR=SUBSTRING( $TEXT , $NUMBER , $NUMBER)
+OperationTreePanel.OpDesc.X=Raster cell X
+OperationTreePanel.OpDesc.Y=Raster cell Y
+OperationTreePanel.OpDesc.abs=abs($NUMBER)
+OperationTreePanel.OpDesc.acos=arccose($NUMBER)
+OperationTreePanel.OpDesc.and=AND
+OperationTreePanel.OpDesc.asin=arcsine($NUMBER)
+OperationTreePanel.OpDesc.atan=arctan($NUMBER)
+OperationTreePanel.OpDesc.cos=cos($NUMBER)
+OperationTreePanel.OpDesc.date2millis= date2millis( $YEAR, $MONTH, $DAY)
+OperationTreePanel.OpDesc.date2str= date2millis( $YEAR, $MONTH, $DAY, $FORMAT)
+OperationTreePanel.OpDesc.day_millis= DAY_MILLIS
+OperationTreePanel.OpDesc.divide= /
+OperationTreePanel.OpDesc.eq= =
+OperationTreePanel.OpDesc.exp=exp($NUMBER)
+OperationTreePanel.OpDesc.ge=>=
+OperationTreePanel.OpDesc.gt= >
+OperationTreePanel.OpDesc.isNaN=isNaN($NUMBER)
+OperationTreePanel.OpDesc.isNoData=isNoData(.)
+OperationTreePanel.OpDesc.ite=IF .. THEN .. ELSE
+OperationTreePanel.OpDesc.le=<=
+OperationTreePanel.OpDesc.len=len($TEXT)
+OperationTreePanel.OpDesc.ln=ln($NUMBER)
+OperationTreePanel.OpDesc.log=log($NUMBER)
+OperationTreePanel.OpDesc.lt=<
+OperationTreePanel.OpDesc.millis2str= millis2str( $NUMBER , $FORMAT)
+OperationTreePanel.OpDesc.minus= -
+OperationTreePanel.OpDesc.multiply= *
+OperationTreePanel.OpDesc.ne= <>
+OperationTreePanel.OpDesc.not= NOT
+OperationTreePanel.OpDesc.or=OR
+OperationTreePanel.OpDesc.plus= +
+OperationTreePanel.OpDesc.pow= ^
+OperationTreePanel.OpDesc.random= random number
+OperationTreePanel.OpDesc.regex= REGEX( $TEXT , $REGEX)
+OperationTreePanel.OpDesc.round= round($NUMBER)
+OperationTreePanel.OpDesc.sin= sin($NUMBER)
+OperationTreePanel.OpDesc.split= SPLIT( $TEXT , $REGEX , $NUMBER)
+OperationTreePanel.OpDesc.sqrt= sqrt($NUMBER)
+OperationTreePanel.OpDesc.str= str($NUMBER)
+OperationTreePanel.OpDesc.str2millis= str2millis( $TEXT , $TEXT)
+OperationTreePanel.OpDesc.substr= SUBSTRING( $TEXT , $NUMBER , $NUMBER)
+OperationTreePanel.OpDesc.tan= tan($NUMBER)
+OperationTreePanel.OpDesc.tolower= tolower($TEXT)
+OperationTreePanel.OpDesc.toupper= toupper($TEXT)
+OperationTreePanel.OpDesc.trunc= trunc($NUMBER)
+OperationTreePanel.OpDesc.val= val($TEXT)
+OperationTreePanel.OpDesc.week_millis= WEEK_MILLIS
+OperationTreePanel.OpTooltip.NaN= The value of "NotANumber"
+OperationTreePanel.OpTooltip.NoData= Constant for the NoData value
+OperationTreePanel.OpTooltip.X= Riporta la coordinata X della cella del raster
+OperationTreePanel.OpTooltip.Y= Riporta la coordinata Y della cella del raster
+OperationTreePanel.OpTooltip.abs= Valore assoluto di un numero.
+OperationTreePanel.OpTooltip.acos= Riporta l'arcoseno di un numero.
+OperationTreePanel.OpTooltip.and= Risulta VERO/TRUE solo nel caso in cui entrambi argomenti siano VERI/TRUE.
+OperationTreePanel.OpTooltip.asin= Riporta l'arcoseno di un numero.
+OperationTreePanel.OpTooltip.atan= Riporta l'arcotangente di un numero.
+OperationTreePanel.OpTooltip.cos= Riporta il coseno di un numero.
+OperationTreePanel.OpTooltip.date2millis= Converte una data in millisecondi.
+OperationTreePanel.OpTooltip.date2str= Converte una data in una stringa di data
+OperationTreePanel.OpTooltip.day_millis= Il valore di un giorno espresso in millisecondi
+OperationTreePanel.OpTooltip.divide= Divisione
+OperationTreePanel.OpTooltip.eq= Equals/Uguale a - ad es. $VAL1 = 23
+OperationTreePanel.OpTooltip.exp=Calcola l'esponente di base e.
+OperationTreePanel.OpTooltip.ge= Maggiore di o uguale a
+OperationTreePanel.OpTooltip.gt= Maggiore di
+OperationTreePanel.OpTooltip.isNaN= Risulta VERO/TRUE se il valore non \u00e8 un numero.
+OperationTreePanel.OpTooltip.isNoData= Risulta VERO/TRUE se la cella contiene no data.
+OperationTreePanel.OpTooltip.ite= Specifica un test logico da eseguire.
+OperationTreePanel.OpTooltip.le= Minore di o uguale a
+OperationTreePanel.OpTooltip.len= Calcola la lunghezza di una stringa di testo.
+OperationTreePanel.OpTooltip.ln= Calcola il logaritmo naturale di un numero.
+OperationTreePanel.OpTooltip.log= Calcola il logaritmo di base-10 di un numero.
+OperationTreePanel.OpTooltip.lt= Minore di- ad es. $VAL < $VAL2
+OperationTreePanel.OpTooltip.millis2str= Converte millisecondi in una stringa di data
+OperationTreePanel.OpTooltip.minus= -Sottrazione
+OperationTreePanel.OpTooltip.multiply= Multiplicazione
+OperationTreePanel.OpTooltip.ne=Unequals/Non uguale a - e.g. $VAL <> 45
+OperationTreePanel.OpTooltip.not= Rovescia il valore dell'argomento.
+OperationTreePanel.OpTooltip.or= Risulta VERO/TRUE nel caso in cui qualsiasi argomento sia VEO/TRUE.
+OperationTreePanel.OpTooltip.plus= Addizione
+OperationTreePanel.OpTooltip.pow= Power - ad es. $VAL ^ 9
+OperationTreePanel.OpTooltip.random= Riporta un numero random compreso tra 0 and 1.
+OperationTreePanel.OpTooltip.regex= Esegue operazione regular-expressions su un testo.
+OperationTreePanel.OpTooltip.round= Arrotonda un numero.
+OperationTreePanel.OpTooltip.sin= Riporta il seno di un numero.
+OperationTreePanel.OpTooltip.split= Returns the n-th result of a text split over a regular expression.
+OperationTreePanel.OpTooltip.sqrt= Riporta la radice quadrata di un numero.
+OperationTreePanel.OpTooltip.str= Converte un numero in testo.
+OperationTreePanel.OpTooltip.str2millis= Converte una data da stringa in millisecondi
+OperationTreePanel.OpTooltip.substr= Riporta soltanto una parte di un testo.
+OperationTreePanel.OpTooltip.tan= Riporta il tangente di un numero.
+OperationTreePanel.OpTooltip.tolower= Converte testo in caratteri minuscoli.
+OperationTreePanel.OpTooltip.toupper= Converte testo in caratteri maiuscoli.
+OperationTreePanel.OpTooltip.trunc= Tronca i decimali di un numero.
+OperationTreePanel.OpTooltip.val= Converte un testo in un numero.
+OperationTreePanel.OpTooltip.week_millis= Il valore di una settimana espresso in millisecondi
+Operators=Operatori
+Overwrite=Sovrascrivere
+OverwriteAll=Sovrascrivere tutto
+Ready= Pronto
+Refresh=Aggiorna
+Reload= Ricarica
+RememberChoice= Ricorda questa selezione
+Replace= Sostituire
+ResourceProviderManagerFrame.AdditionalLang=Lingue addizionali
+ResourceProviderManagerFrame.Bundle= Fascia di lingue
+ResourceProviderManagerFrame.ExtentionOf=Estensione di...
+ResourceProviderManagerFrame.FinishMess= File di propriet\u00e0 creati con successo...
+ResourceProviderManagerFrame.Language= Lingua
+ResourceProviderManagerFrame.LanguageCode= Codice lingua
+ResourceProviderManagerFrame.NewLang= Crea nuovi files di lingua...
+ResourceProviderManagerFrame.OtherLang= <altra lingua>
+ResourceProviderManagerFrame.RootLang=Root language
+ResourceProviderManagerFrame.Title= Language packs
+ResourceProviderManagerFrame.UpdateLang= Aggiorna files di lingua...
+ResourceProviderManagerFrame.UpdateMess= ${0} resource bundles updated...
+Rule=Regola
+RuleToolTip=Inserisci regola aritmetica qui...
+Save= Salva
+Skip= Elimina
+Start= Avvio
+TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation= Spiaciente, ma non puoi usare caratteri { and } nell'etichetta.
+TranslationAskJDialog.Title=Tradurre prego
+WaitMess= Attendere prego...
+Warning= Attenzione
+
Modified: trunk/src/skrueger/db/PGUtil.java
===================================================================
--- trunk/src/skrueger/db/PGUtil.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/skrueger/db/PGUtil.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -1,16 +1,88 @@
package skrueger.db;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.apache.log4j.Logger;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+import schmitzm.lang.LangUtil;
+
/**
* Hilfsmethoden für PostgreSQL
*/
public class PGUtil {
-
-// TODO isGeoColumn();
+ static final Logger log = Logger.getLogger(PGUtil.class);
/**
+ * Querys the <code>geometry_columns</code> table is part of every postgis
+ * installation and must/should describe the geometry columns and tables.
+ */
+ static public String[] getColumnsDescribedInGeometryColumnsTable(Statement s) {
+ String[] columns = new String[0];
+ try {
+ ResultSet askGeoe = s
+ .executeQuery("SELECT f_table_name FROM geometry_columns;");
+ while (askGeoe.next()) {
+ columns = LangUtil.extendArray(columns, askGeoe.getString(1));
+ }
+ } catch (SQLException e) {
+ log.error(e, e);
+ }
+
+ return columns;
+
+ }
+
+ public static int getSridForCRS(CoordinateReferenceSystem crs) {
+ String full = crs.toWKT().toUpperCase(); // ...
+ // AUTHORITY["EPSG","900913"]]
+ String s1 = "AUTHORITY[\"EPSG\",\"";
+ int p1 = full.indexOf(s1);
+ if (p1 >= 0) {
+ String s = full.substring(p1 + s1.length());
+ int p2 = s.indexOf("\"]");
+ if (p2 > 0) {
+ s = s.substring(0, p2);
+ return Integer.parseInt(s);
+ }
+ }
+ return -1;
+ }
+
+ public static void createOrUpdateGeometrsColumnsEntry(String tableName,
+ String geoColumnName, CoordinateReferenceSystem crs) {
+ createOrUpdateGeometrsColumnsEntry(tableName, geoColumnName,
+ getSridForCRS(crs));
+ }
+
+ /**
+ * Creates or Updates
+ *
+ * @param tableName
+ * @param geoColumnName
+ * @param srid
+ */
+ public static void createOrUpdateGeometrsColumnsEntry(String tableName,
+ String geoColumnName, int srid) {
+
+ String createGeometryEntrySQL = "INSERT INTO geometry_columns (f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, \"type\") VALUES ( '', 'public', '"
+ + tableName
+ + "', '"
+ + geoColumnName
+ + "', 2, "
+ + srid
+ + ",'MULTIPOLYGON' ) LIMIT 1;";
+ }
+
+ // TODO isGeoColumn();
+
+ /**
* @param binding
* Eine "einfache" Javaklasse, die in PG abgebildet werden soll.
- * @return einen PG-spezifischen Datentypenamen für einen Javatyp zurück, z.b. "double precision" für <code>Double.class</code>
+ * @return einen PG-spezifischen Datentypenamen für einen Javatyp zurück,
+ * z.b. "double precision" für <code>Double.class</code>
*/
public static String getColTypeName(Class<?> binding) {
Modified: trunk/src/skrueger/geotools/MapView.java
===================================================================
--- trunk/src/skrueger/geotools/MapView.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/skrueger/geotools/MapView.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -58,12 +58,10 @@
JSplitPane.HORIZONTAL_SPLIT);
protected MapPaneStatusBar statusBar = null;
-
/**
* Komponente, in der die Karten, der Massstab und das Koordinaten-Raster
* dargestellt werden.
*/
-
protected final GeoMapPane geoMapPane = new GeoMapPane();
private MapPaneToolBar jToolBar;
@@ -79,10 +77,9 @@
// Needed because variables for the overwritten methods
// are not yet set.
jToolBar = toolBar;
-
+
// By default the MapPane will render with antialiasing on
- getGeoMapPane().getMapPane()
- .setAntiAliasing(true);
+ getGeoMapPane().getMapPane().setAntiAliasing(true);
}
/**
@@ -109,9 +106,9 @@
// Status-Line to show Coordinates and Rastervalues.
statusBar = new MapPaneStatusBar(getGeoMapPane().getMapPane());
- statusBar.setBorder(BorderFactory.createCompoundBorder(BorderFactory
- .createLoweredBevelBorder(), BorderFactory.createEmptyBorder(2,
- 5, 2, 5)));
+ statusBar.setBorder(BorderFactory.createCompoundBorder(
+ BorderFactory.createLoweredBevelBorder(),
+ BorderFactory.createEmptyBorder(2, 5, 2, 5)));
this.add(statusBar, BorderLayout.SOUTH);
/**
@@ -128,13 +125,14 @@
* To the right side we now add a JPanel that consists of a toolbar and
* a gmp
*/
- JPanel newRight = new JPanel(new MigLayout("center, wrap 1","[grow]","[][grow]"));
+ JPanel newRight = new JPanel(new MigLayout("center, wrap 1", "[grow]",
+ "[][grow]"));
newRight.add(getToolBar());
- newRight.add(getGeoMapPane(),"growx, growy");
+ newRight.add(getGeoMapPane(), "growx, growy");
getSplitPane().add(newRight);
this.add(getSplitPane(), BorderLayout.CENTER);
-
+
}
/**
Modified: trunk/src/skrueger/geotools/io/DbServerSettings.java
===================================================================
--- trunk/src/skrueger/geotools/io/DbServerSettings.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src/skrueger/geotools/io/DbServerSettings.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -2,11 +2,15 @@
import java.awt.Component;
import java.net.MalformedURLException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
import java.util.HashMap;
import java.util.regex.Pattern;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
import org.geotools.data.postgis.PostgisNGDataStoreFactory;
import org.geotools.jdbc.JDBCDataStore;
import org.geotools.jdbc.JDBCDataStoreFactory;
@@ -20,6 +24,7 @@
import schmitzm.swing.MultipleOptionPane;
import schmitzm.swing.SelectionInputOption;
import schmitzm.swing.SelectionInputOption.Combo;
+import skrueger.db.PGUtil;
/**
* This class describes all settings needed to connect to a WFS server. This
@@ -34,6 +39,8 @@
*/
public class DbServerSettings extends ServerSettings<Object, Object> {
+ Logger log = Logger.getLogger(DbServerSettings.class);
+
public enum DbType {
postgis("postgresql");
@@ -66,6 +73,8 @@
public enum Key {
}
+ private static Connection dbc;
+
/**
* Opens a GUI that asks the use define a DB connection.
*
@@ -169,6 +178,7 @@
}
private String[] cachedTypeNames = null;
+ private String[] cachedGeometryTableNames;
public DbServerSettings() {
this(DbType.postgis);
@@ -358,4 +368,94 @@
return s.toString();
}
-}
+
+ /**
+ * returns a valid Connection to our postgresql Database. Name of database,
+ * username and password must be provided.
+ *
+ * @param database
+ * name of the database
+ * @param username
+ * a valid username
+ * @param password
+ * valid password
+ * @return database connection
+ * @throws SQLException
+ * @throws ClassNotFoundException
+ */
+ public Connection getDatabaseConnection() {
+
+ try {
+
+ if (dbc == null || dbc.isClosed()) {
+ dbc = createNewDatabaseConnection();
+ }
+ return dbc;
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ private Connection createNewDatabaseConnection() throws SQLException {
+ try {
+ Class.forName("org.postgresql.Driver");
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ String url = "jdbc:postgresql://" + getHost()
+ // + (":" + PropertyUtils.getDbPort())
+ + ("/" + getDatabase());
+
+ String password = getPassword();
+ String username = getUsername();
+
+ // log.debug("DB URL: " + url + " u=" + username + " p="
+ // + password);
+
+ return DriverManager.getConnection(url, username, password);
+ }
+
+ public String[] getDescribedTablesWithGeometry() {
+
+ if (cachedGeometryTableNames == null) {
+
+ Connection dc;
+ try {
+ dc = createNewDatabaseConnection();
+ try {
+
+ cachedGeometryTableNames = PGUtil
+ .getColumnsDescribedInGeometryColumnsTable(dc
+ .createStatement());
+
+ } catch (SQLException e) {
+ log.error(e, e);
+ } finally {
+ dc.close();
+ }
+ } catch (SQLException e1) {
+ log.error(e1, e1);
+ return new String[0];
+ }
+ }
+ return cachedGeometryTableNames;
+ }
+
+ @Override
+ protected void finalize() throws Throwable {
+ super.finalize();
+ dispose();
+ }
+
+ public void dispose() {
+ try {
+ if (dbc != null && !dbc.isClosed()) {
+ dbc.close();
+ dbc = null;
+ }
+ } catch (SQLException e) {
+ log.error("Error while disposing the database connection to "
+ + toString(), e);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/src_junit/schmitzm/geotools/feature/FeatureUtilTest.java
===================================================================
--- trunk/src_junit/schmitzm/geotools/feature/FeatureUtilTest.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src_junit/schmitzm/geotools/feature/FeatureUtilTest.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -18,6 +18,7 @@
import org.geotools.data.FeatureSource;
import org.geotools.data.shapefile.ShapefileDataStore;
import org.geotools.feature.FeatureCollection;
+import org.geotools.feature.GeometryAttributeType;
import org.junit.Test;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
@@ -28,6 +29,7 @@
import schmitzm.swing.TestingUtil;
import schmitzm.swing.TestingUtil.TestDatasets;
+import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jts.geom.Polygon;
@@ -102,13 +104,14 @@
assertEquals(Integer.class, sourceFs.getSchema().getDescriptor(2)
.getType().getBinding());
- // geht nur unter linux! Unte windows wird da kein UTF8 erwartet, sonder z.b. iso...
-// assertEquals("�����", sourceFs.getSchema().getDescriptor(3)
-// .getLocalName());
+ // geht nur unter linux! Unte windows wird da kein UTF8 erwartet, sonder
+ // z.b. iso...
+ // assertEquals("�����", sourceFs.getSchema().getDescriptor(3)
+ // .getLocalName());
File outFile = File.createTempFile("testModifyFeatureSource", ".shp");
-// File cpgFile = IOUtil.changeFileExt(outFile, "cpg");
-// GeoExportUtil.writeCharset(cpgFile, Charset.forName("windows-1256"));
+ // File cpgFile = IOUtil.changeFileExt(outFile, "cpg");
+ // GeoExportUtil.writeCharset(cpgFile, Charset.forName("windows-1256"));
ShapefileDataStore outputFs = new ShapefileDataStore(
DataUtilities.fileToURL(outFile));
@@ -148,7 +151,8 @@
try {
assertTrue(fI.hasNext());
SimpleFeature next = fI.next();
-// TODO assertEquals("وكالة الحوض المائي للوكوس", next.getAttribute(1));
+ // TODO assertEquals("وكالة الحوض المائي للوكوس",
+ // next.getAttribute(1));
assertEquals(13591, next.getAttribute(2));
} finally {
correctedFC.close(fI);
@@ -197,41 +201,74 @@
* * <dataAttribute functionA="0.0" functionX="1.0" localname="C�R�ALIC_1" namespace="" visible="false" weight="15">
*/
- public void testFindBestMatchingAttribute()
- {
+ public void testFindBestMatchingAttribute() {
String s1 = "C�R�ALIC_1";
String s2 = Pattern.quote(s1);
- s2 = s2.substring(2,s2.length()-2);
+ s2 = s2.substring(2, s2.length() - 2);
String s3 = s2.replaceAll("�", ".");
-// s3 = s3.replaceAll("@", ".");
+ // s3 = s3.replaceAll("@", ".");
Pattern compile = Pattern.compile(s3);
Matcher matcher = compile.matcher("CóRéALIC_1");
-
+
assertTrue(matcher.find());
-
+
}
-
@Test
/**
* * <dataAttribute functionA="0.0" functionX="1.0" localname="C�R�ALIC_1" namespace="" visible="false" weight="15">
*/
- public void testFindBestMatchingAttribute2()
- {
+ public void testFindBestMatchingAttribute2() {
String s1 = "C�R�ALIC_1";
String s2 = Pattern.quote(s1);
- s2 = s2.substring(2,s2.length()-2);
+ s2 = s2.substring(2, s2.length() - 2);
String s3 = s2.replaceAll("[^\\w]", "[^\\\\w]");
-// s3 = s3.replaceAll("@", ".");
+ // s3 = s3.replaceAll("@", ".");
Pattern compile = Pattern.compile(s3);
-
+
Matcher matcher = compile.matcher("COREALIC_1");
assertFalse(matcher.find());
-
+
matcher = compile.matcher("CóRéALIC_1");
assertTrue(matcher.find());
-
+
}
+ @Test
+ /**
+ * Tests, whether the different signatures of getGeometryForm all deal correctly with <code>null</code>
+ */
+ public void testGetGeometryFormNulls() {
+ GeometryForm gf;
+ gf = FeatureUtil.getGeometryForm((Class<?>) null);
+ assertEquals(GeometryForm.NONE, gf);
+
+ gf = FeatureUtil.getGeometryForm((FeatureCollection) null);
+ assertEquals(GeometryForm.NONE, gf);
+
+ gf = FeatureUtil.getGeometryForm((FeatureSource) null);
+ assertEquals(GeometryForm.NONE, gf);
+
+ gf = FeatureUtil.getGeometryForm((GeometryAttributeType) null);
+ assertEquals(GeometryForm.NONE, gf);
+
+ gf = FeatureUtil.getGeometryForm((GeometryDescriptor) null);
+ assertEquals(GeometryForm.NONE, gf);
+
+ gf = FeatureUtil.getGeometryForm((SimpleFeatureType) null);
+ assertEquals(GeometryForm.NONE, gf);
+ }
+
+ @Test
+ /**
+ * Tests, whether the different signatures of getGeometryForm all deal correctly with <code>null</code>
+ */
+ public void testGetGeometryFormGeometry() {
+ GeometryForm gf;
+ gf = FeatureUtil.getGeometryForm(Geometry.class);
+ assertEquals(GeometryForm.ANY, gf);
+
+ }
+
}
Modified: trunk/src_junit/schmitzm/lang/LangUtilTest.java
===================================================================
--- trunk/src_junit/schmitzm/lang/LangUtilTest.java 2010-11-01 18:49:31 UTC (rev 1194)
+++ trunk/src_junit/schmitzm/lang/LangUtilTest.java 2010-11-02 10:33:32 UTC (rev 1195)
@@ -7,7 +7,6 @@
import org.junit.Test;
public class LangUtilTest {
-
@Test
public void testOnlyZeros() {
@@ -21,7 +20,7 @@
assertFalse(LangUtil.onlyZero(" 20,0"));
assertFalse(LangUtil.onlyZero(" 00200,0"));
}
-
+
@Test
public void testParseStringDefaultFalse() {
assertTrue(LangUtil.parseStringDefaultFalse("y"));
@@ -29,19 +28,19 @@
assertTrue(LangUtil.parseStringDefaultFalse(" JA BITTE !"));
assertTrue(LangUtil.parseStringDefaultFalse("j"));
assertTrue(LangUtil.parseStringDefaultFalse("1"));
-
+
assertFalse(LangUtil.parseStringDefaultFalse(null));
assertFalse(LangUtil.parseStringDefaultFalse("asdas"));
assertFalse(LangUtil.parseStringDefaultFalse("23"));
assertFalse(LangUtil.parseStringDefaultFalse("-2"));
}
-
+
@Test
public void testParseStringDefaultTrue() {
assertTrue(LangUtil.parseStringDefaultTrue("y"));
assertTrue(LangUtil.parseStringDefaultTrue("j"));
assertTrue(LangUtil.parseStringDefaultTrue("1"));
-
+
assertFalse(LangUtil.parseStringDefaultTrue("n"));
assertFalse(LangUtil.parseStringDefaultTrue("0"));
assertFalse(LangUtil.parseStringDefaultTrue("no"));
@@ -58,10 +57,19 @@
Double val = 0.01735357917570499;
int digits = 3;
- for (int i = 0; i < 10 ; i++) {
+ for (int i = 0; i < 10; i++) {
val = LangUtil.round(val, digits);
- assertEquals("0.017",new Double(val).toString());
+ assertEquals("0.017", new Double(val).toString());
}
}
+ @Test
+ public void testTrimNewlines() {
+ assertEquals("p12", LangUtil.trimNewlines("\np12\n"));
+ assertEquals("p12", LangUtil.trimNewlines("p12\n"));
+ assertEquals("p12", LangUtil.trimNewlines("p12"));
+ assertEquals("", LangUtil.trimNewlines(""));
+ assertEquals(null, LangUtil.trimNewlines(null));
+ }
+
}
More information about the Schmitzm-commits
mailing list