Merge pull request #39 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0

* commit 'ad82af29f5d484c4d47763509481ece039fa595c':
  REPORT-7867 删除不在i18n下的国际化文件

designer-base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java

@@ -24,6 +24,7 @@ import com.fr.design.gui.syntax.ui.rtextarea.IconRowHeader;
 import com.fr.design.gui.syntax.ui.rtextarea.RecordableTextAction;
 import com.fr.design.gui.syntax.ui.rtextarea.RTextArea;
 import com.fr.design.gui.syntax.ui.rtextarea.RTextAreaEditorKit;
+import com.fr.general.Inter;
 
 
 /**
@@ -72,10 +73,6 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
 	public static final String rstaToggleCommentAction 		= "RSTA.ToggleCommentAction";
 	public static final String rstaToggleCurrentFoldAction	= "RSTA.ToggleCurrentFoldAction";
 
-	private static final String MSG	= "com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea";
-	private static final ResourceBundle msg = ResourceBundle.getBundle(MSG);
-
-
 	/**
 	 * The actions that <code>RSyntaxTextAreaEditorKit</code> adds to those of
 	 * <code>RTextAreaEditorKit</code>.
@@ -163,7 +160,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
 	 * @return The localized text.
 	 */
 	public static String getString(String key) {
-		return msg.getString(key);
+		return Inter.getLocText(key);
 	}
 
 

designer-base/src/com/fr/design/gui/syntax/ui/rtextarea/RUndoManager.java

@@ -8,6 +8,8 @@
  */
 package com.fr.design.gui.syntax.ui.rtextarea;
 
+import com.fr.general.Inter;
+
 import java.util.ResourceBundle;
 import javax.swing.Action;
 import javax.swing.UIManager;
@@ -40,9 +42,6 @@ public class RUndoManager extends UndoManager {
 
 	private int internalAtomicEditDepth;
 
-	private static final String MSG	= "com.fr.design.gui.syntax.ui.rtextarea.RTextArea";
-
-
 	/**
 	 * Constructor.
 	 *
@@ -50,9 +49,8 @@ public class RUndoManager extends UndoManager {
 	 */
 	public RUndoManager(RTextArea textArea) {
 		this.textArea = textArea;
-		ResourceBundle msg = ResourceBundle.getBundle(MSG);
+		cantUndoText = Inter.getLocText("Action.CantUndo.Name");
-		cantUndoText = msg.getString("Action.CantUndo.Name");
+		cantRedoText = Inter.getLocText("Action.CantRedo.Name");
-		cantRedoText = msg.getString("Action.CantRedo.Name");
 	}