[Schmitzm-commits] r886 - in trunk/src: schmitzm/geotools/gui schmitzm/geotools/gui/resource/locales schmitzm/swing skrueger/geotools skrueger/geotools/labelsearch skrueger/geotools/resource
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Jun 3 12:16:08 CEST 2010
Author: alfonx
Date: 2010-06-03 12:16:07 +0200 (Thu, 03 Jun 2010)
New Revision: 886
Removed:
trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_tr.properties
trunk/src/skrueger/geotools/labelsearch/Snippet.java
trunk/src/skrueger/geotools/labelsearch/labelsearch.properties
trunk/src/skrueger/geotools/labelsearch/labelsearch_de.properties
trunk/src/skrueger/geotools/labelsearch/labelsearch_fr.properties
trunk/src/skrueger/geotools/resource/locales/
Modified:
trunk/src/schmitzm/geotools/gui/XMapPaneTool.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_fr.properties
trunk/src/schmitzm/swing/ResourceProviderManagerFrame.java
trunk/src/skrueger/geotools/MapPaneToolBar.java
trunk/src/skrueger/geotools/labelsearch/LabelSearch.java
Log:
Simplification: Merged labelSearch_??.proeprties resourcebundle and mapPaneToolbar_??.properties resource bundle into GTResourceBundle
Modified: trunk/src/schmitzm/geotools/gui/XMapPaneTool.java
===================================================================
--- trunk/src/schmitzm/geotools/gui/XMapPaneTool.java 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/schmitzm/geotools/gui/XMapPaneTool.java 2010-06-03 10:16:07 UTC (rev 886)
@@ -4,15 +4,12 @@
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.util.HashMap;
-import java.util.Locale;
import java.util.Map;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.KeyStroke;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
import schmitzm.swing.SwingUtil;
import schmitzm.swing.event.MouseInputType;
import skrueger.geotools.Copyable;
@@ -23,10 +20,9 @@
* {@link XMapPaneAction}s and provides a tool icon and a default mouse cursor.
*/
public class XMapPaneTool implements Copyable<XMapPaneTool> {
- public static ResourceProvider RESOURCE = MapPaneToolBar.RESOURCE;
public static String R(String key, Object... values) {
- return RESOURCE.getString(key, values);
+ return MapPaneToolBar.R(key, values);
}
/** The cursor of the mouse if the tool is active **/
Modified: trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties
===================================================================
--- trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties 2010-06-03 10:16:07 UTC (rev 886)
@@ -153,7 +153,27 @@
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_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:
+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>
\ No newline at end of file
Modified: trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties
===================================================================
--- trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties 2010-06-03 10:16:07 UTC (rev 886)
@@ -60,13 +60,13 @@
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.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.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
@@ -74,7 +74,7 @@
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.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
@@ -86,11 +86,11 @@
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.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.South=S\u00FCden
schmitzm.geotools.gui.GeotoolsGUIUtil.West=Westen
schmitzm.geotools.gui.GeotoolsGUIUtil.East=Osten
schmitzm.geotools.gui.GeotoolsGUIUtil.NORTH.Abb=N
@@ -99,20 +99,20 @@
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.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.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.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
@@ -123,10 +123,10 @@
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.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.FillColor=F\u00FCllfarbe
schmitzm.geotools.gui.StyleToolBar.BorderColor=Randfarbe
schmitzm.geotools.gui.StyleToolBar.BorderWidth=Randbreite
schmitzm.geotools.gui.StyleToolBar.PointMark=Punkt-Style
@@ -138,9 +138,9 @@
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.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.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
@@ -148,10 +148,30 @@
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)
+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:
+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>
\ No newline at end of file
Modified: trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_fr.properties
===================================================================
--- trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_fr.properties 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_fr.properties 2010-06-03 10:16:07 UTC (rev 886)
@@ -34,31 +34,31 @@
Attributes=Attribute
-org.geotools.styling.StyleBuilder.MARK_ARROW=Fl\u00e8che
+org.geotools.styling.StyleBuilder.MARK_ARROW=Fl\u00E8che
org.geotools.styling.StyleBuilder.MARK_CIRCLE=Circle
org.geotools.styling.StyleBuilder.MARK_CROSS=Croix
-org.geotools.styling.StyleBuilder.MARK_SQUARE=Carr\u00e9
+org.geotools.styling.StyleBuilder.MARK_SQUARE=Carr\u00E9
org.geotools.styling.StyleBuilder.MARK_STAR=Etoile
org.geotools.styling.StyleBuilder.MARK_TRIANGLE=Triangle
org.geotools.styling.StyleBuilder.MARK_X=X
schmitzm.geotools.feature.FeatureTableModel.AttrName=variable
-schmitzm.geotools.feature.FeatureTableModel.AttrType=type de donn\u00e9es
+schmitzm.geotools.feature.FeatureTableModel.AttrType=type de donn\u00E9es
schmitzm.geotools.feature.FeatureTableModel.AttrValue=valeur
schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestButton=Tester le filtre
schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsButton=?
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsToolTip=Afficher erreur au d\u00e9tail...
-schmitzm.geotools.gui.FeatureCollectionFilterPanel.ResultsBorderTitle=R\u00e9sultat du filtre:
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.TestResultDetailsToolTip=Afficher erreur au d\u00E9tail...
+schmitzm.geotools.gui.FeatureCollectionFilterPanel.ResultsBorderTitle=R\u00E9sultat du filtre\:
schmitzm.geotools.gui.FeatureCollectionFilterPanel.FilterDefinitionBorderTitle=Definir le fitre:
schmitzm.geotools.gui.FeatureCollectionFilterPanel.PreviewMapPaneToolTip=Les objects rouges correspondent au filtre, les objets gris n'en correspondent pas.
-schmitzm.geotools.gui.FeatureTablePane.PreviewMapPaneToolTip=Les objets rouges sont s\u00e9lectionn\u00e9s, les objets gris n'en sont pas.
+schmitzm.geotools.gui.FeatureTablePane.PreviewMapPaneToolTip=Les objets rouges sont s\u00E9lectionn\u00E9s, les objets gris n'en sont pas.
schmitzm.geotools.gui.MapActionControlPane.ZOOM_IN=Zoom avant
-schmitzm.geotools.gui.MapActionControlPane.ZOOM_OUT=Zoom arri\u00e8re
-schmitzm.geotools.gui.MapActionControlPane.SELECT_TOP=S\u00e9lectionner de la couche la plus haute
-schmitzm.geotools.gui.MapActionControlPane.SELECT_ALL=S\u00e9lectionner de toutes les couches
+schmitzm.geotools.gui.MapActionControlPane.ZOOM_OUT=Zoom arri\u00E8re
+schmitzm.geotools.gui.MapActionControlPane.SELECT_TOP=S\u00E9lectionner de la couche la plus haute
+schmitzm.geotools.gui.MapActionControlPane.SELECT_ALL=S\u00E9lectionner de toutes les couches
schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_UP=Panner plus haut
schmitzm.geotools.gui.MapContextControlPane.Menu.MOVE_DOWN=Panner plus bas
schmitzm.geotools.gui.MapContextControlPane.Menu.ZOOM_TO=Zoom vers la couche
@@ -94,25 +94,25 @@
schmitzm.geotools.gui.GeotoolsGUIUtil.SOUTH.Abb=S
schmitzm.geotools.gui.GeotoolsGUIUtil.WEST.Abb=O
schmitzm.geotools.gui.GeotoolsGUIUtil.EAST.Abb=E
-schmitzm.geotools.gui.CRSSelectionDialog.init.crs.title=Banque de donn\u00e9es CRS
-schmitzm.geotools.gui.CRSSelectionDialog.init.crs.mess=Initialisation de la banque de donn\u00e9es CRS. Attendez, s.v.p....
-schmitzm.geotools.gui.CRSSelectionDialog.title=S\u00e9lectionner un syst\u00e8me de coordonn\u00e9es (CRS)
-schmitzm.geotools.gui.CRSSelectionDialog.mandatory=Il faut sp\u00e9cifier le CRS !
+schmitzm.geotools.gui.CRSSelectionDialog.init.crs.title=Banque de donn\u00E9es CRS
+schmitzm.geotools.gui.CRSSelectionDialog.init.crs.mess=Initialisation de la banque de donn\u00E9es CRS. Attendez, s.v.p....
+schmitzm.geotools.gui.CRSSelectionDialog.title=S\u00E9lectionner un syst\u00E8me de coordonn\u00E9es (CRS)
+schmitzm.geotools.gui.CRSSelectionDialog.mandatory=Il faut sp\u00E9cifier le CRS \!
schmitzm.geotools.gui.CRSSelectionDialog.button.wgs84=CRS WGS84
schmitzm.geotools.gui.CRSSelectionDialog.button.default=CRS standard (${0})
schmitzm.geotools.gui.CRSSelectionDialog.button.predefined=Defini en avance
schmitzm.geotools.gui.CRSSelectionDialog.button.userDefined=Defini par client :
-schmitzm.geotools.gui.JMapEditorPane.Err.MissingMap=Avant de creer une couche nouvelle, il faut que une couche est d\u00e9j\u00e0 visualis\u00e9e (pour la d\u00e9finition de CRS et la position g\u00e9ographique).
+schmitzm.geotools.gui.JMapEditorPane.Err.MissingMap=Avant de creer une couche nouvelle, il faut que une couche est d\u00E9j\u00E0 visualis\u00E9e (pour la d\u00E9finition de CRS et la position g\u00E9ographique).
schmitzm.geotools.gui.JMapEditorPane.Err.Line.LessPoints=Pour un Line-Feature il faut definir au moins 2 points!
schmitzm.geotools.gui.JMapEditorPane.Err.Polygon.LessPoints=Pour un Polygone-Feature il faut definir au moins 2 points!
schmitzm.geotools.gui.JMapEditorToolBar.button.layer.new=Creer une couche nouvelle
schmitzm.geotools.gui.JMapEditorToolBar.button.layer.save=Terminer la couche
schmitzm.geotools.gui.JMapEditorToolBar.button.layer.cancel=Abandonner une couche
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.undo=Retirer l'op\u00e9ration derni\u00e8re
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.redo=R\u00e9p\u00e9ter l'op\u00e9ration derni\u00e8re retir\u00e9e
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.undo=Retirer l'op\u00E9ration derni\u00E8re
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.redo=R\u00E9p\u00E9ter l'op\u00E9ration derni\u00E8re retir\u00E9e
schmitzm.geotools.gui.JMapEditorToolBar.button.edit.clear=Vider une couche
-schmitzm.geotools.gui.JMapEditorToolBar.button.edit.finish=d\u00e9marrer un Feature nouveau
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.dialog.title=Cr\u00e9er une couche nouvelle
+schmitzm.geotools.gui.JMapEditorToolBar.button.edit.finish=d\u00E9marrer un Feature nouveau
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.dialog.title=Cr\u00E9er une couche nouvelle
schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title=Nom de couche
schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.title.default=Couche nouvelle
schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type=Sorte de couche
@@ -120,25 +120,25 @@
schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.line=Couche de ligne
schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.layer.type.polygon=Couche de polygone
schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.ftype.title=Autres attributs
-schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.GeomAttr=Nom de l'attribut '${0}' reserv\u00e9 pour l'Attribut de g\u00e9ometrie d\u00e9faut.
+schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.GeomAttr=Nom de l'attribut '${0}' reserv\u00E9 pour l'Attribut de g\u00E9ometrie d\u00E9faut.
schmitzm.geotools.gui.JMapEditorToolBar.NewLayer.Err.AutoVal=Valeur automatique pour le type d'attribut '${0}' pas possible.
schmitzm.geotools.gui.JMapEditorToolBar.NewFeature.title=Nouvau Feature
schmitzm.geotools.gui.StyleToolBar.FillColor=Couleur de remplissage
-schmitzm.geotools.gui.StyleToolBar.BorderColor=Couleur bordi\u00e8re
-schmitzm.geotools.gui.StyleToolBar.BorderWidth=Largeur bordi\u00e8re
+schmitzm.geotools.gui.StyleToolBar.BorderColor=Couleur bordi\u00E8re
+schmitzm.geotools.gui.StyleToolBar.BorderWidth=Largeur bordi\u00E8re
schmitzm.geotools.gui.StyleToolBar.PointMark=Style de point
schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrName=Nom
schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AttrType=Type
schmitzm.geotools.gui.FeatureTypeBuilderTableModel.Nillable=Nullable
schmitzm.geotools.gui.FeatureTypeBuilderTableModel.AutoValue=Valeur automatique
-schmitzm.geotools.gui.FeatureTypeBuilderTableModel.DefValue=D\u00e9faut
+schmitzm.geotools.gui.FeatureTypeBuilderTableModel.DefValue=D\u00E9faut
schmitzm.geotools.gui.FeatureTypeBuilderTableModel.NewAttr=Attribut_${0}
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.clearSelection.tt=Effacer s\u00e9lection
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.selectionToTop.tt=D\u00e9placer/bouger la s\u00e9lection au sommet du tableau
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.invertSelection.tt=Inversion de la s\u00e9lection
-schmitzm.geotools.gui.SelectableFeatureTablePane.button.zoomToSelection.tt=Agrandir les caract\u00e9ristiques s\u00e9lection\u00e9es
-schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus=S\u00e9lection: ${0} de ${1} ${2}
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.clearSelection.tt=Effacer s\u00E9lection
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.selectionToTop.tt=D\u00E9placer/bouger la s\u00E9lection au sommet du tableau
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.invertSelection.tt=Inversion de la s\u00E9lection
+schmitzm.geotools.gui.SelectableFeatureTablePane.button.zoomToSelection.tt=Agrandir les caract\u00E9ristiques s\u00E9lection\u00E9es
+schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus=S\u00E9lection\: ${0} de ${1} ${2}
schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.polygons=polygones
schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.points=points
schmitzm.geotools.gui.SelectableFeatureTablePane.selectionStatus.lines=lignes
@@ -146,4 +146,24 @@
#missing schmitzm.geotools.gui.GridPanelFormatter_DHDN.title=DHDN - 1,234,567 (H|R)
#missing schmitzm.geotools.gui.GridPanelFormatter_LatLon1.title=Grad\u00b0 Minute' (N|O|S|W)
-schmitzm.geotools.gui.GeoPositionLabel.LABEL_PREFIX=Coordonn\u00e9es:
+schmitzm.geotools.gui.GeoPositionLabel.LABEL_PREFIX=Coordonn\u00E9es\:
+
+MapPaneButtons.Pan.TT=D\u00E9placer la catre.
+MapPaneButtons.Info.TT=Avoir des informations sur les objects.
+MapPaneButtons.ZoomIn.TT=Effectuer un zoom d'un extrait oder faire un gros plan d'un extrait.
+MapPaneButtons.ZoomOut.TT=Effectuer un zoom d'un extrait de la carte oder faire un gros plan d'un extrait de carte.
+MapPaneButtons.LastZoom.TT=Restaurer le dernier extrait de la carte.
+MapPaneButtons.NextZoom.TT=Restaurer le prochain extrait de la carte.
+
+MapPaneButtons.Selection.SetSelection.TT=Marquer les objects \u00E0 s\u00E9lectionner
+MapPaneButtons.Selection.AddSelection.TT=Ajouter des objets \u00E0 la s\u00E9lection actuelle
+MapPaneButtons.Selection.RemoveSelection.TT=D\u00E9placer les objects de la s\u00E9lection actuelle
+MapPaneButtons.Selection.ClearSelection.TT=Supprimer toutes les s\u00E9lection
+
+SearchMapDialog.Results.Column.Layer=Retrouv\u00E9s dans
+SearchMapDialog.Results.Column.Name=Nom
+SearchMapDialog.resultsTable.tt=Cliquer sur un r\u00E9sultat pour l`afficher.
+SearchMapDialog.searchString.Label=Entrer le domaine de recherche:
+SearchMapDialog.searchString.tt=Saisir le domaine de recherche et appuyer sur [Enter]
+SearchMapDialog.title=Rechercher dans la carte: ${0}
+#SearchMapDialog.Explanation=<html>Here you can search all of the map's <b>labels</b>.</html>
\ No newline at end of file
Deleted: trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_tr.properties
===================================================================
--- trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_tr.properties 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_tr.properties 2010-06-03 10:16:07 UTC (rev 886)
@@ -1,155 +0,0 @@
-# Empty file for Alisan
-##########
-#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
-##########
-
-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=Attribut
-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.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\:
Modified: trunk/src/schmitzm/swing/ResourceProviderManagerFrame.java
===================================================================
--- trunk/src/schmitzm/swing/ResourceProviderManagerFrame.java 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/schmitzm/swing/ResourceProviderManagerFrame.java 2010-06-03 10:16:07 UTC (rev 886)
@@ -15,7 +15,6 @@
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.FlowLayout;
-import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;
@@ -32,17 +31,10 @@
import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import javax.swing.JTextPane;
import javax.swing.table.AbstractTableModel;
import schmitzm.lang.LocaleComparator;
import schmitzm.lang.ResourceProvider;
-import schmitzm.swing.ExceptionDialog;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.JPanel;
-import schmitzm.swing.ManualInputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.SelectionInputOption;
import schmitzm.swing.event.InputOptionAdapter;
Modified: trunk/src/skrueger/geotools/MapPaneToolBar.java
===================================================================
--- trunk/src/skrueger/geotools/MapPaneToolBar.java 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/skrueger/geotools/MapPaneToolBar.java 2010-06-03 10:16:07 UTC (rev 886)
@@ -35,7 +35,6 @@
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Locale;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -52,13 +51,12 @@
import org.apache.log4j.Logger;
+import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.geotools.gui.SelectableXMapPane;
import schmitzm.geotools.gui.XMapPaneEvent;
import schmitzm.geotools.gui.XMapPaneTool;
import schmitzm.geotools.map.event.JMapPaneListener;
import schmitzm.geotools.map.event.MapAreaChangedEvent;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
import schmitzm.swing.ButtonGroup;
import skrueger.swing.SmallButton;
import skrueger.swing.SmallToggleButton;
@@ -80,12 +78,8 @@
private static final Logger LOGGER = Logger.getLogger(MapPaneToolBar.class
.getName());
- public static ResourceProvider RESOURCE = ResourceProvider.newInstance(LangUtil
- .extendPackagePath(MapPaneToolBar.class,
- "resource.locales.mapPaneToolbar"), Locale.ENGLISH);
-
public static String R(String key, Object... values) {
- return RESOURCE.getString(key, values);
+ return GeotoolsGUIUtil.R(key, values);
}
/** Constant for the tool "Panning" (10). */
Modified: trunk/src/skrueger/geotools/labelsearch/LabelSearch.java
===================================================================
--- trunk/src/skrueger/geotools/labelsearch/LabelSearch.java 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/skrueger/geotools/labelsearch/LabelSearch.java 2010-06-03 10:16:07 UTC (rev 886)
@@ -34,7 +34,6 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.Locale;
import org.apache.log4j.Logger;
import org.geotools.data.DefaultQuery;
@@ -51,9 +50,9 @@
import org.opengis.filter.expression.PropertyName;
import schmitzm.geotools.feature.FeatureUtil;
+import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.geotools.styling.StylingUtil;
import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
/**
* This class allows to search for a {@link String} in a map. The algorithm will
@@ -66,12 +65,8 @@
public class LabelSearch {
final static private Logger LOGGER = Logger.getLogger(LabelSearch.class);
- public static ResourceProvider RESOURCE = ResourceProvider.newInstance(LangUtil
- .extendPackagePath(LabelSearch.class, "labelsearch"),
- Locale.ENGLISH);
-
public static String R(String key, Object... values) {
- return RESOURCE.getString(key, values);
+ return GeotoolsGUIUtil.R(key, values);
}
protected final schmitzm.geotools.gui.SelectableXMapPane mapPane;
Deleted: trunk/src/skrueger/geotools/labelsearch/Snippet.java
===================================================================
--- trunk/src/skrueger/geotools/labelsearch/Snippet.java 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/skrueger/geotools/labelsearch/Snippet.java 2010-06-03 10:16:07 UTC (rev 886)
@@ -1,42 +0,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
- ******************************************************************************/
-package skrueger.geotools.labelsearch;
-
-import java.util.Locale;
-
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
-import skrueger.swing.TranslationAskJDialog;
-
-public class Snippet {
- public static ResourceProvider RESOURCE = ResourceProvider.newInstance(LangUtil
- .extendPackagePath(TranslationAskJDialog.class,
- "resource.locales.SwingResourceBundle"), Locale.ENGLISH);
-}
Deleted: trunk/src/skrueger/geotools/labelsearch/labelsearch.properties
===================================================================
--- trunk/src/skrueger/geotools/labelsearch/labelsearch.properties 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/skrueger/geotools/labelsearch/labelsearch.properties 2010-06-03 10:16:07 UTC (rev 886)
@@ -1,63 +0,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. Kr\u00fcger - 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. Kr\u00fcger - additional utility classes
-##########
-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>
Deleted: trunk/src/skrueger/geotools/labelsearch/labelsearch_de.properties
===================================================================
--- trunk/src/skrueger/geotools/labelsearch/labelsearch_de.properties 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/skrueger/geotools/labelsearch/labelsearch_de.properties 2010-06-03 10:16:07 UTC (rev 886)
@@ -1,63 +0,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. Kr\u00fcger - 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. Kr\u00fcger - additional utility classes
-##########
-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>
Deleted: trunk/src/skrueger/geotools/labelsearch/labelsearch_fr.properties
===================================================================
--- trunk/src/skrueger/geotools/labelsearch/labelsearch_fr.properties 2010-06-03 10:15:27 UTC (rev 885)
+++ trunk/src/skrueger/geotools/labelsearch/labelsearch_fr.properties 2010-06-03 10:16:07 UTC (rev 886)
@@ -1,61 +0,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. Kr\u00fcger - 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. Kr\u00fcger - additional utility classes
-##########
-SearchMapDialog.Results.Column.Layer=Retrouv\u00e9s dans
-SearchMapDialog.Results.Column.Name=Nom
-SearchMapDialog.resultsTable.tt=Cliquer sur un r\u00e9sultat pour l`afficher.
-SearchMapDialog.searchString.Label=Entrer le domaine de recherche:
-SearchMapDialog.searchString.tt=Saisir le domaine de recherche et appuyer sur [Enter]
-SearchMapDialog.title=Rechercher dans la carte: ${0}
More information about the Schmitzm-commits
mailing list