[Schmitzm-commits] r1456 - in trunk: schmitzm-core/src/main/java/de/schmitzm/i18n schmitzm-core/src/main/java/de/schmitzm/swing schmitzm-gt/src/main/java/de/schmitzm/geotools/styling

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2011-01-27 17:20:40 +0100 (Thu, 27 Jan 2011)
New Revision: 1456

Modified:
   trunk/schmitzm-core/src/main/java/de/schmitzm/i18n/LanguagesComboBox.java
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/Disposable.java
   trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StylingUtil.java
Log:


Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/i18n/LanguagesComboBox.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/i18n/LanguagesComboBox.java	2011-01-27 16:18:29 UTC (rev 1455)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/i18n/LanguagesComboBox.java	2011-01-27 16:20:40 UTC (rev 1456)
@@ -32,7 +32,7 @@
 	 * second parameter.
 	 * 
 	 * @param langCodes
-	 *            If <code>null</code>, {@link I8NUtil#getLanguageCodes()} will
+	 *            If <code>null</code>, {@link I18NUtil#getLanguageCodes()} will
 	 *            be used
 	 */
 	public LanguagesComboBox(Collection<String> langCodes,
@@ -57,13 +57,13 @@
 
 		for (String lc : langCodes) {
 			//
-			// if (I8NUtil.isValidISOLangCode(lc)) {
-			// Locale locale = I8NUtil.getFirstLocaleForLang(lc);
+			// if (I18NUtil.isValidISOLangCode(lc)) {
+			// Locale locale = I18NUtil.getFirstLocaleForLang(lc);
 			// availLangs.add(locale.getDisplayLanguage() + " / "
 			// + locale.getDisplayLanguage(locale) + " " + lc);
-			// } else if (I8NUtil.isPropertiesLanguage(lc)) {
+			// } else if (I18NUtil.isPropertiesLanguage(lc)) {
 			//
-			// PropertiesLocale pl = I8NUtil.propLocales.get(lc);
+			// PropertiesLocale pl = I18NUtil.propLocales.get(lc);
 			// availLangs.add(pl.getDisplayLanguage() + " / "
 			// + pl.getDisplayLanguage(lc) + " " + lc);
 			// }

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/Disposable.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/Disposable.java	2011-01-27 16:18:29 UTC (rev 1455)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/Disposable.java	2011-01-27 16:20:40 UTC (rev 1456)
@@ -1,7 +1,14 @@
 package de.schmitzm.swing;
 
+/**
+ * Dieses "Marker-Interface" kann jeder beliebigen Klasse hinzugefügt werden, um
+ * zu markieren, dass die Klasse eine FUktion <code>dispose</code> unterstützt
+ * welche der GC beim aufräumen hilft wenn das Objekt nicht mehr verwendet wird.
+ * 
+ * @author Stefan A. Tzeggai
+ */
 public interface Disposable {
 
 	public void dispose();
-	
+
 }

Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StylingUtil.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StylingUtil.java	2011-01-27 16:18:29 UTC (rev 1455)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StylingUtil.java	2011-01-27 16:20:40 UTC (rev 1456)
@@ -2438,6 +2438,12 @@
 
 			if (!style2file.exists())
 				return true;
+			
+			if (style2file.length() == 0l && style1 != null)
+				return true;
+			
+			if (style2file.length() == 0l && style1 == null)
+				return false;
 
 			Style style2 = loadSLD(style2file)[0];