[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1848] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt/internal/ui/text/folding

[<caw...@us...>]

Revision: 1848
          http://svn.sourceforge.net/rubyeclipse/?rev=1848&view=rev
Author:   cawilliams
Date:     2007-01-22 12:57:20 -0800 (Mon, 22 Jan 2007)

Log Message:
-----------
try to move us towards using only subclasses of NLS for translations - so we get accurate information on what strings are missing and what are unused.

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/DefaultRubyFoldingPreferenceBlock.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/EmptyRubyFoldingPreferenceBlock.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/FoldingMessages.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/FoldingMessages.properties

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/DefaultRubyFoldingPreferenceBlock.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/DefaultRubyFoldingPreferenceBlock.java	2007-01-22 20:56:38 UTC (rev 1847)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/DefaultRubyFoldingPreferenceBlock.java	2007-01-22 20:57:20 UTC (rev 1848)
@@ -84,11 +84,11 @@
 		inner.setLayout(layout);
 		
 		Label label= new Label(inner, SWT.LEFT);
-		label.setText(FoldingMessages.getString("DefaultRubyFoldingPreferenceBlock.title")); //$NON-NLS-1$
+		label.setText(FoldingMessages.DefaultRubyFoldingPreferenceBlock_title);
 		
-		addCheckBox(inner, FoldingMessages.getString("DefaultRubyFoldingPreferenceBlock.comments"), PreferenceConstants.EDITOR_FOLDING_RDOC, 0); //$NON-NLS-1$
-		addCheckBox(inner, FoldingMessages.getString("DefaultRubyFoldingPreferenceBlock.innerTypes"), PreferenceConstants.EDITOR_FOLDING_INNERTYPES, 0); //$NON-NLS-1$
-		addCheckBox(inner, FoldingMessages.getString("DefaultRubyFoldingPreferenceBlock.methods"), PreferenceConstants.EDITOR_FOLDING_METHODS, 0); //$NON-NLS-1$
+		addCheckBox(inner, FoldingMessages.DefaultRubyFoldingPreferenceBlock_comments, PreferenceConstants.EDITOR_FOLDING_RDOC, 0); //$NON-NLS-1$
+		addCheckBox(inner, FoldingMessages.DefaultRubyFoldingPreferenceBlock_innerTypes, PreferenceConstants.EDITOR_FOLDING_INNERTYPES, 0); //$NON-NLS-1$
+		addCheckBox(inner, FoldingMessages.DefaultRubyFoldingPreferenceBlock_methods, PreferenceConstants.EDITOR_FOLDING_METHODS, 0); //$NON-NLS-1$
 		
 		return inner;
 	}

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/EmptyRubyFoldingPreferenceBlock.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/EmptyRubyFoldingPreferenceBlock.java	2007-01-22 20:56:38 UTC (rev 1847)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/EmptyRubyFoldingPreferenceBlock.java	2007-01-22 20:57:20 UTC (rev 1848)
@@ -40,7 +40,7 @@
 		label.setLayoutData(gd);
 		
 		label= new Label(inner, SWT.CENTER);
-		label.setText(FoldingMessages.getString("EmptyRubyFoldingPreferenceBlock.emptyCaption")); //$NON-NLS-1$
+		label.setText(FoldingMessages.EmptyRubyFoldingPreferenceBlock_emptyCaption);
 		gd= new GridData(GridData.CENTER);
 		label.setLayoutData(gd);
 

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/FoldingMessages.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/FoldingMessages.java	2007-01-22 20:56:38 UTC (rev 1847)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/FoldingMessages.java	2007-01-22 20:57:20 UTC (rev 1848)
@@ -10,26 +10,24 @@
  *******************************************************************************/
 package org.rubypeople.rdt.internal.ui.text.folding;
 
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
 
 /**
- * @since 3.0
+ * @since 0.8.0
  */
-class FoldingMessages {
+class FoldingMessages extends NLS {
 
 	private static final String BUNDLE_NAME= FoldingMessages.class.getName();
-
-	private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
-
 	private FoldingMessages() {
 	}
+	
+	public static String DefaultRubyFoldingPreferenceBlock_title;
+	public static String DefaultRubyFoldingPreferenceBlock_comments;
+	public static String DefaultRubyFoldingPreferenceBlock_innerTypes;
+	public static String DefaultRubyFoldingPreferenceBlock_methods;
+	public static String EmptyRubyFoldingPreferenceBlock_emptyCaption;
 
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, FoldingMessages.class);
 	}
 }

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/FoldingMessages.properties
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/FoldingMessages.properties	2007-01-22 20:56:38 UTC (rev 1847)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/folding/FoldingMessages.properties	2007-01-22 20:57:20 UTC (rev 1848)
@@ -10,10 +10,9 @@
 ###############################################################################
 
 
-DefaultRubyFoldingPreferenceBlock.title= Initially fold these region types:
-DefaultRubyFoldingPreferenceBlock.comments= &Comments
-DefaultRubyFoldingPreferenceBlock.innerTypes= Inner &types
-DefaultRubyFoldingPreferenceBlock.methods= &Methods
-DefaultRubyFoldingPreferenceBlock.imports= &Imports
+DefaultRubyFoldingPreferenceBlock_title= Initially fold these region types:
+DefaultRubyFoldingPreferenceBlock_comments= &Comments
+DefaultRubyFoldingPreferenceBlock_innerTypes= Inner &types
+DefaultRubyFoldingPreferenceBlock_methods= &Methods
 
-EmptyRubyFoldingPreferenceBlock.emptyCaption=
+EmptyRubyFoldingPreferenceBlock_emptyCaption=


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.