修改PMD中的问题

designer/src/com/fr/design/javascript/ListenerEditPane.java

@@ -42,11 +42,11 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
 	// 发送邮件
 	private EmailPane emailPane;
 	
-	private static final String JS = Inter.getLocText("JavaScript");
-	private static final String FORMSUBMIT = Inter.getLocText("JavaScript-Form_Submit");
-	private static final String DBCOMMIT = Inter.getLocText("JavaScript-Commit_to_Database");
-	private static final String CUSTOMACTION= Inter.getLocText(new String[]{"Custom", "RWA-Submit"});
-	private static final String EMAIL = Inter.getLocText("Email_sentEmail");
+	private static final String JS = Inter.getLocText("FR-Designer_JavaScript");
+	private static final String FORMSUBMIT = Inter.getLocText("FR-Designer_JavaScript_Form_Submit");
+	private static final String DBCOMMIT = Inter.getLocText("FR-Designer_JavaScript_Commit_to_Database");
+	private static final String CUSTOMACTION= Inter.getLocText(new String[]{"FR-Designer_JavaScript_Custom", "FR-Designer_RWA_Submit"});
+	private static final String EMAIL = Inter.getLocText("FR-Designer_Email_sentEmail");
 	
 	private Listener listener;
 	
@@ -72,19 +72,14 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
 		String[] style = {JS, DBCOMMIT, CUSTOMACTION,EMAIL};
 		styleBox = new UIComboBox(style);
 		namePane.add(styleBox);
-		namePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel("  " + Inter.getLocText("Event_Name") + ":"), nameText, new UILabel("    " + Inter.getLocText("Event_Type") + ":"), styleBox}, FlowLayout.LEFT);
-		namePane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("Event_Name_Type")));
+		namePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel("  " + Inter.getLocText("FR-Designer_Event_Name") + ":"), nameText, new UILabel("    " + Inter.getLocText("FR-Designer_Event_Type") + ":"), styleBox}, FlowLayout.LEFT);
+		namePane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer_Event_Name_Type")));
 		this.add(namePane, BorderLayout.NORTH);
-		
 		card = new CardLayout();
 		hyperlinkPane = FRGUIPaneFactory.createCardLayout_S_Pane();
 		hyperlinkPane.setLayout(card);
-		// js
 		javaScriptPane = new JavaScriptImplPane(defaultArgs);
 		hyperlinkPane.add(JS, javaScriptPane);
-//		formSubmitScriptPane = new FormSubmitJavaScriptPane(JavaScriptActionPane.defaultJavaScriptActionPane
-//				.createCallButton());
-//		hyperlinkPane.add(FORMSUBMIT, formSubmitScriptPane);
 		// 提交入库
         List dbmaniList = new ArrayList();
         dbmaniList.add(autoCreateDBManipulationPane());
@@ -94,7 +89,6 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
 		// 自定义事件
 		customActionPane = new CustomActionPane();
 		hyperlinkPane.add(CUSTOMACTION, customActionPane);
-		
 		// 发送邮件
 		emailPane = new EmailPane();
 		hyperlinkPane.add(EMAIL,emailPane);
@@ -102,7 +96,18 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
 		cards.add(commit2DBJavaScriptPane);
 		cards.add(customActionPane);
 		cards.add(emailPane);
+		//其他事件
+		addOtherEvent();
+		hyperlinkPane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer_JavaScript_Set")));
+		this.add(hyperlinkPane);
+		styleBox.addItemListener(new ItemListener() {
+			public void itemStateChanged(ItemEvent e) {
+				card.show(hyperlinkPane, styleBox.getSelectedItem().toString());
+			}
+		});
+	}
 
