[Schmitzm-commits] r887 - in trunk/src: schmitzm/lang skrueger/geotools/labelsearch

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2010-06-03 12:36:57 +0200 (Thu, 03 Jun 2010)
New Revision: 887

Modified:
   trunk/src/schmitzm/lang/ResourceProvider.java
   trunk/src/skrueger/geotools/labelsearch/LabelSearch.java
Log:


Modified: trunk/src/schmitzm/lang/ResourceProvider.java
===================================================================
--- trunk/src/schmitzm/lang/ResourceProvider.java	2010-06-03 10:16:07 UTC (rev 886)
+++ trunk/src/schmitzm/lang/ResourceProvider.java	2010-06-03 10:36:57 UTC (rev 887)
@@ -740,37 +740,37 @@
 	  return RESOURCE_PROVIDER_SORTABLE;
 	}
 	
+//	/**
+//	 * Setzt alternative ResourceBundles für jeden bisher registrierten
+//	 * ResourceProvider. Das alternative Bundle wird ohne die Packagebezeichung
+//	 * im Classpath als Datei erwartet.
+//	 * 
+//	 * @param prefix
+//	 *            <code>null</code> 
+//	 */
+//	public static void resetAllRegisteredResourceBundles() {
+//		// Enabling user-translated locales that are searched in the classpath
+//		for (ResourceProvider rp : RESOURCE_PROVIDER_SORTABLE) {
+//			String filename = rp.getBundleName();
+//			if (filename.contains("."))
+//				filename = filename.substring(filename.lastIndexOf('.') + 1);
+//			rp.resetResourceBundle(filename);
+//		}
+//	}
+
 	/**
-	 * Setzt alternative ResourceBundles für jeden bisher registrierten
-	 * ResourceProvider. Das alternative Bundle wird ohne die Packagebezeichung
-	 * im Classpath als Datei erwartet.
+	 * Setzt einen alternativen ResourceBundle für all bisher registrierten
+	 * ResourceProviders.
 	 * 
-	 * @param prefix
-	 *            <code>null</code> 
+	 * @param bundle
+	 *            neue Bundle
 	 */
-	public static void resetAllRegisteredResourceBundles() {
+	public static void resetAllRegisteredResourceBundles(String bundle) {
 		// Enabling user-translated locales that are searched in the classpath
 		for (ResourceProvider rp : RESOURCE_PROVIDER_SORTABLE) {
-			String filename = rp.getBundleName();
-			if (filename.contains("."))
-				filename = filename.substring(filename.lastIndexOf('.') + 1);
-			rp.resetResourceBundle(filename);
+			rp.resetResourceBundle(bundle, rp.getBundleName());
 		}
 	}
-	//
-	// /**
-	// * Setzt einen alternativen ResourceBundle für all bisher registrierten
-	// ResourceProviders.
-	// * @param bundle neue Bundle
-	// * @param prefix <code>null</code> oder prefix
-	// */
-	// public static void resetAllRegisteredResourceBundles(String bundle) {
-	// // Enabling user-translated locales that are searched in the classpath
-	// for (ResourceProvider rp : RESOURCE_BUNDLES) {
-	// rp.resetResourceBundle(bundle, rp.getBundleName());
-	// }
-	// }
-
 	
 	
 }

Modified: trunk/src/skrueger/geotools/labelsearch/LabelSearch.java
===================================================================
--- trunk/src/skrueger/geotools/labelsearch/LabelSearch.java	2010-06-03 10:16:07 UTC (rev 886)
+++ trunk/src/skrueger/geotools/labelsearch/LabelSearch.java	2010-06-03 10:36:57 UTC (rev 887)
@@ -65,6 +65,7 @@
 public class LabelSearch {
 	final static private Logger LOGGER = Logger.getLogger(LabelSearch.class);
 
+	/** Translations come from GTResourceBundle **/
 	public static String R(String key, Object... values) {
 		return GeotoolsGUIUtil.R(key, values);
 	}