REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容

designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java

@@ -383,7 +383,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
         UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"),
                 new EmailJavaScript(), EmailPane.class);
 
-        UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"),
+        UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),
                 new WebHyperlink(), WebHyperlinkPane.class);
         data.add(reportlet);
         data.add(email);

designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java

@@ -45,13 +45,13 @@ public class UIMenuTable extends JTable {
 	public void editingEvent(int rowIndex, int mouseY) {
 		selectedRowIndex = rowIndex;
 		repaint();
-		
+
 		final UIMenuNameableCreator nameObject = UIMenuTable.this.getLine(rowIndex);
-		
+
 		final BasicBeanPane<Object> baseShowPane = nameObject.getPane();
-		
+
 		final Object showValue = nameObject.getObj();
-		
+
 		baseShowPane.populateBean(showValue);
 
         UIDialog dialog = baseShowPane.showUnsizedWindow(SwingUtilities.getWindowAncestor(new JPanel()), new DialogActionAdapter() {
@@ -60,13 +60,13 @@ public class UIMenuTable extends JTable {
 				fireTargetChanged();
 			}
 		});
-		
+
 		dialog.setSize(500, 600);
 		GUICoreUtils.centerWindow(dialog);
-		
+
 		dialog.setVisible(true);
 	}
-	
+
 	protected Color getRenderBackground(int row) {
 		if(selectedRowIndex == row ) {
 			return UIConstants.SKY_BLUE;
@@ -76,7 +76,7 @@ public class UIMenuTable extends JTable {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param value 该行列的值(字符串)
 	 * @param row
 	 * @param column
@@ -113,7 +113,7 @@ public class UIMenuTable extends JTable {
 	public void removeLine(int rowIndex) {
 		((UIMenuTableDataModel)dataModel).removeLine(rowIndex);
 	}
-	
+
 	/**
 	 * 清除所有的内容
 	 */
@@ -217,7 +217,7 @@ public class UIMenuTable extends JTable {
 		UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Email"),
 				new EmailJavaScript(), EmailPane.class);
 
-		UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"),
+		UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),
 				new WebHyperlink(), WebHyperlinkPane.class );
 		data.add(reportlet);
 		data.add(email);

designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java

@@ -51,7 +51,7 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
 
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link");
     }
 
     @Override

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java

@@ -33,7 +33,7 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane {
         List<ChartUIMenuNameableCreator> list = new ArrayList<ChartUIMenuNameableCreator>();
         java.util.HashMap<String, BaseFormula> hyperLinkEditorMap = plot.getHyperLinkEditorMap();
 
-        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"),
+        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),
                 new WebHyperlink(), getUseMap(map, WebHyperlink.class)));
         list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "FR-Designer_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class)));
         list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive-Chart"), null, null));

designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java

@@ -100,7 +100,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
             } else if (js instanceof ReportletHyperlink) {
                 this.typeField.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report", "Links"}));
             } else if (js instanceof WebHyperlink) {
-                this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"));
+                this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"));
             } else if (js instanceof EmailJavaScript) {
                 this.typeField.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Email", "Links"}));
             }

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -254,7 +254,7 @@ public class DesignerActivator extends Activator {
         return new NameableCreator[]{
                 new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Reportlet"), ReportletHyperlink.class, ReportletHyperlinkPane.ChartNoRename.class),
                 new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"), EmailJavaScript.class, EmailPane.class),
-                new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"), WebHyperlink.class, WebHyperlinkPane.ChartNoRename.class),
+                new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), WebHyperlink.class, WebHyperlinkPane.ChartNoRename.class),
                 new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Dynamic_Parameters"), ParameterJavaScript.class, ParameterJavaScriptPane.ChartNoRename.class),
                 new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"), JavaScriptImpl.class, JavaScriptImplPane.ChartNoRename.class)
         };