+	private void addOtherEvent(){
 		Set<JavaScriptActionProvider> javaScriptActionProviders = ExtraDesignClassManager.getInstance().getArray(JavaScriptActionProvider.XML_TAG);
 		if (javaScriptActionProviders != null) {
 			for (JavaScriptActionProvider jsp : javaScriptActionProviders) {
@@ -113,15 +118,6 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
 				cards.add(pane);
 			}
 		}
-
-		hyperlinkPane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("JavaScript_Set")));
-		this.add(hyperlinkPane);
-
-		styleBox.addItemListener(new ItemListener() {
-			public void itemStateChanged(ItemEvent e) {
-				card.show(hyperlinkPane, styleBox.getSelectedItem().toString());
-			}
-		});
 	}
 
     /**
@@ -135,7 +131,7 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return Inter.getLocText("Event_Set");
+		return Inter.getLocText("FR-Designer_Event_Set");
 	}
 	
 	@Override

designer/src/com/fr/design/widget/CellWidgetCardPane.java

@@ -51,8 +51,8 @@ public class CellWidgetCardPane extends BasicPane {
         formPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         eventTabPane = new WidgetEventPane(pane);
         formPane.add(eventTabPane, BorderLayout.CENTER);
-        tabbedPane.add(Inter.getLocText("Attribute"), attriPane);
-        tabbedPane.add(Inter.getLocText("Form-Editing_Listeners"), formPane);
+        tabbedPane.add(Inter.getLocText("FR-Designer_Attribute"), attriPane);
+        tabbedPane.add(Inter.getLocText("FR-Designer_Form_Editing_Listeners"), formPane);
 
         presPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         cardPaneForPresent = FRGUIPaneFactory.createCardLayout_S_Pane();
@@ -88,7 +88,7 @@ public class CellWidgetCardPane extends BasicPane {
         widgetPropertyPane = new BasicWidgetPropertySettingPane();
         JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         northPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 0, 8));
-        JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Form-Basic_Properties"));
+        JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Form_Basic_Properties"));
         northPane.add(basic);
         basic.add(widgetPropertyPane);
         attriPane.add(northPane, BorderLayout.NORTH);
@@ -162,7 +162,7 @@ public class CellWidgetCardPane extends BasicPane {
     private void addPresPane(boolean add) {
         if (add) {
             tabbedPane.add(this.presPane, 1);
-            tabbedPane.setTitleAt(1, Inter.getLocText("DS-Dictionary"));
+            tabbedPane.setTitleAt(1, Inter.getLocText("FR-Designer_DS_Dictionary"));
         } else {
             tabbedPane.remove(presPane);
         }
@@ -171,7 +171,7 @@ public class CellWidgetCardPane extends BasicPane {
     private void addTreeSettingPane(boolean add) {
         if (add) {
             tabbedPane.add(this.cardPaneForTreeSetting, 1);
-            tabbedPane.setTitleAt(1, Inter.getLocText("Create_Tree"));
+            tabbedPane.setTitleAt(1, Inter.getLocText("FR-Designer_Create_Tree"));
         } else {
             tabbedPane.remove(this.cardPaneForTreeSetting);
         }

designer_base/src/com/fr/design/gui/frpane/ListenerUpdatePane.java

@@ -29,7 +29,7 @@ public abstract class ListenerUpdatePane extends BasicBeanPane<Listener> {
 
 	@Override
 	protected String title4PopupWindow() {
-		return Inter.getLocText("Event");
+		return Inter.getLocText("FR-Designer_Event");
 	}
 
     @Override

designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java

@@ -75,14 +75,14 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
      * @return 返回按钮对象
      */
     public UIButton createCallButton() {
-        UIButton callButton = new UIButton(Inter.getLocText("Set_Callback_Function"));
+        UIButton callButton = new UIButton(Inter.getLocText("FR-Designer_Set_Callback_Function"));
         callButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 final JavaScriptActionPane callPane = new JavaScriptActionPane() {
                     @Override
                     protected String title4PopupWindow() {
-                        return Inter.getLocText("Set_Callback_Function");
+                        return Inter.getLocText("FR-Designer_Set_Callback_Function");
                     }
 
                     @Override
@@ -153,7 +153,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
 
         @Override
         protected String title4PopupWindow() {
-            return Inter.getLocText("Set_Callback_Function");
+            return Inter.getLocText("FR-Designer_Set_Callback_Function");
         }
 
         @Override
@@ -181,7 +181,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
 
             @Override
             protected String title4PopupWindow() {
-                return Inter.getLocText("Set_Callback_Function");
+                return Inter.getLocText("FR-Designer_Set_Callback_Function");
             }
 
             @Override

designer_base/src/com/fr/design/locale/designer.properties

@@ -493,3 +493,18 @@ FR-Designer_Exporting=Exporting
 FR-Designer_Export-PDF=PDF
 FR-Designer_Button_OK=OK
 FR-Designer_Button_Cancel=Cancel
+FR-Designer_JavaScript=
+FR-Designer_JavaScript_Form_Submit=
+FR-Designer_JavaScript_Commit_to_Database=
+FR-Designer_JavaScript_Custom=
+FR-Designer_RWA_Submit=
+FR-Designer_Event_Name=
+FR-Designer_Event_Type=
+FR-Designer_Event_Name_Type=
+FR-Designer_JavaScript_Set=
+FR-Designer_Attribute=
+FR-Designer_Form_Editing_Listeners=
+FR-Designer_Form_Basic_Properties=
+FR-Designer_DS_Dictionary=
+FR-Designer_Create_Tree=
+FR-Designer_Set_Callback_Function=

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -493,3 +493,19 @@ FR-Designer_Export-PDF=PDF
 FR-Designer_Properties_Mobile=MobileProperties
 FR-Designer_Button_OK=OK
 FR-Designer_Button_Cancel=Cancel
+FR-Designer_JavaScript=JavaScript
+FR-Designer_JavaScript_Form_Submit=Form Submit
+FR-Designer_JavaScript_Commit_to_Database=Commit to DB
+FR-Designer_JavaScript_Custom=Custom
+FR-Designer_RWA_Submit=Submit
+FR-Designer_Event_Name=Event Name
+FR-Designer_Event_Type=Event Type
+FR-Designer_Event_Name_Type=Event Name and Type
+FR-Designer_JavaScript_Set=JavaScript Set
+FR-Designer_Attribute=Attribute
+FR-Designer_Form_Editing_Listeners=Event editing
+FR-Designer_Form_Basic_Properties=Basic Property
+FR-Designer_DS_Dictionary=Data Dictionary
+FR-Designer_Create_Tree=Build Tree
+FR-Designer_Set_Callback_Function=Set Callback Function
+

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -471,4 +471,19 @@ FR-Designer_Exported_successfully=\u5C0E\u51FA\u6210\u529F
 FR-Designer_Exporting=\u5C0E\u51FA\u3057\u3066\u3044\u307E\u3059
 FR-Designer_Export-PDF=PDF\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8FR-Designer_Button_OK=FR-Designer_Button_OK=\u78BA\u5B9A
 FR-Designer_Button_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
-\
+\uFFFD
+FR-Designer_JavaScript=
+FR-Designer_JavaScript_Form_Submit=
+FR-Designer_JavaScript_Commit_to_Database=
+FR-Designer_JavaScript_Custom=
+FR-Designer_RWA_Submit=
+FR-Designer_Event_Name=
+FR-Designer_Event_Type=
+FR-Designer_Event_Name_Type=
+FR-Designer_JavaScript_Set=
+FR-Designer_Attribute=
+FR-Designer_Form_Editing_Listeners=
+FR-Designer_Form_Basic_Properties=
+FR-Designer_DS_Dictionary=
+FR-Designer_Create_Tree=
+FR-Designer_Set_Callback_Function=

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -466,4 +466,19 @@ FR-Designer_Exported_successfully=\uB0B4\uBCF4\uB0B4\uAE30\uC131\uACF5
 FR-Designer_Exporting=\uB0B4\uBCF4\uB0B4\uAE30\uC911
 FR-Designer_Export-PDF=PDF\uC11C\uC2DDFR-Designer_Properties=\uFFFD
 FR-Designer_Button_OK=\uD655\uC778FR-Designer_Button_Cancel=\uCDE8\uC18C
-\
+\uFFFD
+FR-Designer_JavaScript=
+FR-Designer_JavaScript_Form_Submit=
+FR-Designer_JavaScript_Commit_to_Database=
+FR-Designer_JavaScript_Custom=
+FR-Designer_RWA_Submit=
+FR-Designer_Event_Name=
+FR-Designer_Event_Type=
+FR-Designer_Event_Name_Type=
+FR-Designer_JavaScript_Set=
+FR-Designer_Attribute=
+FR-Designer_Form_Editing_Listeners=
+FR-Designer_Form_Basic_Properties=
+FR-Designer_DS_Dictionary=
+FR-Designer_Create_Tree=
+FR-Designer_Set_Callback_Function=

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -497,3 +497,18 @@ FR-Designer_Export-PDF=PDF\u683C\u5F0F
 FR-Designer_Properties_Mobile=\u624B\u673A\u5C5E\u6027
 FR-Designer_Button_OK=\u786E\u5B9A
 FR-Designer_Button_Cancel=\u53D6\u6D88
+FR-Designer_JavaScript=JavaScript\u811A\u672C
+FR-Designer_JavaScript_Form_Submit=\u8868\u5355\u63D0\u4EA4
+FR-Designer_JavaScript_Commit_to_Database=\u63D0\u4EA4\u5165\u5E93
+FR-Designer_JavaScript_Custom=\u81EA\u5B9A\u4E49
+FR-Designer_RWA_Submit=\u63D0\u4EA4
+FR-Designer_Event_Name=\u4E8B\u4EF6\u540D
+FR-Designer_Event_Type=\u4E8B\u4EF6\u7C7B\u578B
+FR-Designer_Event_Name_Type=\u4E8B\u4EF6\u540D\u5B57\u548C\u7C7B\u578B
+FR-Designer_JavaScript_Set=JS\u8BBE\u7F6E
+FR-Designer_Attribute=\u5C5E\u6027
+FR-Designer_Form_Editing_Listeners=\u4E8B\u4EF6\u7F16\u8F91
+FR-Designer_Form_Basic_Properties=\u57FA\u672C\u5C5E\u6027
+FR-Designer_DS_Dictionary=\u6570\u636E\u5B57\u5178
+FR-Designer_Create_Tree=\u6784\u5EFA\u6811
+FR-Designer_Set_Callback_Function=\u8BBE\u7F6E\u56DE\u8C03\u51FD\u6570

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -485,3 +485,18 @@ FR-Designer_Export-PDF=PDF\u683C\u5F0F
 FR-Designer_Properties_Mobile=\u624B\u6A5F\u5C6C\u6027
 FR-Designer_Button_OK=\u78BA\u5B9A
 FR-Designer_Button_Cancel=\u53D6\u6D88
+FR-Designer_JavaScript=
+FR-Designer_JavaScript_Form_Submit=
+FR-Designer_JavaScript_Commit_to_Database=
+FR-Designer_JavaScript_Custom=
+FR-Designer_RWA_Submit=
+FR-Designer_Event_Name=
+FR-Designer_Event_Type=
+FR-Designer_Event_Name_Type=
+FR-Designer_JavaScript_Set=
+FR-Designer_Attribute=
+FR-Designer_Form_Editing_Listeners=
+FR-Designer_Form_Basic_Properties=
+FR-Designer_DS_Dictionary=
+FR-Designer_Create_Tree=
+FR-Designer_Set_Callback_Function=