[Schmitzm-commits] r520 - in branches/1.0-gt2-2.6/src: schmitzm/geotools/gui/resource/locales schmitzm/swing/resource/locales skrueger/geotools skrueger/swing

Tue Nov 17 13:50:07 CET 2009

Author: alfonx
Date: 2009-11-17 13:50:05 +0100 (Tue, 17 Nov 2009)
New Revision: 520

Modified:
   branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties
   branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties
   branches/1.0-gt2-2.6/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties
   branches/1.0-gt2-2.6/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties
   branches/1.0-gt2-2.6/src/skrueger/geotools/MapView.java
   branches/1.0-gt2-2.6/src/skrueger/swing/CancellableDialogAdapter.java
Log:
* Moved translations for CancellableDialogAdapter to SwingResources (was in GTResouces)

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties
===================================================================

--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties	2009-11-17 12:49:12 UTC (rev 519)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties	2009-11-17 12:50:05 UTC (rev 520)
@@ -155,6 +155,3 @@
 schmitzm.geotools.gui.GridPanelFormatter_LatLon1.title=deegree\u00b0 minute' (N|E|S|W)
 schmitzm.geotools.gui.GridPanelFormatter.ToolTipTemplate=${0} in unit ${1}
 
-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> has be be closed now.<br>Do you want to save any changes?</html>

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties	2009-11-17 12:49:12 UTC (rev 519)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties	2009-11-17 12:50:05 UTC (rev 520)
@@ -119,6 +119,3 @@
 
 schmitzm.geotools.gui.GridPanelFormatter.ToolTipTemplate=${0} in Einheit ${1}
 
-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>

Modified: branches/1.0-gt2-2.6/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties	2009-11-17 12:49:12 UTC (rev 519)
+++ branches/1.0-gt2-2.6/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties	2009-11-17 12:50:05 UTC (rev 520)
@@ -170,7 +170,9 @@
 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> has be 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.
\ No newline at end of file

Modified: branches/1.0-gt2-2.6/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties	2009-11-17 12:49:12 UTC (rev 519)
+++ branches/1.0-gt2-2.6/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties	2009-11-17 12:50:05 UTC (rev 520)
@@ -154,3 +154,11 @@
 
 TranslationAskJDialog.Title=Bitte übersetzen
 TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation = Die Zeichen { und } dürfen 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 Übersicht über den aktuellen Speicherverbrauch der Anwendung. 
\ No newline at end of file

Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/MapView.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/MapView.java	2009-11-17 12:49:12 UTC (rev 519)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/MapView.java	2009-11-17 12:50:05 UTC (rev 520)
@@ -238,4 +238,12 @@
 		return jToolBar.getSelectedTool();
 	}
 
+	/**
+	 * Help the garbage collection
+	 */
+	public void dispose() {
+		if (geoMapPane != null)
+			geoMapPane.dispose();
+	}
+
 }

Modified: branches/1.0-gt2-2.6/src/skrueger/swing/CancellableDialogAdapter.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/swing/CancellableDialogAdapter.java	2009-11-17 12:49:12 UTC (rev 519)
+++ branches/1.0-gt2-2.6/src/skrueger/swing/CancellableDialogAdapter.java	2009-11-17 12:50:05 UTC (rev 520)
@@ -10,6 +10,7 @@
 import schmitzm.geotools.gui.GeotoolsGUIUtil;
 import schmitzm.lang.LangUtil;
 import schmitzm.lang.ResourceProvider;
+import schmitzm.swing.SwingUtil;
 
 /**
  * An abstract {@link JDialog} that implements a basic structure of how
@@ -22,11 +23,11 @@
 public abstract class CancellableDialogAdapter extends AtlasDialog implements
 		CancellableDialog {
 	
-
 	protected static ResourceProvider RESOURCE = new ResourceProvider(LangUtil
-			.extendPackagePath(GeotoolsGUIUtil.class,
-					"resource.locales.GTResourceBundle"), Locale.ENGLISH);
+			.extendPackagePath(SwingUtil.class,
+					"resource.locales.SwingResourceBundle"), Locale.ENGLISH);
 
+
 	/** Has this dialog been canceled ?**/
 	protected boolean cancelled = false;
 	

